Skip to content

Commit ac5f888

Browse files
CitoCito
committed
Merge the 'next' branch to master
2 parents c54a79d + b90fcde commit ac5f888

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+4672
-3536
lines changed

‎.bumpversion.cfg

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[bumpversion]
2+
current_version = 3.0.0a2
3+
commit = False
4+
tag = False
5+
6+
[bumpversion:file:src/graphql/version.py]
7+
search = version = "{current_version}"
8+
replace = version = "{new_version}"
9+
10+
[bumpversion:file:pyproject.toml]
11+
search = version = "{current_version}"
12+
replace = version = "{new_version}"

‎.coveragerc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[run]
2+
branch = True
3+
source = src
4+
5+
[report]
6+
exclude_lines =
7+
pragma: no cover
8+
raise NotImplementedError
9+
ignore_errors = True
10+
omit =
11+
docs/*
12+
tests/*

‎.editorconfig

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# http://editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
indent_style = space
7+
indent_size = 4
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true
10+
charset = utf-8
11+
end_of_line = lf
12+
13+
[*.bat]
14+
indent_style = tab
15+
end_of_line = crlf
16+
17+
[LICENSE]
18+
insert_final_newline = false
19+
20+
[Makefile]
21+
indent_style = tab

‎.flake8

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[flake8]
2+
ignore = E203,W503,E704
3+
exclude = .git,.mypy_cache,.pytest_cache,.tox,.venv,__pycache__,build,dist,docs
4+
max-line-length = 88

‎.gitignore

Lines changed: 25 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,28 @@
1-
# Created by https://www.gitignore.io
21

3-
### Python ###
4-
# Byte-compiled / optimized / DLL files
5-
__pycache__/
6-
*.py[cod]
7-
8-
# C extensions
9-
*.so
10-
11-
# Distribution / packaging
12-
.Python
13-
env/
14-
build/
15-
develop-eggs/
16-
dist/
17-
downloads/
18-
eggs/
19-
.eggs/
20-
lib/
21-
lib64/
22-
parts/
23-
sdist/
24-
var/
25-
*.egg-info/
26-
.installed.cfg
27-
*.egg
28-
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.
32-
*.manifest
33-
*.spec
34-
35-
# Installer logs
36-
pip-log.txt
37-
pip-delete-this-directory.txt
38-
39-
# Unit test / coverage reports
40-
htmlcov/
41-
.tox/
42-
.coverage
43-
.coverage.*
442
.cache
45-
nosetests.xml
46-
coverage.xml
47-
*,cover
48-
49-
# Translations
50-
*.mo
51-
*.pot
52-
53-
# Django stuff:
3+
.coverage
4+
.env
5+
.env.bak
6+
.idea
7+
.mypy_cache
8+
.pytest_cache
9+
.tox
10+
.venv
11+
.venv.bak
12+
.vs
13+
14+
build
15+
dist
16+
docs/_build
17+
pip-wheel-metadata
18+
wheels
19+
20+
play
21+
22+
__pycache__
23+
24+
*.cover
25+
*.egg
26+
*.egg-info
5427
*.log
55-
56-
# Sphinx documentation
57-
docs/_build/
58-
59-
# PyBuilder
60-
target/
61-
28+
*.py[cod]

‎.travis.yml

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,43 @@
11
language: python
2-
dist: xenial
3-
4-
python:
5-
- 2.7
6-
- 3.5
7-
- 3.6
8-
- 3.7
9-
- pypy3
2+
matrix:
3+
include:
4+
- name: Code quality tests
5+
env: TOXENV=flake8,mypy
6+
python: 3.7
7+
dist: xenial
8+
sudo: true
9+
- name: Unit tests with Python 3.8
10+
env: TOXENV=py38
11+
python: 3.8
12+
dist: xenial
13+
sudo: true
14+
- name: Unit tests with Python 3.7
15+
env: TOXENV=py37
16+
python: 3.7
17+
dist: xenial
18+
sudo: true
19+
- name: Unit tests with Python 3.6
20+
env: TOXENV=py36
21+
python: 3.6
22+
cache:
23+
directories:
24+
- "$HOME/.cache/pip"
25+
- "$TRAVIS_BUILD_DIR/.tox"
1026
install:
11-
- pip install pytest pytest-cov flake8
12-
- pip install .
27+
- pip install "poetry>=1.0.0"
28+
- poetry install
1329
script:
14-
- py.test --cov=graphql_relay
15-
# - flake8
30+
- tox -e $TOXENV -- --cov-report term-missing --cov=graphql_relay
1631
after_success:
17-
- pip install coveralls
18-
- coveralls
32+
- codecov
33+
deploy:
34+
provider: pypi
35+
distributions: sdist bdist_wheel
36+
on:
37+
branch: next
38+
tags: true
39+
python: 3.7
40+
skip_existing: true
41+
username: mvanlonden
42+
password:
43+
secure: gu79sV5e3wkUI8eH20TbBRctOOGkuWe6EQUjJP17q1Jm15/sJsehOaaLPiG0psxtqBGABp+z+xXkjhRfNMowY2xJPLjGmpF23pOIWGjBWKLKXzJStegKM6kwJYyHzcykIhBEb74047FhqhcwOgZcsp6sZpfzuby+onevLzPDI0C4jTARw7WAqMln9JIBZJyoQKp9fpr8AoXL2JtHr6sjkeJ94lz1XViL9rtTo7qFYfqYS3XdKO0wJhLfMUXSihIzSWQykBVv+75tMKQr0CtGALXcJSRGT6Sb31GiFyG93rtcOcBvbjFt1MK8aNKyIMhwgSqjcgKvxWAvXn4MsCaabHPVEv0YuT9t9cQzaAvi81LqHkpALgpDfXFfsMzHG18/8ME9TpM8u52r/ST5lhukglfnxWVy4hg8VLZ0iiTtpS3hx1Ba4Uecr++6fI5X+KL3EPabApQM+t4rcC0h4mEbjq3IkZ/ANAIJ2UjKTMcUkbQbKqJ1MY4xQyw+vVugffBmhEWSb4GnQPEadMGD6qfUI+t7epDP0ipp67rOiUooFYGabQp40pf7MxFPG23fvJ3JWbo3fzcIRmQiSalrIL1gFXH2DQnv4xhZvwnci+dIK29mamH0CfmjAJ8BdfzRsjV156BZbfkzXRfWDMes9G2E8S27xJJ2N4ySNIMkaXsu1u4=

‎CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @Cito

‎MANIFEST.in

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
global-exclude tests/*
2-
recursive-exclude tests *
3-
recursive-exclude tests_py35 *
1+
include MANIFEST.in
2+
3+
include CODEOWNERS
44
include LICENSE
5+
include README.md
6+
7+
include .bumpversion.cfg
8+
include .coveragerc
9+
include .editorconfig
10+
include .flake8
11+
12+
include codecov.yml
13+
include mypy.ini
14+
include tox.ini
15+
16+
include poetry.lock
17+
include pyproject.toml
18+
19+
graft src/graphql_relay
20+
graft tests
21+
22+
global-exclude *.py[co] __pycache__

0 commit comments

Comments
 (0)