Skip to content

Commit

Permalink
Merge pull request #215 from mlavin/fix_ci
Browse files Browse the repository at this point in the history
fixed ci
  • Loading branch information
domdinicola authored Jun 26, 2020
2 parents 5eda3fd + 8b8790f commit f07a0fe
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
docs/_build/*
docs/_static/*
dist/*
build/
*.egg-info/*
.coverage
.tox/*
.tox/*
.idea/
.venv/
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@ dist: bionic
matrix:
fast_finish: true
include:
- { python: "3.4", env: DJANGO=1.11 }

- { python: "3.5", env: DJANGO=1.11 }
- { python: "3.5", env: DJANGO=2.1 }
- { python: "3.5", env: DJANGO=2.2 }

- { python: "3.6", env: DJANGO=1.11 }
- { python: "3.6", env: DJANGO=2.1 }
- { python: "3.6", env: DJANGO=2.2 }
Expand Down
1 change: 1 addition & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ Josh Addington
Tobias Zanke
Petr Dlouhy
Vinod Kurup
Domenico Di Nicola

Thanks for all of your work!
6 changes: 6 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Release 1.3
-----------------
* added support to python 3.7 and 3.8
* added support to django 3.0
* added support to italian language
* dropped support to python 2.7
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Features
Installation Requirements
-----------------------------------

- Python 3.4+
- Python 3.6+
- `Django <http://www.djangoproject.com/>`_ >= 1.11
- `jQuery <http://jquery.com/>`_ >= 1.9, < 3.0
- `jQuery UI <http://jqueryui.com/>`_ >= 1.10
Expand Down
2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ def read_file(filename):
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 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',
Expand Down
12 changes: 5 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
[tox]
envlist =
py{34,35,36,37}-django111
py{35,36,37}-django21
py{35,36,37,38}-django22
py{36,37}-django111
py{36,37}-django21
py{36,37,38}-django22
py{36,37,38}-django30
py{37,38}-django_master
docs

[testenv]
basepython =
py34: python3.4
py35: python3.5
py36: python3.6
py37: python3.7
py38: python3.8
deps =
coverage>=4.0,<4.1
coverage>=4.0
django111: Django>=1.11,<2.0
django21: Django>=2.1,<2.2
django22: Django>=2.2,<3.0
Expand All @@ -24,7 +22,7 @@ deps =
commands = coverage run runtests.py

[testenv:docs]
basepython = python3.5
basepython = python3.6
deps =
Sphinx
Django
Expand Down

0 comments on commit f07a0fe

Please sign in to comment.