Skip to content

Commit 3cd056e

Browse files
committed
Drop unsupported versions of Python and Django, and use graphql-core v3
1 parent 254e59c commit 3cd056e

File tree

3 files changed

+7
-22
lines changed

3 files changed

+7
-22
lines changed

.travis.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@ after_success:
1515
matrix:
1616
fast_finish: true
1717
include:
18-
- python: 2.7
19-
env: DJANGO=1.11
20-
21-
- python: 3.5
22-
env: DJANGO=1.11
23-
- python: 3.5
24-
env: DJANGO=2.0
25-
- python: 3.5
26-
env: DJANGO=2.1
27-
- python: 3.5
28-
env: DJANGO=2.2
29-
3018
- python: 3.6
3119
env: DJANGO=1.11
3220
- python: 3.6

setup.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
tests_require = [
1717
"pytest>=3.6.3",
1818
"pytest-cov",
19+
"pytest-asyncio",
1920
"coveralls",
2021
"mock",
2122
"pytz",
22-
"django-filter<2;python_version<'3'",
23-
"django-filter>=2;python_version>='3'",
23+
"django-filter>=2",
2424
"pytest-django>=3.3.2",
2525
] + rest_framework_require
2626

@@ -45,20 +45,17 @@
4545
"Development Status :: 3 - Alpha",
4646
"Intended Audience :: Developers",
4747
"Topic :: Software Development :: Libraries",
48-
"Programming Language :: Python :: 2",
49-
"Programming Language :: Python :: 2.7",
5048
"Programming Language :: Python :: 3",
51-
"Programming Language :: Python :: 3.4",
52-
"Programming Language :: Python :: 3.5",
5349
"Programming Language :: Python :: 3.6",
50+
"Programming Language :: Python :: 3.7",
5451
"Programming Language :: Python :: Implementation :: PyPy",
5552
],
5653
keywords="api graphql protocol rest relay graphene",
5754
packages=find_packages(exclude=["tests"]),
5855
install_requires=[
5956
"six>=1.10.0",
60-
"graphene>=2.1.3,<3",
61-
"graphql-core>=2.1.0,<3",
57+
"graphene>=3.0.dev,<4",
58+
"graphql-core>=3.0.0b0,<4",
6259
"Django>=1.11",
6360
"singledispatch>=3.4.0.3",
6461
"promise>=2.1",

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{27,35,36,37}-django{111,20,21,22,master},
3+
py{36,37}-django{111,20,21,22,master},
44
black,flake8
55

66
[travis:env]
@@ -18,7 +18,7 @@ setenv =
1818
DJANGO_SETTINGS_MODULE=django_test_settings
1919
deps =
2020
-e.[test]
21-
psycopg2
21+
psycopg2-binary
2222
django111: Django>=1.11,<2.0
2323
django20: Django>=2.0,<2.1
2424
django21: Django>=2.1,<2.2

0 commit comments

Comments
 (0)