cleanup and move to python 3.5+

Author: samuelcolvin

.gitignore

@@ -9,3 +9,5 @@ dist/
 .idea
 build
 env
+.coverage
+.cache/

.travis.yml

@@ -2,25 +2,23 @@ language: python
 sudo: false
 
 python:
-- '2.7'
-- '3.4'
 - '3.5'
-- '3.6-dev'
+- '3.6'
 - 'nightly'
 
 matrix:
   allow_failures:
   - python: 'nightly'
 
 install:
-- pip install coverage flake8 Pygments docutils
+- make install
+- pip freeze
 
 script:
-- coverage run --source=pydf setup.py test
-- flake8 pydf/
-- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then python setup.py check -rms; fi
-- python setup.py install
-- tests/check_file_permissions.py
+- make lint
+- make test
+- make benchmark
+- ./tests/check_tag.py
 - python -c "import pydf; print(pydf.get_version())"
 
 after_success:
@@ -35,4 +33,4 @@ deploy:
   distributions: sdist bdist_wheel
   on:
     tags: true
-    python: 3.5
+    python: 3.6

HISTORY.rst

@@ -0,0 +1,8 @@
+.. :changelog:
+
+History
+-------
+
+v0.31.0 (2017-05-23)
+....................
+* move to python 3.5 +

Makefile

@@ -0,0 +1,41 @@
+.PHONY: install
+install:
+	pip install -U setuptools pip
+	pip install -U .
+	pip install -r tests/requirements.txt
+
+.PHONY: isort
+isort:
+	isort -rc -w 120 pydf
+	isort -rc -w 120 tests
+
+.PHONY: lint
+lint:
+	python setup.py check -rms
+	flake8 pydf/ tests/
+	pytest pydf -p no:sugar -q
+
+.PHONY: test
+test:
+	pytest --cov=pydf
+
+.PHONY: testcov
+testcov:
+	pytest --cov=pydf && (echo "building coverage html"; coverage html)
+
+.PHONY: all
+all: testcov lint
+
+.PHONY: clean
+clean:
+	rm -rf `find . -name __pycache__`
+	rm -f `find . -type f -name '*.py[co]' `
+	rm -f `find . -type f -name '*~' `
+	rm -f `find . -type f -name '.*~' `
+	rm -rf .cache
+	rm -rf htmlcov
+	rm -rf *.egg-info
+	rm -f .coverage
+	rm -f .coverage.*
+	rm -rf build
+	python setup.py clean

pydf/version.py

@@ -1,3 +1,3 @@
 from distutils.version import StrictVersion
 
-VERSION = StrictVersion('0.30.0')
+VERSION = StrictVersion('0.31.0')

pydf/wkhtmltopdf.py

@@ -1,8 +1,12 @@
-import os
 import subprocess
+from pathlib import Path
 from tempfile import NamedTemporaryFile
+
 from .version import VERSION
 
+THIS_DIR = Path(__file__).parent.resolve()
+WK_PATH = THIS_DIR / 'bin' / 'wkhtmltopdf'
+
 
 def execute_wk(*args):
     """
@@ -11,14 +15,7 @@ def execute_wk(*args):
     :param args: args to pass straight to subprocess.Popen
     :return: stdout, stderr
     """
-    this_dir = os.path.dirname(__file__)
-    wk_name = 'wkhtmltopdf'
-    wkhtmltopdf_default = os.path.join(this_dir, 'bin', wk_name)
-    # Reference command
-    wkhtmltopdf_cmd = os.environ.get('WKHTMLTOPDF_CMD', wkhtmltopdf_default)
-    if not os.path.isfile(wkhtmltopdf_cmd):
-        raise IOError('wkhtmltopdf binary not found at %s' % wkhtmltopdf_cmd)
-    wk_args = (wkhtmltopdf_cmd,) + args
+    wk_args = (str(WK_PATH),) + args
     p = subprocess.Popen(wk_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout, stderr = p.communicate()
     return stdout, stderr, p.returncode
@@ -100,22 +97,23 @@ def generate_pdf(source,
             cmd_args.extend([arg_name, str(value)])
 
     def gen_pdf(src, cmd_args):
-        with NamedTemporaryFile(suffix='.pdf', mode='rb+') as pdf_file:
+        with NamedTemporaryFile(suffix='.pdf', mode='rb') as pdf_file:
             cmd_args += [src, pdf_file.name]
             _, stderr, returncode = execute_wk(*cmd_args)
             pdf_file.seek(0)
             pdf_string = pdf_file.read()
             # it seems wkhtmltopdf's error codes can be false, we'll ignore them if we
             # seem to have generated a pdf
-            if returncode != 0 and pdf_string[:4] != '%PDF':
-                raise IOError('error running wkhtmltopdf, command: %r\nresponse: "%s"' % (cmd_args, stderr.strip()))
+            if returncode != 0 and pdf_string[:4] != b'%PDF':
+                raise RuntimeError('error running wkhtmltopdf, command: {!r}\n'
+                                   'response: "{}"'.format(cmd_args, stderr.strip()))
             return pdf_string
 
     if is_url:
         return gen_pdf(source, cmd_args)
 
     with NamedTemporaryFile(suffix='.html', mode='wb') as html_file:
-        html_file.write(source.encode('utf8'))
+        html_file.write(source.encode())
         html_file.flush()
         html_file.seek(0)
         return gen_pdf(html_file.name, cmd_args)

setup.cfg

@@ -1,6 +1,21 @@
-[bdist_wheel]
-universal = 1
+[tool:pytest]
+testpaths = tests
+addopts = --isort
+timeout = 10
 
 [flake8]
 max-complexity = 10
 max-line-length = 120
+
+[bdist_wheel]
+python-tag = py36
+
+[coverage:run]
+source = pdf
+branch = True
+
+[coverage:report]
+precision = 2
+exclude_lines =
+    pragma: no cover
+    raise NotImplementedError

setup.py

@@ -1,12 +1,13 @@
 import os
+from pathlib import Path
+
 from setuptools import setup
 from setuptools.command.install import install
 from pydf.version import VERSION
 
 description = 'PDF generation in python using wkhtmltopdf suitable for heroku'
-THIS_DIR = os.path.dirname(os.path.abspath(__file__))
-with open(os.path.join(THIS_DIR, 'README.rst')) as f:
-    long_description = f.read()
+THIS_DIR = Path(__file__).resolve().parent
+long_description = THIS_DIR.joinpath('README.rst').read_text()
 
 
 class OverrideInstall(install):
@@ -25,7 +26,7 @@ def run(self):
     long_description=long_description,
     author='Samuel Colvin',
     license='MIT',
-    author_email='S@muelColvin.com',
+    author_email='s@muelcolvin.com',
     url='https://github.com/tutorcruncher/pydf',
     packages=['pydf'],
     platforms='any',
@@ -36,13 +37,10 @@ def run(self):
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP',
         ],
-    test_suite='tests',
     zip_safe=False
 )

tests/__init__.py

@@ -1 +0,0 @@
-from .runtests import *