Skip to content

Commit

Permalink
Merge pull request #57 from jneight/django_3
Browse files Browse the repository at this point in the history
release for django 3.1
  • Loading branch information
jneight authored Nov 6, 2020
2 parents 35d76c9 + b9312b2 commit 261e013
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 27 deletions.
24 changes: 5 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,11 @@ services:
matrix:
include:
# https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
- {env: DJANGO=1.11, python: '2.7'}
- {env: DJANGO=1.11, python: '3.5'}
- {env: DJANGO=1.11, python: '3.6'}
- {env: DJANGO=1.11, python: '3.7'}
- {env: DJANGO=1.11, python: '3.8'}
- {env: DJANGO=1.11, python: 'pypy3'}

- {env: DJANGO=2.2, python: '3.5'}
- {env: DJANGO=2.2, python: '3.6'}
- {env: DJANGO=2.2, python: '3.7'}
- {env: DJANGO=2.2, python: '3.8'}
- {env: DJANGO=2.2, python: 'nightly'}
- {env: DJANGO=2.2, python: 'pypy3'}

- {env: DJANGO=3.0, python: '3.6'}
- {env: DJANGO=3.0, python: '3.7'}
- {env: DJANGO=3.0, python: '3.8'}
- {env: DJANGO=3.0, python: 'nightly'}
- {env: DJANGO=3.0, python: 'pypy3'}
- {env: DJANGO=3.1.2, python: '3.6'}
- {env: DJANGO=3.1.2, python: '3.7'}
- {env: DJANGO=3.1.2, python: '3.8'}
- {env: DJANGO=3.1.2, python: 'nightly'}
- {env: DJANGO=3.1.2, python: 'pypy3'}

- {env: DJANGO=master, python: '3.6'}
- {env: DJANGO=master, python: '3.7'}
Expand Down
8 changes: 3 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ def long_description():

setup(
name='django-db-geventpool',
version='3.2.3',
version='4.0',
install_requires=[
'django>=1.11',
'django>=3.1',
'psycogreen>=1.0',
],
url='https://github.com/jneight/django-db-geventpool',
Expand All @@ -29,13 +29,11 @@ def long_description():
classifiers=[
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.1',
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
'Topic :: Software Development :: Libraries :: Application Frameworks',
],
Expand Down
3 changes: 0 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ commands = python -Wall runtests.py
deps =
gevent
psycopg2-binary
dj11: django~=1.1
dj22: django~=2.2
dj30: django~=3.0
dj31: django~=3.1

0 comments on commit 261e013

Please sign in to comment.