From f893a8031fce4b9f70fc64a50cc3e12a45dc20df Mon Sep 17 00:00:00 2001
From: Joe Testa <jtesta@positronsecurity.com>
Date: Tue, 20 Oct 2020 14:04:14 -0400
Subject: [PATCH] Updated PyPI packaging instructions & Makefile.pypi.

---
 Makefile.pypi | 12 ++++++++----
 PACKAGING     | 11 ++---------
 setup.cfg     |  1 +
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Makefile.pypi b/Makefile.pypi
index 49c80ba..f505fbd 100644
--- a/Makefile.pypi
+++ b/Makefile.pypi
@@ -1,11 +1,15 @@
 all:
-	python3 setup.py sdist bdist_wheel
+	rm -rf /tmp/pypi_upload
+	virtualenv -p /usr/bin/python3 /tmp/pypi_upload/
+	cp -R src /tmp/pypi_upload/
+	cp setup.py setup.cfg README.md LICENSE /tmp/pypi_upload/
+	/bin/bash -c "pushd /tmp/pypi_upload/; source bin/activate; pip3 install setuptools twine; python3 setup.py sdist bdist_wheel"
 
 uploadtest:
-	twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+	/bin/bash -c "pushd /tmp/pypi_upload; source bin/activate; twine upload --repository-url https://test.pypi.org/legacy/ /tmp/pypi_upload/dist/*"
 
 uploadprod:
-	twine upload dist/*
+	/bin/bash -c "pushd /tmp/pypi_upload; source bin/activate; twine upload /tmp/pypi_upload/dist/*"
 
 clean:
-	rm -rf build/ dist/ src/*.egg-info/
+	rm -rf /tmp/pypi_upload/
diff --git a/PACKAGING b/PACKAGING
index 393696e..256bbfa 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -2,12 +2,7 @@
 
 To create package and upload to test server:
 
-# apt install virtualenv
-$ virtualenv -p /usr/bin/python3 /tmp/pypi_upload
-$ cd /tmp/pypi_upload; source bin/activate
-$ pip3 install twine
-$ cp -R path/to/ssh-audit .
-$ cd ssh-audit
+$ sudo apt install python3-virtualenv
 $ make -f Makefile.pypi
 $ make -f Makefile.pypi uploadtest
 
@@ -19,10 +14,8 @@ $ cd /tmp/pypi_test; source bin/activate
 $ pip3 install --index-url https://test.pypi.org/simple ssh-audit
 
 
-To upload to production server:
+To upload to production server (hint: use username '__token__' and API token):
 
-$ cd /tmp/pypi_upload; source bin/activate
-$ cd ssh-audit
 $ make -f Makefile.pypi uploadprod
 
 
diff --git a/setup.cfg b/setup.cfg
index cbc9976..d44eb71 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,6 +22,7 @@ classifiers =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
     Topic :: Security