diff options
| author | Alex Stapleton <alexs@prol.etari.at> | 2014-03-24 23:05:53 +0000 |
|---|---|---|
| committer | Alex Stapleton <alexs@prol.etari.at> | 2014-03-24 23:05:53 +0000 |
| commit | 3888a84c2b7fc45adf3fa665880d554c1766165e (patch) | |
| tree | 3ced92983980b7a034401fba43f6b7084fb359f0 | |
| parent | a39a319b096b1b2b1775ae1a91117c19422a6c81 (diff) | |
| download | cryptography-3888a84c2b7fc45adf3fa665880d554c1766165e.tar.gz cryptography-3888a84c2b7fc45adf3fa665880d554c1766165e.tar.bz2 cryptography-3888a84c2b7fc45adf3fa665880d554c1766165e.zip | |
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.
| -rw-r--r-- | tasks.py | 4 | ||||
| -rw-r--r-- | tox.ini | 3 | ||||
| -rw-r--r-- | vectors/setup.py | 1 |
3 files changed, 4 insertions, 4 deletions
@@ -84,11 +84,11 @@ def release(version): 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: ") @@ -7,8 +7,8 @@ deps = 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 @@ commands = # 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 13b27c7d..ce01e132 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 |