Skip to content

Commit 512e052

Browse files
committed
Prepare backward compatible minor release
1 parent 08c5995 commit 512e052

9 files changed

+41
-47
lines changed

Diff for: .gitignore

+3-24
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1-
# Created by https://www.gitignore.io
2-
3-
### Python ###
4-
# Byte-compiled / optimized / DLL files
51
__pycache__/
62
*.py[cod]
73

8-
# C extensions
9-
*.so
10-
11-
# Distribution / packaging
124
.Python
135
env/
146
build/
@@ -26,36 +18,23 @@ var/
2618
.installed.cfg
2719
*.egg
2820

29-
# PyInstaller
30-
# Usually these files are written by a python script from a template
31-
# before PyInstaller builds the exe, so as to inject date/other infos into it.
3221
*.manifest
3322
*.spec
3423

35-
# Installer logs
3624
pip-log.txt
3725
pip-delete-this-directory.txt
3826

39-
# Unit test / coverage reports
4027
htmlcov/
4128
.tox/
29+
.venv/
4230
.coverage
4331
.coverage.*
4432
.cache
4533
nosetests.xml
4634
coverage.xml
47-
*,cover
35+
*.cover
4836

49-
# Translations
50-
*.mo
51-
*.pot
37+
.idea/
5238

53-
# Django stuff:
5439
*.log
5540

56-
# Sphinx documentation
57-
docs/_build/
58-
59-
# PyBuilder
60-
target/
61-

Diff for: .travis.yml

+15-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,26 @@ python:
66
- 3.5
77
- 3.6
88
- 3.7
9+
- 3.8
910
- pypy3
1011
install:
1112
- pip install pytest pytest-cov flake8
1213
- pip install .
1314
script:
14-
- py.test --cov=graphql_relay
15-
# - flake8
15+
- pytest --cov=graphql_relay
16+
- flake8 setup.py src tests
1617
after_success:
1718
- pip install coveralls
1819
- coveralls
20+
21+
deploy:
22+
provider: pypi
23+
distributions: sdist bdist_wheel
24+
on:
25+
branch: master
26+
tags: true
27+
python: 3.7
28+
skip_existing: true
29+
user: mvanlonden
30+
password:
31+
secure: gu79sV5e3wkUI8eH20TbBRctOOGkuWe6EQUjJP17q1Jm15/sJsehOaaLPiG0psxtqBGABp+z+xXkjhRfNMowY2xJPLjGmpF23pOIWGjBWKLKXzJStegKM6kwJYyHzcykIhBEb74047FhqhcwOgZcsp6sZpfzuby+onevLzPDI0C4jTARw7WAqMln9JIBZJyoQKp9fpr8AoXL2JtHr6sjkeJ94lz1XViL9rtTo7qFYfqYS3XdKO0wJhLfMUXSihIzSWQykBVv+75tMKQr0CtGALXcJSRGT6Sb31GiFyG93rtcOcBvbjFt1MK8aNKyIMhwgSqjcgKvxWAvXn4MsCaabHPVEv0YuT9t9cQzaAvi81LqHkpALgpDfXFfsMzHG18/8ME9TpM8u52r/ST5lhukglfnxWVy4hg8VLZ0iiTtpS3hx1Ba4Uecr++6fI5X+KL3EPabApQM+t4rcC0h4mEbjq3IkZ/ANAIJ2UjKTMcUkbQbKqJ1MY4xQyw+vVugffBmhEWSb4GnQPEadMGD6qfUI+t7epDP0ipp67rOiUooFYGabQp40pf7MxFPG23fvJ3JWbo3fzcIRmQiSalrIL1gFXH2DQnv4xhZvwnci+dIK29mamH0CfmjAJ8BdfzRsjV156BZbfkzXRfWDMes9G2E8S27xJJ2N4ySNIMkaXsu1u4=

Diff for: setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
[flake8]
2-
exclude = tests/*,setup.py
3-
max-line-length = 160
2+
max-line-length = 120

Diff for: setup.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ def run_tests(self):
2222
errno = pytest.main(self.pytest_args)
2323
sys.exit(errno)
2424

25+
2526
setup(
2627
name='graphql-relay',
27-
version='0.4.5',
28+
version='0.5.0',
2829

2930
description='Relay implementation for Python',
3031
long_description=open('README.rst').read(),
@@ -43,9 +44,10 @@ def run_tests(self):
4344
'Programming Language :: Python :: 2',
4445
'Programming Language :: Python :: 2.7',
4546
'Programming Language :: Python :: 3',
46-
'Programming Language :: Python :: 3.3',
47-
'Programming Language :: Python :: 3.4',
4847
'Programming Language :: Python :: 3.5',
48+
'Programming Language :: Python :: 3.6',
49+
'Programming Language :: Python :: 3.7',
50+
'Programming Language :: Python :: 3.8',
4951
'Programming Language :: Python :: Implementation :: PyPy',
5052
],
5153

@@ -58,7 +60,7 @@ def run_tests(self):
5860
'graphql-core>=0.5.0,<2',
5961
'promise>=0.4.0'
6062
],
61-
tests_require=['pytest>=2.7.2'],
63+
tests_require=['pytest>=3,<4'],
6264
extras_require={
6365
},
6466

Diff for: tests/starwars/schema.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from collections import namedtuple
2-
31
from graphql.type import (
42
GraphQLID,
53
GraphQLNonNull,
@@ -31,7 +29,7 @@
3129

3230
from .data import (
3331
Faction,
34-
Ship,
32+
# Ship,
3533
getFaction,
3634
getShip,
3735
getRebels,
@@ -54,7 +52,7 @@
5452
# Wars trilogy.
5553

5654
# Using our shorthand to describe type systems, the type system for our
57-
# example will be the followng:
55+
# example will be the following:
5856
#
5957
# interface Node {
6058
# id: ID!
@@ -132,8 +130,8 @@ def get_node_type(obj, context, info):
132130
else:
133131
return shipType
134132

135-
node_interface, node_field = node_definitions(get_node, get_node_type)
136133

134+
node_interface, node_field = node_definitions(get_node, get_node_type)
137135

138136
# We define our basic ship type.
139137
#
@@ -259,6 +257,7 @@ def mutate_and_get_payload(data, *_):
259257
factionId=factionId,
260258
)
261259

260+
262261
shipMutation = mutation_with_client_mutation_id(
263262
'IntroduceShip',
264263
input_fields={

Diff for: tests/starwars/test_connections.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from pytest import raises
21
from graphql import graphql
32

43
from .schema import StarWarsSchema

Diff for: tests/starwars/test_mutations.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from pytest import raises
21
from graphql import graphql
32

43
from .schema import StarWarsSchema

Diff for: tests/starwars/test_objectidentification.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from pytest import raises
21
from graphql import graphql
32

43
from .schema import StarWarsSchema

Diff for: tox.ini

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
[tox]
2-
envlist = py27,py33,py34,py35,pypy
2+
envlist = py{27,35,36,37,38,py}, flake8
3+
4+
[testenv:flake8]
5+
basepython = python3.7
6+
deps = flake8>=3.7,<4
7+
commands =
8+
flake8 src tests setup.py
39

410
[testenv]
511
deps=
6-
pytest>=2.7.2
12+
pytest>=3,<4
713
django>=1.8.0,<1.9
8-
six
9-
flake8
10-
singledispatch
14+
six>=0.10.0
15+
singledispatch>=3.4,<3.5
1116
commands=
12-
py.test
13-
flake8
17+
pytest {posargs}
18+

0 commit comments

Comments
 (0)