From af721ad8bd52d1c0e659086fa3305b124bba7f51 Mon Sep 17 00:00:00 2001
From: "Nathan J. Mehl" <n@oden.io>
Date: Mon, 2 Mar 2020 22:10:44 -0500
Subject: [PATCH] Update for 1.0.5 release

- use updated version of pydpkg
- point sources at current maintainer
- update python version compatability
- include long description in pypi page
- add publish script
---
 .gitignore         |  3 +++
 LICENSE.txt        |  1 +
 scripts/publish.sh | 15 +++++++++++++++
 setup.py           | 33 +++++++++++++++++++++------------
 4 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100755 scripts/publish.sh

diff --git a/.gitignore b/.gitignore
index 8d84fd9..aa365af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@ dist/
 *.whl
 wheelhouse/
 .ropeproject/
+venv
+venv3
+build/
diff --git a/LICENSE.txt b/LICENSE.txt
index 019d39c..436b438 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,5 @@
 Copyright [2017] The Climate Corporation (https://climate.com)
+Additions copyright 2020 by Nathan J. Mehl <pypi@memory.blank.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/scripts/publish.sh b/scripts/publish.sh
new file mode 100755
index 0000000..5737688
--- /dev/null
+++ b/scripts/publish.sh
@@ -0,0 +1,15 @@
+#!/bin/sh -ex
+
+if ! [ -f venv/bin/activate ]; then
+  virtualenv --python=$(which python2.7) venv
+fi
+./venv/bin/pip install -U pip setuptools wheel
+./venv/bin/python setup.py sdist bdist_wheel
+
+if ! [ -f venv3/bin/activate ]; then
+  virtualenv --python=$(which python3) venv3
+fi
+./venv3/bin/pip install -U pip setuptools wheel twine
+./venv3/bin/python setup.py bdist_wheel
+
+./venv3/bin/twine upload dist/*
diff --git a/setup.py b/setup.py
index 4e4150a..a7ccb0d 100644
--- a/setup.py
+++ b/setup.py
@@ -3,44 +3,53 @@
 from setuptools import setup, find_packages
 
 __name__ = 'apt-repoman'
-__version__ = '1.0.4'
+__version__ = '1.0.5'
 
 setup(
     name=__name__,
     packages=find_packages(),
     version=__version__,
-    description='A high performance Debian APT repository based on Amazon Web Services',
+    description=('A high performance Debian APT repository based '
+                 'on Amazon Web Services'),
+    long_description=open("README.md").read(),
+    long_description_content_type='text/markdown',
     author='Nathan J. Mehl',
-    author_email='n@climate.com',
-    url='https://github.com/theclimatecorporation/repoman',
-    download_url='https://github.com/theclimatecorporation/repoman/tarball/%s' % __version__,
+    author_email='pypi@memory.blank.org',
+    url='https://github.com/memory/repoman',
+    download_url='https://github.com/memory/repoman/tarball/%s' % __version__,
     keywords=['apt', 'debian', 'dpkg', 'packaging'],
     package_data={'': ['*.json']},
+    setup_requires=[
+        "wheel",
+    ],
     install_requires=[
         'PGPy==0.4.1',
         'ansicolors==1.1.8',
         'boto3==1.4.4',
         'configargparse==0.12.0',
-        'pydpkg==1.3.1',
+        'pydpkg==1.3.3',
         'pysectools==0.4.2',
         'tabulate==0.7.7'
     ],
     extras_require={
-        'test': ['mock==2.0.0', 'pep8==1.7.0', 'pytest==3.1.1', 'pylint==1.7.1']
+        'test': [
+            'mock==2.0.0',
+            'pep8==1.7.0',
+            'pylint==1.7.1',
+            'pytest==3.1.1',
+        ]
     },
-    #scripts=[
-    #    'scripts/repoman'
-    #],
-    entry_points = {
+    entry_points={
         'console_scripts': ['repoman-cli=apt_repoman.cli:main'],
     },
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: System :: Archiving :: Packaging",
         ]