Skip to content

Commit

Permalink
Updated requirements, dropped Python 3.5 support
Browse files Browse the repository at this point in the history
  • Loading branch information
vmagamedov committed Oct 5, 2020
1 parent fb690a1 commit cb7dc4c
Show file tree
Hide file tree
Showing 12 changed files with 58 additions and 89 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ sudo: false
dist: xenial
language: python
python:
- '3.5'
- '3.6'
- '3.7'
- '3.8'
- 'pypy3.5'
cache: pip
install:
- pip install codecov
Expand Down
45 changes: 24 additions & 21 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,33 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile -U requirements-docs.in
# pip-compile requirements-docs.in
#
alabaster==0.7.12 # via sphinx
babel==2.7.0 # via sphinx
certifi==2019.9.11 # via requests
babel==2.8.0 # via sphinx
certifi==2020.6.20 # via requests
chardet==3.0.4 # via requests
docutils==0.15.2 # via sphinx
idna==2.8 # via requests
imagesize==1.1.0 # via sphinx
jinja2==2.10.3 # via sphinx
docutils==0.16 # via sphinx
idna==2.10 # via requests
imagesize==1.2.0 # via sphinx
jinja2==2.11.2 # via sphinx
markupsafe==1.1.1 # via jinja2
packaging==19.2 # via sphinx
pygments==2.4.2 # via sphinx
pyparsing==2.4.2 # via packaging
pytz==2019.3 # via babel
requests==2.22.0 # via sphinx
six==1.12.0 # via packaging
packaging==20.4 # via sphinx
pygments==2.7.1 # via sphinx
pyparsing==2.4.7 # via packaging
pytz==2020.1 # via babel
requests==2.24.0 # via sphinx
six==1.15.0 # via packaging
snowballstemmer==2.0.0 # via sphinx
sphinx-rtd-theme==0.4.3
sphinx==2.2.0
sphinxcontrib-applehelp==1.0.1 # via sphinx
sphinxcontrib-devhelp==1.0.1 # via sphinx
sphinxcontrib-htmlhelp==1.0.2 # via sphinx
sphinx-rtd-theme==0.5.0 # via -r requirements-docs.in
sphinx==3.2.1 # via -r requirements-docs.in, sphinx-rtd-theme
sphinxcontrib-applehelp==1.0.2 # via sphinx
sphinxcontrib-devhelp==1.0.2 # via sphinx
sphinxcontrib-htmlhelp==1.0.3 # via sphinx
sphinxcontrib-jsmath==1.0.1 # via sphinx
sphinxcontrib-qthelp==1.0.2 # via sphinx
sphinxcontrib-serializinghtml==1.1.3 # via sphinx
urllib3==1.25.6 # via requests
sphinxcontrib-qthelp==1.0.3 # via sphinx
sphinxcontrib-serializinghtml==1.1.4 # via sphinx
urllib3==1.25.10 # via requests

# The following packages are considered to be unsafe in a requirements file:
# setuptools
37 changes: 18 additions & 19 deletions requirements-tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,23 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile -U requirements-tests.in
# pip-compile requirements-tests.in
#
astor==0.8.0
atomicwrites==1.3.0 # via pytest
attrs==19.3.0 # via pytest
coverage==4.5.4 # via pytest-cov
faker==2.0.3
importlib-metadata==0.23 # via pluggy, pytest
more-itertools==7.2.0 # via pytest, zipp
packaging==19.2 # via pytest
pluggy==0.13.0 # via pytest
py==1.8.0 # via pytest
pyparsing==2.4.2 # via packaging
pytest-asyncio==0.10.0
pytest-cov==2.8.1
pytest==5.2.1
python-dateutil==2.8.0 # via faker
six==1.12.0 # via faker, packaging, python-dateutil
astor==0.8.1 # via -r requirements-tests.in
attrs==20.2.0 # via pytest
coverage==5.3 # via pytest-cov
faker==4.4.0 # via -r requirements-tests.in
importlib-metadata==2.0.0 # via pluggy, pytest
iniconfig==1.0.1 # via pytest
packaging==20.4 # via pytest
pluggy==0.13.1 # via pytest
py==1.9.0 # via pytest
pyparsing==2.4.7 # via packaging
pytest-asyncio==0.14.0 # via -r requirements-tests.in
pytest-cov==2.10.1 # via -r requirements-tests.in
pytest==6.1.1 # via -r requirements-tests.in, pytest-asyncio, pytest-cov
python-dateutil==2.8.1 # via faker
six==1.15.0 # via packaging, python-dateutil
text-unidecode==1.3 # via faker
wcwidth==0.1.7 # via pytest
zipp==0.6.0 # via importlib-metadata
toml==0.10.1 # via pytest
zipp==3.3.0 # via importlib-metadata
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
graphql-core-next; python_version >= '3.6'
graphql-core
sqlalchemy
protobuf
aiopg
Expand Down
19 changes: 11 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile -U requirements.in
# pip-compile requirements.in
#
aiopg==1.0.0
graphql-core-next==1.1.1 ; python_version >= "3.6"
prometheus-client==0.7.1
protobuf==3.10.0
psycopg2-binary==2.8.4 # via aiopg
six==1.12.0 # via protobuf
sqlalchemy==1.3.10
aiopg==1.0.0 # via -r requirements.in
graphql-core==3.1.2 ; python_version >= "3.6" # via -r requirements.in
prometheus-client==0.8.0 # via -r requirements.in
protobuf==3.13.0 # via -r requirements.in
psycopg2-binary==2.8.6 # via aiopg
six==1.15.0 # via protobuf
sqlalchemy==1.3.19 # via -r requirements.in

