Merge pull request #7 from KeepSafe/update-packaging

chore: updates package to be leverage modern pip/build/twine and pypicloud

Author: b1r3k

.python-version

@@ -1 +1 @@
-3.6.6
+3.6.8

Makefile

@@ -5,18 +5,25 @@ PIP=venv/bin/pip
 NOSE=venv/bin/nosetests
 FLAKE=venv/bin/flake8
 FLAGS=
+PYPICLOUD_HOST=pypicloud.getkeepsafe.local
+TWINE=./venv/bin/twine
 
+update:
+	$(PIP) install -U pip
+	$(PIP) install -U .
 
 env:
-	python3 -m venv venv
-	$(PYTHON) ./setup.py develop
+	test -d venv || python3 -m venv venv
 
-dev:
-	$(PIP) install -r requirements-dev.txt
-	$(PYTHON) ./setup.py develop
+dev: env update
+	$(PIP) install .[tests,devtools]
 
-install:
-	$(PYTHON) ./setup.py install
+install: env update
+
+publish:
+	rm -rf dist
+	$(PYTHON) -m build .
+	$(TWINE) upload --verbose --sign --username developer --repository-url http://$(PYPICLOUD_HOST)/simple/ dist/*.whl
 
 flake:
 	$(FLAKE) sdiff tests

setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 
-version = '0.4.0'
+version = '0.4.1'
 
 
 def read(f):
@@ -13,10 +13,20 @@ def read(f):
     'mistune <= 1',
 ]
 
+tests_require = [
+    'nose',
+    'flake8',
+    'autopep8',
+]
+
+devtools_require = [
+    'twine',
+    'build',
+]
+
 setup(name='sdiff',
       version=version,
       description=('sdiff compares the structure of two markdown texts'),
-      long_description='\n\n'.join((read('README.md'), read('CHANGELOG'))),
       classifiers=[
           'License :: OSI Approved :: BSD License',
           'Intended Audience :: Developers',
@@ -29,4 +39,9 @@ def read(f):
       package_data={},
       namespace_packages=[],
       install_requires=install_requires,
+      tests_require=tests_require,
+      extras_require={
+          'tests': tests_require,
+          'devtools': devtools_require,
+      },
       include_package_data=False)