diff options
author | Oliver Bestwalter <oliver.bestwalter@avira.com> | 2018-03-22 20:53:18 +0100 |
---|---|---|
committer | Oliver Bestwalter <oliver.bestwalter@avira.com> | 2018-03-22 20:53:18 +0100 |
commit | 284ed9d41774789ca9f23af3e6bc60a89097e796 (patch) | |
tree | 0a87973e8ac56d99700b2dd6d53911dcf882ef26 /tasks | |
parent | 63d72f0d8c841b8e55d19d83f65211c3e326ce73 (diff) | |
download | tox-git-284ed9d41774789ca9f23af3e6bc60a89097e796.tar.gz |
small fixes in release script, adjust to branch based release process
Diffstat (limited to 'tasks')
-rwxr-xr-x | tasks/pra.sh | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/tasks/pra.sh b/tasks/pra.sh index dd70785a..dbcdf8e7 100755 --- a/tasks/pra.sh +++ b/tasks/pra.sh @@ -29,9 +29,9 @@ dispatch () { fi prep elif [ "$1" == "upload" ]; then - devpi_upload $2 + devpi_upload $2 elif [ "$1" == "test" ]; then - devpi_cloud_test + devpi_cloud_test elif [ "$1" == "release" ]; then pypi_release else @@ -70,11 +70,13 @@ devpi_upload () { } devpi_cloud_test () { + dctPath=../devpi-cloud-test cloudTestPath=../devpi-cloud-test-tox if [ ! -d "$cloudTestPath" ]; then echo "needs $cloudTestPath" exit 1 fi + pip install -e ${dctPath} _confirm "trigger devpi cloud tests for ${VERSION}?" cd ${cloudTestPath} dct trigger ${VERSION} @@ -82,13 +84,20 @@ devpi_cloud_test () { cd ../tox } -# TODO get devpi push to work again pypi_release () { PACKAGES=$(ls dist/*) _confirm "upload to pypi: $PACKAGES?" + # TODO get devpi push to work again + # get rid of this ... twine upload ${PACKAGES} - git push upstream master - git push upstream ${VERSION} + # ... and do this when this is fixed: + # https://github.com/devpi/devpi/issues/449 + # devpi push tox==${VERSION} pypi:pypi + + # TODO do the right thing here when using a release branch + # promote changes in code and tag to repo + # git push upstream master + # git push upstream ${VERSION} } _confirm () { |