Skip to content

Run tests on newer versions of python and django. #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
D3X wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Run tests on newer versions of python and django. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 86 additions & 28 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,6 @@ language: python
matrix:
include:
# See https://docs.djangoproject.com/en/1.11/faq/install/#what-python-version-can-i-use-with-django
# Python 2.7
- python: 2.7
env: TOXENV=py27-django18
- python: 2.7
env: TOXENV=py27-django19
- python: 2.7
env: TOXENV=py27-django110
- python: 2.7
env: TOXENV=py27-django111

# Python 3.4
- python: 3.4
env: TOXENV=py34-django18
- python: 3.4
env: TOXENV=py34-django19
- python: 3.4
env: TOXENV=py34-django110
- python: 3.4
env: TOXENV=py34-django111

# Python 3.5
- python: 3.5
env: TOXENV=py35-django18
Expand All @@ -31,20 +11,100 @@ matrix:
env: TOXENV=py35-django110
- python: 3.5
env: TOXENV=py35-django111
- python: 3.5
env: TOXENV=py35-django20
- python: 3.5
env: TOXENV=py35-django21
- python: 3.5
env: TOXENV=py35-django22

# Python 3.6
- python: 3.6
env: TOXENV=py36-django18
- python: 3.6
env: TOXENV=py36-django19
- python: 3.6
env: TOXENV=py36-django110
- python: 3.6
env: TOXENV=py36-django111
- python: 3.6
env: TOXENV=py36-django20
- python: 3.6
env: TOXENV=py36-django21
- python: 3.6
env: TOXENV=py36-django22
- python: 3.6
env: TOXENV=py36-django30

# Python 3.7
- python: 3.7
env: TOXENV=py36-django18
- python: 3.7
env: TOXENV=py36-django19
- python: 3.7
env: TOXENV=py36-django110
- python: 3.7
env: TOXENV=py36-django111
- python: 3.7
env: TOXENV=py36-django20
- python: 3.7
env: TOXENV=py36-django21
- python: 3.7
env: TOXENV=py36-django22
- python: 3.7
env: TOXENV=py36-django30

# Python 3.8
- python: 3.8
env: TOXENV=py36-django18
- python: 3.8
env: TOXENV=py36-django19
- python: 3.8
env: TOXENV=py36-django110
- python: 3.8
env: TOXENV=py36-django111
- python: 3.8
env: TOXENV=py36-django20
- python: 3.8
env: TOXENV=py36-django21
- python: 3.8
env: TOXENV=py36-django22
- python: 3.8
env: TOXENV=py36-django30

# pypy
# PyPy
- python: pypy
env: TOXENV=pypy3-django18
- python: pypy
env: TOXENV=pypy3-django19
- python: pypy
env: TOXENV=pypy-django18
env: TOXENV=pypy3-django110
- python: pypy
env: TOXENV=pypy-django19
env: TOXENV=pypy3-django111
- python: pypy
env: TOXENV=pypy-django110
env: TOXENV=pypy3-django20
- python: pypy
env: TOXENV=pypy-django111
env: TOXENV=pypy3-django21
- python: pypy
env: TOXENV=pypy3-django22

# PyPy 3
- python: pypy3
env: TOXENV=pypy3-django18
- python: pypy3
env: TOXENV=pypy3-django19
- python: pypy3
env: TOXENV=pypy3-django110
- python: pypy3
env: TOXENV=pypy3-django111
- python: pypy3
env: TOXENV=pypy3-django20
- python: pypy3
env: TOXENV=pypy3-django21
- python: pypy3
env: TOXENV=pypy3-django22
- python: pypy3
env: TOXENV=pypy3-django30

before_install:
- "wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.3/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz"
Expand All @@ -57,9 +117,7 @@ install:
- pip install Django==1.10
- pip install -r requirements/test.txt
- pip install -r requirements/docs.txt
# TODO: Switch over to pylint v2.0.0 when it becomes available - see circle.yml for further changes
- pip install git+https://github.com/PyCQA/pylint.git
- pip install git+https://github.com/PyCQA/astroid.git
- pip install pylint

script:
- py.test --cov=django_pdfkit
Expand Down
3 changes: 2 additions & 1 deletion pylintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ max-line-length=140
[MESSAGES CONTROL]

disable=
missing-docstring
missing-docstring,
no-else-return,

[REPORTS]

Expand Down
19 changes: 11 additions & 8 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
from setuptools.command.test import test # noqa
is_setuptools = False

import codecs
import os
import re
import sys
import codecs

NAME = 'django-pdfkit'
entrypoints = {}
Expand All @@ -28,23 +29,26 @@
classes = """
Development Status :: 4 - Beta
Framework :: Django
Framework :: Django :: 1.6
Framework :: Django :: 1.7
Framework :: Django :: 1.8
Framework :: Django :: 1.9
Framework :: Django :: 1.10
Framework :: Django :: 1.11
Framework :: Django :: 2.0
Framework :: Django :: 2.1
Framework :: Django :: 2.2
Framework :: Django :: 3.0
License :: OSI Approved :: MIT License
Topic :: Communications
Topic :: Internet :: WWW/HTTP
Topic :: Other/Nonlisted Topic
Topic :: Software Development :: Libraries :: Python Modules
Intended Audience :: Developers
Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
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 :: 3.8
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: Implementation :: PyPy
Operating System :: OS Independent
Expand All @@ -56,7 +60,6 @@

# -*- Distribution Meta -*-

import re
re_meta = re.compile(r'__(\w+?)__\s*=\s*(.*)')
re_vers = re.compile(r'VERSION\s*=.*?\((.*?)\)')
re_doc = re.compile(r'^"""(.+?)"""')
Expand Down
9 changes: 7 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[tox]
envlist =
py{27,34,35,py}-django{18,19,110,111}
py{35}-django{111}
pypy-django{18,19,110,111}
py{35,36,37,38,py3}-django{18,19,110,111,20,21,22}
py{36,37,38,py3}-django30

[testenv]
sitepackages = False
Expand All @@ -12,6 +13,10 @@ deps =
-r{toxinidir}/requirements/test.txt
git+https://github.com/PyCQA/pylint.git
git+https://github.com/PyCQA/astroid.git
django30: Django>=3.0,<3.1
django22: Django>=2.2,<3.0
django21: Django>=2.1,<2.2
django20: Django>=2.0,<2.1
django111: Django>=1.11,<1.12
django110: Django>=1.10,<1.11
django19: Django>=1.9,<1.10
Expand Down