diff --git a/.travis.yml b/.travis.yml index e625b28..f1ca201 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,22 +24,8 @@ jobs: - env: DJANGO=master include: - - - python: 3.5 - env: DJANGO=1.11 - - python: 3.5 - env: DJANGO=2.0 - - 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.0 - - python: 3.6 - env: DJANGO=2.1 - python: 3.6 env: DJANGO=2.2 - python: 3.6 @@ -49,10 +35,6 @@ jobs: - python: 3.7 env: DJANGO=1.11 - - python: 3.7 - env: DJANGO=2.0 - - python: 3.7 - env: DJANGO=2.1 - python: 3.7 env: DJANGO=2.2 - python: 3.7 @@ -60,12 +42,21 @@ jobs: - python: 3.7 env: DJANGO=master - - python: 3.7 + - python: 3.8 + env: DJANGO=1.11 + - python: 3.8 + env: DJANGO=2.2 + - python: 3.8 + env: DJANGO=3.0 + - python: 3.8 + env: DJANGO=master + + - python: 3.8 env: TOXENV=black,flake8 - stage: deploy script: skip - python: 3.7 + python: 3.8 after_success: true deploy: provider: pypi diff --git a/setup.py b/setup.py index 7c74a06..36882d2 100644 --- a/setup.py +++ b/setup.py @@ -44,9 +44,9 @@ setup( "Intended Audience :: Developers", "Topic :: Software Development :: Libraries", "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", "Programming Language :: Python :: Implementation :: PyPy", ], keywords="api graphql protocol rest relay graphene", @@ -54,7 +54,7 @@ setup( install_requires=[ "graphene>=2.1.7,<3", "graphql-core>=2.1.0,<3", - "Django>=1.11", + "Django>=1.11,!=2.0.*,!=2.1.*", "singledispatch>=3.4.0.3", "promise>=2.1", ], diff --git a/tox.ini b/tox.ini index 616e868..9354bdb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,6 @@ [tox] envlist = - py{35,36,37}-django{111,master}, - py{36,37}-django30, + py{36,37,38}-django{111,django22,django30,master}, black,flake8 [travis:env] @@ -18,7 +17,7 @@ setenv = DJANGO_SETTINGS_MODULE=django_test_settings deps = -e.[test] - psycopg2 + psycopg2-binary django111: Django>=1.11,<2.0 django22: Django>=2.2,<3.0 django30: Django>=3.0a1,<3.1 @@ -26,13 +25,13 @@ deps = commands = {posargs:py.test --cov=graphene_django graphene_django examples} [testenv:black] -basepython = python3.7 +basepython = python3.8 deps = -e.[dev] commands = black --exclude "/migrations/" graphene_django examples setup.py --check [testenv:flake8] -basepython = python3.7 +basepython = python3.8 deps = -e.[dev] commands = flake8 graphene_django examples