# The following packages are considered to be unsafe in a requirements file:
# setuptools
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
packages=find_packages(exclude=['test*']),
include_package_data=True,
license='BSD-3-Clause',
python_requires='>=3.5',
python_requires='>=3.6',
install_requires=[],
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3 :: Only',
'Topic :: Software Development :: Libraries :: Python Modules',
],
Expand Down
8 changes: 0 additions & 8 deletions tests/test_denormalize_graphql.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
import pytest

from hiku.compat import PY36, PYPY

if not PY36 or PYPY: # noqa
pytest.skip("graphql-core-next library requires Python>=3.6",
allow_module_level=True)

from hiku.types import TypeRef, Integer, Sequence
from hiku.graph import Graph, Node, Field, Root, Link
from hiku.result import ROOT, Proxy, Index, Reference
Expand Down
6 changes: 0 additions & 6 deletions tests/test_endpoint_graphql.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import pytest

from hiku.compat import PY36, PYPY

if not PY36 or PYPY: # noqa
pytest.skip("graphql-core-next library requires Python>=3.6",
allow_module_level=True)

from hiku.graph import Graph, Root, Field
from hiku.types import String
from hiku.engine import Engine
Expand Down
8 changes: 0 additions & 8 deletions tests/test_export_graphql.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
import pytest

from hiku.compat import PY36, PYPY

if not PY36 or PYPY: # noqa
pytest.skip("graphql-core-next library requires Python>=3.6",
allow_module_level=True)

from graphql.language.printer import print_ast

from hiku.query import Field, Link, Node
Expand Down
4 changes: 2 additions & 2 deletions tests/test_export_protobuf.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ def test_invalid_options():
with pytest.raises(ParseError) as type_err:
export(Node([Field('kott',
options={'clauber': UNKNOWN})]))
type_err.match('Unexpected type for Value message')
type_err.match('has unexpected type')

with pytest.raises(ParseError) as item_type_err:
export(Node([Field('puerco',
options={'bayat': [1, UNKNOWN, 3]})]))
item_type_err.match('Unexpected type for Value message')
item_type_err.match('has unexpected type')
6 changes: 0 additions & 6 deletions tests/test_introspection_graphql.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@

import pytest

from hiku.compat import PY36, PYPY

if not PY36 or PYPY: # noqa
pytest.skip("graphql-core-next library requires Python>=3.6",
allow_module_level=True)

from hiku.graph import Graph, Root, Field, Node, Link, apply, Option
from hiku.types import String, Integer, Sequence, TypeRef, Boolean, Float, Any
from hiku.types import Optional, Record
Expand Down
6 changes: 0 additions & 6 deletions tests/test_read_graphql.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import pytest

from hiku.compat import PY36, PYPY

if not PY36 or PYPY: # noqa
pytest.skip("graphql-core-next library requires Python>=3.6",
allow_module_level=True)

from graphql.language import ast
from graphql.language.parser import parse

Expand Down

0 comments on commit cb7dc4c

Please sign in to comment.