mirror of
https://github.com/graphql-python/graphene.git
synced 2024-11-25 19:13:57 +03:00
Improved relay requirement, removed Django/SQLAlchemy dependency in main package
This commit is contained in:
parent
5ccd815fbd
commit
7caf96c746
|
@ -1,2 +1,2 @@
|
||||||
[run]
|
[run]
|
||||||
omit = graphene/utils/enum.py,graphene/contrib/django/debug/sql/tracking.py,*/tests/*
|
omit = graphene/utils/enum.py,*/tests/*
|
||||||
|
|
13
.travis.yml
13
.travis.yml
|
@ -23,12 +23,9 @@ before_install:
|
||||||
install:
|
install:
|
||||||
- |
|
- |
|
||||||
if [ "$TEST_TYPE" = build ]; then
|
if [ "$TEST_TYPE" = build ]; then
|
||||||
pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django django-filter sqlalchemy_utils
|
pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six
|
||||||
pip install --download-cache $HOME/.cache/pip psycopg2 > /dev/null 2>&1
|
pip install --download-cache $HOME/.cache/pip psycopg2 > /dev/null 2>&1
|
||||||
pip install --download-cache $HOME/.cache/pip/ -e .
|
pip install --download-cache $HOME/.cache/pip/ -e .
|
||||||
pip install --download-cache $HOME/.cache/pip/ -e .[django]
|
|
||||||
pip install --download-cache $HOME/.cache/pip/ -e .[sqlalchemy]
|
|
||||||
pip install django==$DJANGO_VERSION
|
|
||||||
python setup.py develop
|
python setup.py develop
|
||||||
elif [ "$TEST_TYPE" = build_website ]; then
|
elif [ "$TEST_TYPE" = build_website ]; then
|
||||||
pip install --download-cache $HOME/.cache/pip/ -e .
|
pip install --download-cache $HOME/.cache/pip/ -e .
|
||||||
|
@ -82,14 +79,6 @@ env:
|
||||||
matrix:
|
matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
include:
|
include:
|
||||||
- python: '2.7'
|
|
||||||
env: TEST_TYPE=build DJANGO_VERSION=1.6
|
|
||||||
- python: '2.7'
|
|
||||||
env: TEST_TYPE=build DJANGO_VERSION=1.7
|
|
||||||
- python: '2.7'
|
|
||||||
env: TEST_TYPE=build DJANGO_VERSION=1.8
|
|
||||||
- python: '2.7'
|
|
||||||
env: TEST_TYPE=build DJANGO_VERSION=1.9
|
|
||||||
- python: '2.7'
|
- python: '2.7'
|
||||||
env: TEST_TYPE=build_website
|
env: TEST_TYPE=build_website
|
||||||
- python: '2.7'
|
- python: '2.7'
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
[flake8]
|
[flake8]
|
||||||
exclude = setup.py,docs/*,examples/cookbook_django/*
|
exclude = setup.py,docs/*
|
||||||
max-line-length = 120
|
max-line-length = 120
|
||||||
|
|
||||||
[coverage:run]
|
[coverage:run]
|
||||||
omit = graphene/utils/enum.py,graphene/contrib/django/debug/sql/tracking.py,*/tests/*
|
omit = graphene/utils/enum.py,*/tests/*
|
||||||
|
|
||||||
[isort]
|
[isort]
|
||||||
known_first_party=graphene
|
known_first_party=graphene
|
||||||
|
|
16
setup.py
16
setup.py
|
@ -56,30 +56,20 @@ setup(
|
||||||
install_requires=[
|
install_requires=[
|
||||||
'six>=1.10.0',
|
'six>=1.10.0',
|
||||||
'graphql-core>=0.5.1',
|
'graphql-core>=0.5.1',
|
||||||
'graphql-relay>=0.4.2',
|
'graphql-relay>=0.4.3',
|
||||||
'iso8601',
|
'iso8601',
|
||||||
],
|
],
|
||||||
tests_require=[
|
tests_require=[
|
||||||
'django-filter>=0.10.0',
|
|
||||||
'pytest>=2.7.2',
|
'pytest>=2.7.2',
|
||||||
'pytest-django',
|
|
||||||
'sqlalchemy',
|
|
||||||
'sqlalchemy_utils',
|
|
||||||
'mock',
|
'mock',
|
||||||
# Required for Django postgres fields testing
|
|
||||||
'psycopg2',
|
|
||||||
],
|
],
|
||||||
extras_require={
|
extras_require={
|
||||||
'django': [
|
'django': [
|
||||||
'Django>=1.6.0',
|
'graphene-django',
|
||||||
'singledispatch>=3.4.0.3',
|
|
||||||
'graphql-django-view>=1.3',
|
|
||||||
],
|
],
|
||||||
'sqlalchemy': [
|
'sqlalchemy': [
|
||||||
'sqlalchemy',
|
'graphene-sqlalchemy',
|
||||||
'singledispatch>=3.4.0.3',
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
cmdclass={'test': PyTest},
|
cmdclass={'test': PyTest},
|
||||||
)
|
)
|
||||||
|
|
5
tox.ini
5
tox.ini
|
@ -5,11 +5,8 @@ skipsdist = true
|
||||||
[testenv]
|
[testenv]
|
||||||
deps=
|
deps=
|
||||||
pytest>=2.7.2
|
pytest>=2.7.2
|
||||||
django>=1.8.0,<1.9
|
|
||||||
pytest-django
|
|
||||||
graphql-django-view==1.3
|
|
||||||
graphql-core>=0.5.1
|
graphql-core>=0.5.1
|
||||||
graphql-relay>=0.4.2
|
graphql-relay>=0.4.3
|
||||||
six
|
six
|
||||||
blinker
|
blinker
|
||||||
singledispatch
|
singledispatch
|
||||||
|
|
Loading…
Reference in New Issue
Block a user