fix: use twine for releases

Jose Diaz-Gonzalez · Jose Diaz-Gonzalez · commit 613576dd2516 · 2021-01-01T21:28:03.000-05:00
The old method of releasing to pypi broke for whatever reason and switching to a supported toolchain is easier than debugging the old one.

Additionally:

- Update gitchangelog
- Fix license entry
- Set long description type
- Gitignore the temporary readme file
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,4 @@ doc/aws_hostname.1
 .vscode
 .atom
 
+README
diff --git a/release b/release
@@ -22,7 +22,7 @@ CYAN="\033[0;36m"     # cyan
 pip install wheel > /dev/null
 
 command -v gitchangelog >/dev/null 2>&1 || {
-    echo -e "${RED}WARNING: Missing gitchangelog binary, please run: pip install gitchangelog==2.2.0${COLOR_OFF}\n"
+    echo -e "${RED}WARNING: Missing gitchangelog binary, please run: pip install gitchangelog==3.0.4${COLOR_OFF}\n"
     exit 1
 }
 
@@ -31,6 +31,11 @@ command -v rst-lint > /dev/null || {
     exit 1
 }
 
+command -v twine > /dev/null || {
+    echo -e "${RED}WARNING: Missing twine binary, please run: pip install twine==3.2.0${COLOR_OFF}\n"
+    exit 1
+}
+
 if [[ "$@" != "major" ]] && [[ "$@" != "minor" ]] && [[ "$@" != "patch" ]]; then
     echo -e "${RED}WARNING: Invalid release type, must specify 'major', 'minor', or 'patch'${COLOR_OFF}\n"
     exit 1
@@ -125,7 +130,8 @@ git push -q origin master && git push -q --tags
 if [[ "$PUBLIC" == "true" ]]; then
     echo -e "${YELLOW}--->${COLOR_OFF} Creating python release"
     cp README.rst README
-    python setup.py sdist bdist_wheel upload > /dev/null
+    python setup.py sdist bdist_wheel > /dev/null
+    twine upload dist/*
     rm README
 fi
 
diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@ def open_file(fname):
     packages=['github_backup'],
     scripts=['bin/github-backup'],
     url='http://github.com/josegonzalez/python-github-backup',
-    license=open('LICENSE.txt').read(),
+    license='MIT',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Topic :: System :: Archiving :: Backup',
@@ -30,6 +30,7 @@ def open_file(fname):
     ],
     description='backup a github user or organization',
     long_description=open_file('README.rst').read(),
+    long_description_content_type='text/x-rst',
     install_requires=open_file('requirements.txt').readlines(),
     zip_safe=True,
 )

Original file line number	Diff line number	Diff line change
`@@ -34,3 +34,4 @@ doc/aws_hostname.1`
`34`	`34`	`.vscode`
`35`	`35`	`.atom`
`36`	`36`
	`37`	`+README`