Fix bug in release task and style fixes
tasks.py was building tarballs/sdists that didn't actually have vectors
in because of setup.pys reliance on the cwd.
diff --git a/tasks.py b/tasks.py
index c124560..c205ac8 100644
--- a/tasks.py
+++ b/tasks.py
@@ -84,11 +84,11 @@
invoke.run("git push --tags")
invoke.run("python setup.py sdist")
- invoke.run("python vectors/setup.py sdist")
+ invoke.run("cd vectors/ && python setup.py sdist bdist_wheel")
invoke.run(
"twine upload -s dist/cryptography-{0}* "
- "dist/cryptography_vectors-{0}*".format(version)
+ "vectors/dist/cryptography_vectors-{0}*".format(version)
)
token = getpass.getpass("Input the Jenkins token: ")
diff --git a/tox.ini b/tox.ini
index eaebd5c..eb8e275 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,8 +7,8 @@
iso8601
pretend
pytest
+ ./vectors
commands =
- pip install -e vectors
coverage run --source=cryptography/,tests/ -m pytest --capture=no --strict {posargs}
coverage report -m
@@ -36,7 +36,6 @@
# coverage.py on pypy.
[testenv:pypy]
commands =
- pip install -e vectors
py.test --capture=no --strict {posargs}
[testenv:pep8]
diff --git a/vectors/setup.py b/vectors/setup.py
index 13b27c7..ce01e13 100644
--- a/vectors/setup.py
+++ b/vectors/setup.py
@@ -14,6 +14,7 @@
from __future__ import absolute_import, division, print_function
import os
+
from setuptools import setup, find_packages