Changeset - e4452268c09f
[Not reviewed]
default
0 1 0
Thomas De Schampheleire - 7 years ago 2019-03-18 23:04:20
thomas.de_schampheleire@nokia.com
scripts/make-release: fix PyPI upload by using twine

Upload via 'python2 setup.py sdist upload' is deprecated.

Worse, for unknown reasons it stopped working for 0.4, even though 0.3 did
pretty much the same.

Following output was given:

WARNING: Uploading via this command is deprecated, use twine to upload
instead (https://pypi.org/p/twine/)
Traceback (most recent call last):
File "setup.py", line 160, in <module>
""",
File "/tmp/kallithea-release-JtnfD/lib/python2.7/site-packages/setuptools/__init__.py",
line 145, in setup
return distutils.core.setup(**attrs)
File "/usr/lib64/python2.7/distutils/core.py", line 151, in setup
dist.run_commands()
File "/usr/lib64/python2.7/distutils/dist.py", line 953, in run_commands
self.run_command(cmd)
File "/usr/lib64/python2.7/distutils/dist.py", line 972, in run_command
cmd_obj.run()
File "/tmp/kallithea-release-JtnfD/lib/python2.7/site-packages/setuptools/command/upload.py",
line 26, in run
orig.upload.run(self)
File "/usr/lib64/python2.7/distutils/command/upload.py", line 62, in run
self.upload_file(command, pyversion, filename)
File "/tmp/kallithea-release-JtnfD/lib/python2.7/site-packages/setuptools/command/upload.py",
line 136, in upload_file
value = str(value).encode('utf-8')
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc5 in position
825: ordinal not in range(128)

The error is pointing to a unicode character in the README.rst file.

The proposed 'twine' command does not have this problem. As it seems that
this is the future, we won't waste more time investigating the problem with
'sdist upload', and start using twine from now on.
1 file changed with 2 insertions and 3 deletions:
0 comments (0 inline, 0 general)
scripts/make-release
Show inline comments
 
@@ -11,25 +11,25 @@ cleanup()
 
echo "Checking that you are NOT inside a virtualenv"
 
[ -z "$VIRTUAL_ENV" ]
 

	
 
venv=$(mktemp -d --tmpdir kallithea-release-XXXXX)
 
trap cleanup EXIT
 

	
 
echo "Setting up a fresh virtualenv in $venv"
 
virtualenv -p python2 "$venv"
 
. "$venv/bin/activate"
 

	
 
echo "Install/verify tools needed for building and uploading stuff"
 
pip install --upgrade -e .
 
pip install --upgrade -r dev_requirements.txt
 
pip install --upgrade -r dev_requirements.txt twine
 

	
 
echo "Cleanup and update copyrights ... and clean checkout"
 
scripts/run-all-cleanup
 
scripts/update-copyrights.py
 
hg up -cr .
 

	
 
echo "Make release build from clean checkout in build/"
 
rm -rf build dist
 
hg archive build
 
cd build
 

	
 
echo "Check that each entry in MANIFEST.in match something"
 
@@ -66,15 +66,14 @@ echo "Verify current revision is tagged 
 
hg log -r "'$version'&." | grep .
 

	
 
echo -n "Enter \"pypi\" to upload Kallithea $version to pypi: "
 
read answer
 
[ "$answer" = "pypi" ]
 

	
 
echo "Rebuild readthedocs for docs.kallithea-scm.org"
 
xdg-open https://readthedocs.org/projects/kallithea/
 
curl -X POST http://readthedocs.org/build/kallithea
 
xdg-open https://readthedocs.org/builds/kallithea/
 
xdg-open http://docs.kallithea-scm.org/en/latest/ # or whatever the branch is
 

	
 
extraargs=${EMAIL:+--identity=$EMAIL}
 
python2 setup.py sdist upload --sign $extraargs
 
twine upload dist/*
 
xdg-open https://pypi.python.org/pypi/Kallithea
0 comments (0 inline, 0 general)