Skip to content

Commit 7caf96c

Browse files
committedJun 15, 2016
Improved relay requirement, removed Django/SQLAlchemy dependency in main package
1 parent 5ccd815 commit 7caf96c

File tree

5 files changed

+8
-32
lines changed

5 files changed

+8
-32
lines changed
 

‎.coveragerc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[run]
2-
omit = graphene/utils/enum.py,graphene/contrib/django/debug/sql/tracking.py,*/tests/*
2+
omit = graphene/utils/enum.py,*/tests/*

‎.travis.yml

+1-12
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,9 @@ before_install:
2323
install:
2424
- |
2525
if [ "$TEST_TYPE" = build ]; then
26-
pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django django-filter sqlalchemy_utils
26+
pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six
2727
pip install --download-cache $HOME/.cache/pip psycopg2 > /dev/null 2>&1
2828
pip install --download-cache $HOME/.cache/pip/ -e .
29-
pip install --download-cache $HOME/.cache/pip/ -e .[django]
30-
pip install --download-cache $HOME/.cache/pip/ -e .[sqlalchemy]
31-
pip install django==$DJANGO_VERSION
3229
python setup.py develop
3330
elif [ "$TEST_TYPE" = build_website ]; then
3431
pip install --download-cache $HOME/.cache/pip/ -e .
@@ -82,14 +79,6 @@ env:
8279
matrix:
8380
fast_finish: true
8481
include:
85-
- python: '2.7'
86-
env: TEST_TYPE=build DJANGO_VERSION=1.6
87-
- python: '2.7'
88-
env: TEST_TYPE=build DJANGO_VERSION=1.7
89-
- python: '2.7'
90-
env: TEST_TYPE=build DJANGO_VERSION=1.8
91-
- python: '2.7'
92-
env: TEST_TYPE=build DJANGO_VERSION=1.9
9382
- python: '2.7'
9483
env: TEST_TYPE=build_website
9584
- python: '2.7'

‎setup.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[flake8]
2-
exclude = setup.py,docs/*,examples/cookbook_django/*
2+
exclude = setup.py,docs/*
33
max-line-length = 120
44

55
[coverage:run]
6-
omit = graphene/utils/enum.py,graphene/contrib/django/debug/sql/tracking.py,*/tests/*
6+
omit = graphene/utils/enum.py,*/tests/*
77

88
[isort]
99
known_first_party=graphene

‎setup.py

+3-13
Original file line numberDiff line numberDiff line change
@@ -56,30 +56,20 @@ def run_tests(self):
5656
install_requires=[
5757
'six>=1.10.0',
5858
'graphql-core>=0.5.1',
59-
'graphql-relay>=0.4.2',
59+
'graphql-relay>=0.4.3',
6060
'iso8601',
6161
],
6262
tests_require=[
63-
'django-filter>=0.10.0',
6463
'pytest>=2.7.2',
65-
'pytest-django',
66-
'sqlalchemy',
67-
'sqlalchemy_utils',
6864
'mock',
69-
# Required for Django postgres fields testing
70-
'psycopg2',
7165
],
7266
extras_require={
7367
'django': [
74-
'Django>=1.6.0',
75-
'singledispatch>=3.4.0.3',
76-
'graphql-django-view>=1.3',
68+
'graphene-django',
7769
],
7870
'sqlalchemy': [
79-
'sqlalchemy',
80-
'singledispatch>=3.4.0.3',
71+
'graphene-sqlalchemy',
8172
]
8273
},
83-
8474
cmdclass={'test': PyTest},
8575
)

‎tox.ini

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@ skipsdist = true
55
[testenv]
66
deps=
77
pytest>=2.7.2
8-
django>=1.8.0,<1.9
9-
pytest-django
10-
graphql-django-view==1.3
118
graphql-core>=0.5.1
12-
graphql-relay>=0.4.2
9+
graphql-relay>=0.4.3
1310
six
1411
blinker
1512
singledispatch

0 commit comments

Comments
 (0)
Please sign in to comment.