Skip to content

Commit 7b86168

Browse files
committed
Merge branch 'master' of github.com:kensho-technologies/graphql-compiler into add-integration-tests
2 parents 9176941 + 7dcddb0 commit 7b86168

File tree

8 files changed

+455
-40
lines changed

8 files changed

+455
-40
lines changed

.travis.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,35 @@ apt:
99
packages:
1010
- python-mysqldb
1111
install:
12-
- pip install -r dev-requirements.txt
13-
- pip install -e .
12+
- pip install --upgrade pip
13+
- pip install --upgrade setuptools pipenv
14+
- pipenv install --dev --deploy --system
15+
- pipenv install --system --skip-lock -e .
1416
before_script:
1517
- docker-compose up -d
1618
matrix:
1719
include:
1820
- name: "Lint and static analysis"
1921
python: "3.6"
2022
script:
21-
- ./scripts/copyright_line_check.sh
22-
- isort --check-only --verbose --recursive graphql_compiler/
23-
- flake8 --config=setup.cfg graphql_compiler/
24-
- pydocstyle graphql_compiler/
25-
- pylint graphql_compiler/
26-
- bandit -r graphql_compiler/
23+
- pipenv run ./scripts/copyright_line_check.sh
24+
- pipenv run isort --check-only --verbose --recursive graphql_compiler/
25+
- pipenv run flake8 --config=setup.cfg graphql_compiler/
26+
- pipenv run pydocstyle graphql_compiler/
27+
- pipenv run pylint graphql_compiler/
28+
- pipenv run bandit -r graphql_compiler/
2729
- name: "Python 2.7 unit tests"
2830
python: "2.7"
2931
script:
30-
- py.test --cov=graphql_compiler graphql_compiler/tests
32+
- pipenv run py.test --cov=graphql_compiler graphql_compiler/tests
3133
- name: "Python 3.6 unit tests"
3234
python: "3.6"
3335
script:
34-
- py.test --cov=graphql_compiler graphql_compiler/tests
36+
- pipenv run py.test --cov=graphql_compiler graphql_compiler/tests
37+
- name: "Python 3.7 unit tests"
38+
python: "3.7"
39+
script:
40+
- pipenv run py.test --cov=graphql_compiler graphql_compiler/tests
3541
after_success:
3642
- docker-compose down
3743
- coveralls

CONTRIBUTING.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22

33
Thank you for taking the time to contribute to this project!
44

5-
To get started:
5+
To get started, make sure that you have `pipenv`, `docker` and `docker-compose` installed
6+
on your computer.
7+
8+
Then, from the root of the repository, run:
69
```
7-
pip install -r dev-requirements.txt
8-
pip install -r requirements.txt
10+
docker-compose up -d
11+
pipenv sync --dev
12+
pipenv shell
913
1014
py.test graphql_compiler/tests
1115
```
@@ -31,7 +35,8 @@ of both the contributors and the project.
3135
This project follows the
3236
[Google Python style guide](https://google.github.io/styleguide/pyguide.html).
3337

34-
Additionally, any contributions must pass the following set of lint and style checks with no issues:
38+
Additionally, any contributions must pass the following set of lint and style checks with no issues
39+
when executed from a pipenv shell (i.e. after running `pipenv shell`):
3540
```
3641
isort --check-only --verbose --recursive graphql_compiler/
3742

Pipfile

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[[source]]
2+
name = "pypi"
3+
url = "https://pypi.org/simple"
4+
verify_ssl = true
5+
6+
[dev-packages]
7+
bandit = "==1.4.0"
8+
coveralls = "==1.2.0"
9+
flake8 = "==3.5.0"
10+
isort = "==4.3.4"
11+
pydocstyle = "==2.1.1"
12+
pylint = "==1.8.2"
13+
pyorient = "==1.5.5"
14+
pytest = "==3.4.1"
15+
pytest-cov = "==2.5.1"
16+
snapshottest = "==0.5.0"
17+
18+
[packages]
19+
arrow = "==0.10.0"
20+
funcy = "==1.7.3"
21+
graphql-core = "==1.1"
22+
pytz = "==2017.2"
23+
six = "==1.10.0"
24+
sqlalchemy = "==1.2.9"
25+
26+
[requires]
27+
python_version = "3.6"

0 commit comments

Comments
 (0)