updates package to be leverage modern pip/build/twine and pypicloud (#30)

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

 - upgrade python version to 3.6.8
 - make env creates venv only if it does not exist
 - relay on pip completly while installing = one dependency resolve
 - devtools as extras
 - loosen up requirements defined in setup
 - pypicloud package publishing make target
 - removes long_description as incompatible with build module

* chore: travis uses make targets

* chore: use sdiff aka html-structure-diff from git as travis do not have access to pypicloud

Author: b1r3k

.python-version

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

.travis.yml

@@ -3,9 +3,7 @@ python:
   - "3.6"
 # command to install dependencies
 install:
-  - pip install git+https://github.com/KeepSafe/html-structure-diff.git#egg=sdiff
-  - pip install -r requirements-dev.txt
+  - make dev
 # command to run tests
 script:
-  - flake8 validator tests
-  - nosetests
+  - make tests

Makefile

@@ -4,20 +4,27 @@ PYTHON=venv/bin/python3
 PIP=venv/bin/pip
 NOSE=venv/bin/nosetests
 FLAKE=venv/bin/flake8
+PYPICLOUD_HOST=pypicloud.getkeepsafe.local
+PIP_ARGS=--extra-index=http://$(PYPICLOUD_HOST)/simple/ --trusted-host $(PYPICLOUD_HOST)
+TWINE=./venv/bin/twine
 FLAGS=
 
+update:
+	$(PIP) install -U pip
+	$(PIP) install $(PIP_ARGS) -U .
 
 env:
-	python3 -m venv venv
-	$(PIP) install -e git://github.com/KeepSafe/html-structure-diff.git#egg=sdiff
-	$(PYTHON) ./setup.py develop
+	test -d venv || python3 -m venv venv
 
-dev:
-	$(PIP) install flake8 nose coverage
-	$(PYTHON) ./setup.py develop
+dev: env update
+	$(PIP) install $(PIP_ARGS) .[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) validator tests

setup.py

@@ -2,36 +2,52 @@
 from setuptools import setup, find_packages
 
 
-version = '0.7.0'
+version = '0.7.1'
 
 
 def read(f):
     return open(os.path.join(os.path.dirname(__file__), f)).read().strip()
 
 
 install_requires = [
+    'sdiff @ git+ssh://[email protected]/KeepSafe/html-structure-diff.git#egg=sdiff',
     'aiohttp >=3, <3.4',
     'Markdown',
     'parse >=1, <2',
     'beautifulsoup4 >=4, <5',
     'lxml >=3',
 ]
 
+tests_require = [
+    'nose',
+    'flake8==3.6.0',
+    'coverage',
+]
+
+devtools_require = [
+    'twine',
+    'build',
+]
+
 setup(
     name='content-validator',
     version=version,
     description=('Content validator looks at text content and preforms different validation tasks'),
-    long_description='\n\n'.join((read('README.md'), read('CHANGELOG'))),
     classifiers=[
         'License :: OSI Approved :: BSD License', 'Intended Audience :: Developers', 'Programming Language :: Python'
     ],
     author='Keepsafe',
     author_email='[email protected]',
-    url='https://github.com/KeepSafe/google-play-cmd/',
+    url='https://github.com/KeepSafe/content-validator/',
     license='Apache',
     packages=find_packages(exclude=['tests']),
     package_data={},
     namespace_packages=[],
     install_requires=install_requires,
+    tests_require=tests_require,
+    extras_require={
+        'tests': tests_require,
+        'devtools': devtools_require,
+    },
     entry_points={'console_scripts': ['content-validator = validator:main']},
     include_package_data=False)