Skip to content

Commit

Permalink
Merge pull request #117 from wesokes/develop
Browse files Browse the repository at this point in the history
update versions
  • Loading branch information
somewes authored Dec 29, 2020
2 parents 08fbd1b + 6bf5bb5 commit f2ae66f
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 21 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,19 @@ sudo: false
python:
- "3.6"
- "3.7"
- "3.8"

env:
matrix:
- DJANGO=2.0
- DJANGO=2.1
- DJANGO=2.2
- DJANGO=3.0
- DJANGO=3.1
- DJANGO=master

addons:
postgresql: '9.6'

matrix:
exclude:
- { python: "3.7", env: DJANGO=2.0 }

include:
- { python: "3.6", env: TOXENV=flake8 }

Expand Down
5 changes: 5 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Release Notes
=============

v2.0.0
------
* Support django 2.2, 3.0, 3.1 only
* Support python 3.6, 3.7, 3.8 only

v1.4.0
------
* Only support django >= 2.0 and python >= 3.6
Expand Down
2 changes: 1 addition & 1 deletion manager_utils/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.4.0'
__version__ = '2.0.0'
1 change: 1 addition & 0 deletions requirements/requirements-testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ django-dynamic-fixture
pytz
django-timezone-field
parameterized
freezegun
14 changes: 7 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ def get_version():
classifiers=[
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'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',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
],
install_requires=[
'Django>=1.10',
'django-query-builder>=1.1.0',
'Django>=2.2',
'django-query-builder>=2.0.0',
],
tests_require=[
'coverage',
Expand Down
16 changes: 8 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[tox]
envlist =
flake8
py{36}-django20
py{36,37}-django21
py{36,37}-django22
py{36,37}-djangomaster
py{36,37,38}-django30
py{36,37,38}-django31
py{36,37,38}-djangomaster

[testenv]
setenv =
DB = postgres
deps =
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
django22: Django>=2.2,<3.0
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
djangomaster: https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt
commands =
Expand All @@ -26,7 +26,7 @@ commands = flake8 manager_utils

[travis:env]
DJANGO =
2.0: django20
2.1: django21
2.2: django22
3.0: django30
3.1: django31
master: djangomaster

0 comments on commit f2ae66f

Please sign in to comment.