Skip to content

Commit

Permalink
Update build matrix, stop advertising Python 2 or Django 1.11
Browse files Browse the repository at this point in the history
The dependencies (django-parler) no longer support this either.
  • Loading branch information
vdboor committed Jun 1, 2021
1 parent a2bc50c commit 165fe16
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 37 deletions.
30 changes: 7 additions & 23 deletions .travis.yml
@@ -1,29 +1,19 @@
dist: xenial
language: python
sudo: false
language: python
cache: pip
python:
- '3.6'
- '3.5'
- '2.7'
- '3.7'
- '3.8'
env:
- PACKAGES="django>=1.11,<1.12"
- PACKAGES="django>=2.0,<2.1"
- PACKAGES="django>=2.1,<2.2"
- PACKAGES="django>=2.2,<2.3"
matrix:
exclude:
- python: '2.7'
env: PACKAGES="django>=2.0,<2.1"
- python: '2.7'
env: PACKAGES="django>=2.1,<2.2"
- python: '2.7'
env: PACKAGES="django>=2.2,<2.3"
- DJANGO="2.2.*"
- DJANGO="3.0.*"
- DJANGO="3.1.*"
before_install:
- pip install codecov
install:
- pip install -U pip wheel setuptools
- pip install -q $PACKAGES -r test-requirements.txt -e .
- pip install -q $DJANGO -r test-requirements.txt -e .
script:
- coverage run --rcfile=.coveragerc runtests.py
after_success:
Expand All @@ -32,12 +22,6 @@ branches:
only:
- master
notifications:
irc:
channels:
- irc.freenode.org#django-fluent
template:
- '%{repository}#%{build_number} (%{commit}) %{message} -- %{build_url}'
skip_join: true
email:
recipients:
- travis@edoburu.nl
Expand Down
3 changes: 0 additions & 3 deletions setup.cfg

This file was deleted.

3 changes: 1 addition & 2 deletions setup.py
Expand Up @@ -48,7 +48,7 @@ def find_version(*parts):
# Work around https://github.com/html5lib/html5lib-python/issues/189
"html5lib >= 0.999, != 0.9999, != 1.0b5, != 0.99999, != 1.0b6",
],
requires=["Django (>=1.11)"],
requires=["Django (>=2.2)"],
extras_require={
"code": ["Pygments"],
"disquscommentsarea": ["django-disqus"],
Expand Down Expand Up @@ -77,7 +77,6 @@ def find_version(*parts):
"License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
Expand Down
4 changes: 2 additions & 2 deletions test-requirements.txt
@@ -1,10 +1,10 @@
django-wysiwyg
html5lib==1.0b10
html5lib
Pillow
micawber
docutils
textile
MarkDown==2.6.8
MarkDown
pygments
disqus
#twitter-text-py
13 changes: 6 additions & 7 deletions tox.ini
@@ -1,8 +1,8 @@
[tox]
envlist=
py27-django{111},
py36-django{111,20,21,22},
# py35-django-dev,
py36-django{22,30,31},
py37-django{22,30,31},
py38-django{22,30,31},
docs,

[testenv]
Expand All @@ -15,18 +15,17 @@ deps =
Pillow
Pygments
micawber
django111: Django >= 1.11,<1.12
django20: Django >= 2.0,<2.1
django21: Django >= 2.1,<2.2
django22: Django >= 2.2,<2.3
django30: Django >= 3.0,<3.1
django31: Django >= 3.1,<3.2
django-dev: https://github.com/django/django/tarball/master
commands=
python --version
python runtests.py

[testenv:docs]
changedir = docs
deps =
Sphinx
-r{toxinidir}/docs/_ext/djangodummy/requirements.txt
changedir = docs
commands = sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html

0 comments on commit 165fe16

Please sign in to comment.