From cfea8346186ef40a426d150397d9c99f7b73f649 Mon Sep 17 00:00:00 2001 From: KingDarBoja Date: Sat, 14 Mar 2020 14:50:48 -0500 Subject: [PATCH 01/12] chore: contributing docs and refactor dev packages --- .travis.yml | 38 +++++++---------- .vscode/settings.json | 3 ++ CONTRIBUTING.md | 94 +++++++++++++++++++++++++++++++++++++++++++ MANIFEST.in | 5 +++ README.md | 3 ++ setup.cfg | 4 +- setup.py | 28 ++++++++++--- tests/schema.py | 8 +--- tests/test_asyncio.py | 14 +++---- tests/test_helpers.py | 13 ++---- tests/test_query.py | 19 +++------ tox.ini | 34 ++++++++++------ 12 files changed, 182 insertions(+), 81 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 CONTRIBUTING.md diff --git a/.travis.yml b/.travis.yml index 250247c..93de77a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,28 +1,18 @@ language: python -matrix: - include: - - python: "3.7" - env: TOX_ENV=black,flake8,mypy,py37 - - python: "3.6" - env: TOX_ENV=py36 - - python: "3.5" - env: TOX_ENV=py35 - - python: "2.7" - env: TOX_ENV=py27 - - python: pypy3 - env: TOX_ENV=pypy3 - - python: pypy - env: TOX_ENV=pypy -cache: - directories: - - "$HOME/.cache/pip" - - "$TRAVIS_BUILD_DIR/.tox" -install: - - pip install tox codecov -script: - - tox -e $TOX_ENV -- --cov-report term-missing --cov=graphql_server -after_success: - - codecov +sudo: false +python: + - 2.7 + - 3.5 + - 3.6 + - 3.7 + - 3.8 + - 3.9-dev + - pypy + - pypy3 +cache: pip +install: pip install tox-travis codecov +script: tox +after_success: codecov deploy: provider: pypi on: diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..801b5ee --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.pythonPath": "D:\\Anaconda3\\envs\\graphql-sc-dev\\python.exe" +} \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..0def60d --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,94 @@ +# Contributing + +Thanks for helping to make graphql-server-core awesome! + +We welcome all kinds of contributions: + +- Bug fixes +- Documentation improvements +- New features +- Refactoring & tidying + + +## Getting started + +If you have a specific contribution in mind, be sure to check the [issues](https://github.com/graphql-python/graphql-server-core/issues) and [pull requests](https://github.com/graphql-python/graphql-server-core/pulls) in progress - someone could already be working on something similar and you can help out. + + +## Project setup + +### Development with virtualenv (recommended) + +After cloning this repo, create a virtualenv: + +```console +virtualenv graphql-server-core-dev +``` + +Activate the virtualenv and install dependencies by running: + +```console +python pip install -e ".[test]" +``` + +If you are using Linux or MacOS, you can make use of Makefile command +`make dev-setup`, which is a shortcut for the above python command. + +### Development on Conda + +You must create a new env (e.g. `graphql-sc-dev`) with the following command: + +```sh +conda create -n graphql-sc-dev python=3.8 +``` + +Then activate the environment with `conda activate graphql-sc-dev`. + +Proceed to install all dependencies by running: + +```console +pip install -e.[dev] +``` + +And you ready to start development! + +## Running tests + +After developing, the full test suite can be evaluated by running: + +```sh +pytest tests --cov=graphql-server-core -vv +``` + +If you are using Linux or MacOS, you can make use of Makefile command +`make tests`, which is a shortcut for the above python command. + +You can also test on several python environments by using tox. + +### Running tox on virtualenv + +Install tox: + +```console +pip install tox +``` + +Run `tox` on your virtualenv (do not forget to activate it!) +and that's it! + +### Running tox on Conda + +In order to run `tox` command on conda, install +[tox-conda](https://github.com/tox-dev/tox-conda): + +```sh +conda install -c conda-forge tox-conda +``` + +This install tox underneath so no need to install it before. + +Then uncomment the `requires = tox-conda` line on `tox.ini` file. + +Run `tox` and you will see all the environments being created +and all passing tests. :rocket: + diff --git a/MANIFEST.in b/MANIFEST.in index 04f196a..1c690a9 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,7 @@ include README.md include LICENSE +include CONTRIBUTING.md + +include tox.ini + +global-exclude *.py[co] __pycache__ diff --git a/README.md b/README.md index ec7e022..fdb3d40 100644 --- a/README.md +++ b/README.md @@ -42,3 +42,6 @@ You can also use one of the existing integrations listed above as blueprint to build your own integration or GraphQL server implementations. Please let us know when you have built something new, so we can list it here. + +## Contributing +See [CONTRIBUTING.md](CONTRIBUTING.md) diff --git a/setup.cfg b/setup.cfg index ea8cbd3..da11080 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,12 +1,12 @@ [flake8] exclude = docs -max-line-length = 88 +max-line-length = 120 [isort] known_first_party=graphql_server [tool:pytest] -norecursedirs = venv .venv .tox .git .cache .mypy_cache .pytest_cache +norecursedirs = venv .venv .tox .git .cache .mypy_cache .pytest_cache [bdist_wheel] universal=1 diff --git a/setup.py b/setup.py index 75f12f5..11a6634 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,22 @@ from setuptools import setup, find_packages -required_packages = ["graphql-core>=2.3,<3", "promise>=2.3,<3"] -tests_require = ["pytest==4.6.9", "pytest-cov==2.8.1"] +install_requires = [ + "graphql-core>=2.3,<3", + "promise>=2.3,<3", +] + +tests_requires = [ + "pytest==4.6.9", + "pytest-cov==2.8.1" +] + +dev_requires = [ + 'flake8==3.7.9', + 'isort<4.0.0', + 'black==19.10b0', + 'mypy==0.761', + 'check-manifest>=0.40,<1', +] + tests_requires setup( name="graphql-server-core", @@ -30,9 +45,12 @@ ], keywords="api graphql protocol rest", packages=find_packages(exclude=["tests"]), - install_requires=required_packages, - tests_require=tests_require, - extras_require={"test": tests_require}, + install_requires=install_requires, + tests_require=tests_requires, + extras_require={ + 'test': tests_requires, + 'dev': dev_requires, + }, include_package_data=True, zip_safe=False, platforms="any", diff --git a/tests/schema.py b/tests/schema.py index c60b0ed..4dd02f6 100644 --- a/tests/schema.py +++ b/tests/schema.py @@ -1,9 +1,5 @@ -from graphql.type.definition import ( - GraphQLArgument, - GraphQLField, - GraphQLNonNull, - GraphQLObjectType, -) +from graphql.type.definition import (GraphQLArgument, GraphQLField, + GraphQLNonNull, GraphQLObjectType) from graphql.type.scalars import GraphQLString from graphql.type.schema import GraphQLSchema diff --git a/tests/test_asyncio.py b/tests/test_asyncio.py index 9ee4386..cb879b1 100644 --- a/tests/test_asyncio.py +++ b/tests/test_asyncio.py @@ -1,15 +1,11 @@ -import asyncio - -from promise import Promise - from graphql.execution.executors.asyncio import AsyncioExecutor -from graphql.type.definition import ( - GraphQLField, - GraphQLNonNull, - GraphQLObjectType, -) +from graphql.type.definition import (GraphQLField, GraphQLNonNull, + GraphQLObjectType) from graphql.type.scalars import GraphQLString from graphql.type.schema import GraphQLSchema +from promise import Promise + +import asyncio from graphql_server import RequestParams, run_http_query from .utils import as_dicts diff --git a/tests/test_helpers.py b/tests/test_helpers.py index 53e9965..9318887 100644 --- a/tests/test_helpers.py +++ b/tests/test_helpers.py @@ -3,17 +3,12 @@ from graphql.error import GraphQLError from graphql.execution import ExecutionResult from graphql.language.location import SourceLocation - -from graphql_server import ( - HttpQueryError, - ServerResponse, - encode_execution_results, - json_encode, - json_encode_pretty, - load_json_body, -) from pytest import raises +from graphql_server import (HttpQueryError, ServerResponse, + encode_execution_results, json_encode, + json_encode_pretty, load_json_body) + def test_json_encode(): result = json_encode({"query": "{test}"}) diff --git a/tests/test_query.py b/tests/test_query.py index 73c1674..f5ae509 100644 --- a/tests/test_query.py +++ b/tests/test_query.py @@ -1,22 +1,13 @@ import json -from pytest import raises - -from promise import Promise - from graphql.error import GraphQLError, GraphQLSyntaxError from graphql.execution import ExecutionResult +from promise import Promise +from pytest import raises -from graphql_server import ( - HttpQueryError, - RequestParams, - ServerResults, - encode_execution_results, - json_encode, - json_encode_pretty, - load_json_body, - run_http_query, -) +from graphql_server import (HttpQueryError, RequestParams, ServerResults, + encode_execution_results, json_encode, + json_encode_pretty, load_json_body, run_http_query) from .schema import schema from .utils import as_dicts diff --git a/tox.ini b/tox.ini index f759b87..05f83f4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,38 +1,48 @@ [tox] -envlist = black,flake8,mypy,py{38,37,36,35,py27,py3,py} -skipsdist = true +envlist = + black,flake8,import-order,mypy,manifest + py{27,35,36,37,38,39-dev,py,py3} +requires = tox-conda [testenv] +passenv = * setenv = PYTHONPATH = {toxinidir} -deps = - .[test] +install_command = python -m pip install --ignore-installed {opts} {packages} +deps = -e.[test] +whitelist_externals = + python commands = - pytest tests {posargs} + pip install -U setuptools + pytest --cov-report=term-missing --cov=graphql_server tests {posargs} [testenv:black] basepython=python3.7 -deps = black==19.10b0 +deps = -e.[dev] commands = black --check graphql_server tests [testenv:flake8] basepython=python3.7 -deps = flake8==3.7.9 +deps = -e.[dev] commands = flake8 setup.py graphql_server tests -[testenv:isort] +[testenv:import-order] basepython=python3.7 -deps = - isort - graphql-core>=2.3,<3 +deps = -e.[dev] commands = isort -rc graphql_server/ tests/ [testenv:mypy] basepython=python3.7 -deps = mypy==0.761 +deps = -e.[dev] commands = mypy graphql_server tests --ignore-missing-imports +[testenv:manifest] +basepython = python3.7 +deps = -e.[dev] +commands = + check-manifest -v + From 1afbb629ef78004861faa90f1ac977bb2e794560 Mon Sep 17 00:00:00 2001 From: KingDarBoja Date: Sat, 14 Mar 2020 14:56:39 -0500 Subject: [PATCH 02/12] chore: comment out tox-conda --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 05f83f4..4f2fde0 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = black,flake8,import-order,mypy,manifest py{27,35,36,37,38,39-dev,py,py3} -requires = tox-conda +; requires = tox-conda [testenv] passenv = * From 7b3f8c01012af6dc71a1a54459ce8445b671318a Mon Sep 17 00:00:00 2001 From: KingDarBoja Date: Sat, 14 Mar 2020 22:00:24 -0500 Subject: [PATCH 03/12] chore: fix mypy issues --- graphql_server/__init__.py | 18 +++++++++--------- tox.ini | 3 +-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/graphql_server/__init__.py b/graphql_server/__init__.py index 1895a41..4f91de9 100644 --- a/graphql_server/__init__.py +++ b/graphql_server/__init__.py @@ -13,7 +13,7 @@ import six -from promise import promisify, is_thenable +from promise import promisify, is_thenable, Promise from graphql import get_default_backend from graphql.error import format_error as default_format_error @@ -266,6 +266,7 @@ def execute_graphql_request( backend=None, # type: GraphQLBackend **kwargs # type: Any ): + # type: (...) -> ExecutionResult """Execute a GraphQL request and return an ExecutionResult. You need to pass the GraphQL schema and the GraphQLParams that you can get @@ -318,18 +319,18 @@ def get_response( allow_only_query=False, # type: bool **kwargs # type: Any ): - # type: (...) -> Optional[ExecutionResult] + # type: (...) -> Optional[Union[ExecutionResult, Promise[ExecutionResult]]] """Get an individual execution result as response, with option to catch errors. This does the same as execute_graphql_request() except that you can catch errors that belong to an exception class that you need to pass as a parameter. """ + # Note: PyCharm will display a error due to the triple dot being used on Callable. + execute = execute_graphql_request # type: Callable[..., Union[Promise[ExecutionResult], ExecutionResult]] + if kwargs.get("return_promise", False): + execute = execute_graphql_request_as_promise + # noinspection PyBroadException - execute = ( - execute_graphql_request_as_promise - if kwargs.get("return_promise", False) - else execute_graphql_request - ) try: execution_result = execute(schema, params, allow_only_query, **kwargs) except catch_exc: @@ -350,11 +351,10 @@ def format_execution_result( """ status_code = 200 + response = None if execution_result: if execution_result.invalid: status_code = 400 response = execution_result.to_dict(format_error=format_error) - else: - response = None return FormattedResult(response, status_code) diff --git a/tox.ini b/tox.ini index 4f2fde0..d9cea63 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,6 @@ [tox] envlist = - black,flake8,import-order,mypy,manifest - py{27,35,36,37,38,39-dev,py,py3} + black,flake8,import-order,mypy,manifest,py{27,35,36,37,38,39-dev,py,py3} ; requires = tox-conda [testenv] From 3b74a14cfe831f3a0bb312356d96bb8c45ed9cf2 Mon Sep 17 00:00:00 2001 From: KingDarBoja Date: Sat, 14 Mar 2020 22:11:09 -0500 Subject: [PATCH 04/12] chore: apply black formatting --- graphql_server/__init__.py | 4 +++- setup.cfg | 2 +- tests/schema.py | 8 ++++++-- tests/test_asyncio.py | 3 +-- tests/test_helpers.py | 11 ++++++++--- tests/test_query.py | 13 ++++++++++--- 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/graphql_server/__init__.py b/graphql_server/__init__.py index 4f91de9..cb802ee 100644 --- a/graphql_server/__init__.py +++ b/graphql_server/__init__.py @@ -326,7 +326,9 @@ def get_response( that belong to an exception class that you need to pass as a parameter. """ # Note: PyCharm will display a error due to the triple dot being used on Callable. - execute = execute_graphql_request # type: Callable[..., Union[Promise[ExecutionResult], ExecutionResult]] + execute = ( + execute_graphql_request + ) # type: Callable[..., Union[Promise[ExecutionResult], ExecutionResult]] if kwargs.get("return_promise", False): execute = execute_graphql_request_as_promise diff --git a/setup.cfg b/setup.cfg index da11080..70e1f4a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [flake8] exclude = docs -max-line-length = 120 +max-line-length = 88 [isort] known_first_party=graphql_server diff --git a/tests/schema.py b/tests/schema.py index 4dd02f6..c60b0ed 100644 --- a/tests/schema.py +++ b/tests/schema.py @@ -1,5 +1,9 @@ -from graphql.type.definition import (GraphQLArgument, GraphQLField, - GraphQLNonNull, GraphQLObjectType) +from graphql.type.definition import ( + GraphQLArgument, + GraphQLField, + GraphQLNonNull, + GraphQLObjectType, +) from graphql.type.scalars import GraphQLString from graphql.type.schema import GraphQLSchema diff --git a/tests/test_asyncio.py b/tests/test_asyncio.py index cb879b1..db8fc02 100644 --- a/tests/test_asyncio.py +++ b/tests/test_asyncio.py @@ -1,6 +1,5 @@ from graphql.execution.executors.asyncio import AsyncioExecutor -from graphql.type.definition import (GraphQLField, GraphQLNonNull, - GraphQLObjectType) +from graphql.type.definition import GraphQLField, GraphQLNonNull, GraphQLObjectType from graphql.type.scalars import GraphQLString from graphql.type.schema import GraphQLSchema from promise import Promise diff --git a/tests/test_helpers.py b/tests/test_helpers.py index 9318887..fc4b73e 100644 --- a/tests/test_helpers.py +++ b/tests/test_helpers.py @@ -5,9 +5,14 @@ from graphql.language.location import SourceLocation from pytest import raises -from graphql_server import (HttpQueryError, ServerResponse, - encode_execution_results, json_encode, - json_encode_pretty, load_json_body) +from graphql_server import ( + HttpQueryError, + ServerResponse, + encode_execution_results, + json_encode, + json_encode_pretty, + load_json_body, +) def test_json_encode(): diff --git a/tests/test_query.py b/tests/test_query.py index f5ae509..e5bbb79 100644 --- a/tests/test_query.py +++ b/tests/test_query.py @@ -5,9 +5,16 @@ from promise import Promise from pytest import raises -from graphql_server import (HttpQueryError, RequestParams, ServerResults, - encode_execution_results, json_encode, - json_encode_pretty, load_json_body, run_http_query) +from graphql_server import ( + HttpQueryError, + RequestParams, + ServerResults, + encode_execution_results, + json_encode, + json_encode_pretty, + load_json_body, + run_http_query, +) from .schema import schema from .utils import as_dicts From 5487aba043c15bbec6eb261ef98c304ece6a778f Mon Sep 17 00:00:00 2001 From: KingDarBoja Date: Sat, 14 Mar 2020 22:15:35 -0500 Subject: [PATCH 05/12] chore: add vscode to gitignore --- .gitignore | 1 + .vscode/settings.json | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 2452aab..608847c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ .pytest_cache .tox .venv +.vscode /build/ /dist/ diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 801b5ee..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "python.pythonPath": "D:\\Anaconda3\\envs\\graphql-sc-dev\\python.exe" -} \ No newline at end of file From d433a6538bf532b21c46fb3c4f0de3fbcd5b182e Mon Sep 17 00:00:00 2001 From: KingDarBoja Date: Sat, 14 Mar 2020 23:10:36 -0500 Subject: [PATCH 06/12] chore: test travis env tools --- tox.ini | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tox.ini b/tox.ini index d9cea63..b5a4e24 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,13 @@ [tox] envlist = - black,flake8,import-order,mypy,manifest,py{27,35,36,37,38,39-dev,py,py3} + black,flake8,import-order,mypy,manifest, + py{27,35,36,37,38,39-dev,py,py3} ; requires = tox-conda +[travis] +python = + 3.6: py36,black,flake8,import-order,mypy + [testenv] passenv = * setenv = @@ -16,31 +21,31 @@ commands = pytest --cov-report=term-missing --cov=graphql_server tests {posargs} [testenv:black] -basepython=python3.7 +basepython=python3.6 deps = -e.[dev] commands = black --check graphql_server tests [testenv:flake8] -basepython=python3.7 +basepython=python3.6 deps = -e.[dev] commands = flake8 setup.py graphql_server tests [testenv:import-order] -basepython=python3.7 +basepython=python3.6 deps = -e.[dev] commands = isort -rc graphql_server/ tests/ [testenv:mypy] -basepython=python3.7 +basepython=python3.6 deps = -e.[dev] commands = mypy graphql_server tests --ignore-missing-imports [testenv:manifest] -basepython = python3.7 +basepython = python3.6 deps = -e.[dev] commands = check-manifest -v From 2b9d47d20bf42ad4c7588449cbfce3bdef95cd90 Mon Sep 17 00:00:00 2001 From: KingDarBoja Date: Sat, 14 Mar 2020 23:16:16 -0500 Subject: [PATCH 07/12] chore: test to run flake8 on Travis isolated --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 93de77a..940940d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,10 @@ python: - 3.9-dev - pypy - pypy3 +matrix: + include: + - python: 3.6 + env: TOXENV=flake8 cache: pip install: pip install tox-travis codecov script: tox From 6f6bd474be3f90534649052ab3887db7397d377e Mon Sep 17 00:00:00 2001 From: KingDarBoja Date: Sat, 14 Mar 2020 23:43:50 -0500 Subject: [PATCH 08/12] chore: add the rest of special envs to Travis --- .travis.yml | 8 ++++++++ tox.ini | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 940940d..0510a4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,14 @@ matrix: include: - python: 3.6 env: TOXENV=flake8 + - python: 3.6 + env: TOXENV=black + - python: 3.6 + env: TOXENV=import-order + - python: 3.6 + env: TOXENV=mypy + - python: 3.6 + env: TOXENV=manifest cache: pip install: pip install tox-travis codecov script: tox diff --git a/tox.ini b/tox.ini index b5a4e24..77a2bb6 100644 --- a/tox.ini +++ b/tox.ini @@ -4,10 +4,6 @@ envlist = py{27,35,36,37,38,39-dev,py,py3} ; requires = tox-conda -[travis] -python = - 3.6: py36,black,flake8,import-order,mypy - [testenv] passenv = * setenv = @@ -49,4 +45,3 @@ basepython = python3.6 deps = -e.[dev] commands = check-manifest -v - From b73f3f8775557ad02bf1d0c039aaea5f41514b05 Mon Sep 17 00:00:00 2001 From: KingDarBoja Date: Sun, 15 Mar 2020 00:01:19 -0500 Subject: [PATCH 09/12] chore: update manifest --- MANIFEST.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 1c690a9..12b4ad7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,13 @@ +include MANIFEST.in + include README.md include LICENSE include CONTRIBUTING.md +include codecov.yml include tox.ini +graft tests +prune bin + global-exclude *.py[co] __pycache__ From 9d37c7b0448eb2259940d43ba8846a840b6e758f Mon Sep 17 00:00:00 2001 From: Manuel Bojato <30560560+KingDarBoja@users.noreply.github.com> Date: Mon, 16 Mar 2020 09:16:52 -0500 Subject: [PATCH 10/12] chore: merge dev envs on single tox env Co-Authored-By: Jonathan Kim --- .travis.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0510a4a..ecffbda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,16 +11,8 @@ python: - pypy3 matrix: include: - - python: 3.6 - env: TOXENV=flake8 - - python: 3.6 - env: TOXENV=black - - python: 3.6 - env: TOXENV=import-order - - python: 3.6 - env: TOXENV=mypy - - python: 3.6 - env: TOXENV=manifest + - python: 3.7 + env: TOXENV=flake8,black,import-order,mypy,manifest cache: pip install: pip install tox-travis codecov script: tox From d8b98b7342bc4a451ffb324082f4f8dd3b9397e1 Mon Sep 17 00:00:00 2001 From: Manuel Bojato <30560560+KingDarBoja@users.noreply.github.com> Date: Mon, 16 Mar 2020 09:17:34 -0500 Subject: [PATCH 11/12] docs: Update CONTRIBUTING.md Co-Authored-By: Jonathan Kim --- CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0def60d..c573f21 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -47,7 +47,7 @@ Then activate the environment with `conda activate graphql-sc-dev`. Proceed to install all dependencies by running: ```console -pip install -e.[dev] +pip install -e ".[dev]" ``` And you ready to start development! @@ -91,4 +91,3 @@ Then uncomment the `requires = tox-conda` line on `tox.ini` file. Run `tox` and you will see all the environments being created and all passing tests. :rocket: - From 3e8545f9a0f1aa596e48a8fd662264430e70ae6b Mon Sep 17 00:00:00 2001 From: KingDarBoja Date: Mon, 16 Mar 2020 09:36:07 -0500 Subject: [PATCH 12/12] chore: set py36 for special envs on travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ecffbda..7789878 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ python: - pypy3 matrix: include: - - python: 3.7 + - python: 3.6 env: TOXENV=flake8,black,import-order,mypy,manifest cache: pip install: pip install tox-travis codecov