From e7d973f602bd8381d996432e372ae75e419b2a41 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 9 Sep 2018 00:44:18 +0000 Subject: [PATCH 1/6] Add renovate.json --- renovate.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000..f45d8f110c --- /dev/null +++ b/renovate.json @@ -0,0 +1,5 @@ +{ + "extends": [ + "config:base" + ] +} From 62e1c4538dc8903d74198dde979249ccc0ac7805 Mon Sep 17 00:00:00 2001 From: "Nathaniel J. Smith" Date: Sat, 8 Sep 2018 18:08:41 -0700 Subject: [PATCH 2/6] Enable automerge: true --- renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index f45d8f110c..04b95fd12e 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,6 @@ { "extends": [ "config:base" - ] + ], + "automerge": true } From 8289d5b1d658188acb1b7bfe18dcc6de4a613e10 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Mon, 10 Sep 2018 10:02:21 +0400 Subject: [PATCH 3/6] ci: only build renovate PRs once --- .travis.yml | 4 ++++ appveyor.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7150d0c7f8..f3080e2d97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,3 +40,7 @@ matrix: script: - ci/travis.sh + +branches: + except: + - /renovate/*/ diff --git a/appveyor.yml b/appveyor.yml index cf5a653592..018ef625e5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,3 +28,7 @@ test_script: # -u makes sure we get prompt output - "python -u -m pytest -W error -ra --run-slow --faulthandler-timeout=60 ../trio -v -s --cov=trio --cov-config=../.coveragerc" - "codecov" + +branches: + except: + - /renovate/*/ From 1ba7e58ba76a0d6b0a08387cdc7ce7a692642acc Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Tue, 11 Sep 2018 10:27:49 +0400 Subject: [PATCH 4/6] Run pip-compile on requirements files --- ci/rtd-requirements.txt | 36 +++++++++++++++++++++++---- test-requirements.txt | 54 +++++++++++++++++++++++++++++++++++------ 2 files changed, 77 insertions(+), 13 deletions(-) diff --git a/ci/rtd-requirements.txt b/ci/rtd-requirements.txt index 8f3d16fdc1..7d87557c07 100644 --- a/ci/rtd-requirements.txt +++ b/ci/rtd-requirements.txt @@ -1,5 +1,31 @@ -# RTD is currently installing 1.5.3, which has a bug in :lineno-match: -sphinx >= 1.7.0 -sphinx_rtd_theme -sphinxcontrib-trio -towncrier +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile --output-file rtd-requirements.txt rtd-requirements.txt +# +alabaster==0.7.11 # via sphinx +babel==2.6.0 # via sphinx +certifi==2018.8.24 # via requests +chardet==3.0.4 # via requests +click==6.7 # via towncrier +docutils==0.14 # via sphinx +idna==2.7 # via requests +imagesize==1.1.0 # via sphinx +incremental==17.5.0 # via towncrier +jinja2==2.10 # via sphinx, towncrier +markupsafe==1.0 # via jinja2 +packaging==17.1 # via sphinx +pygments==2.2.0 # via sphinx +pyparsing==2.2.0 # via packaging +pytz==2018.5 # via babel +requests==2.19.1 # via sphinx +six==1.11.0 # via packaging, sphinx +snowballstemmer==1.2.1 # via sphinx +sphinx-rtd-theme==0.4.1 +sphinx==1.7.9 +sphinxcontrib-trio==1.0.1 +sphinxcontrib-websupport==1.1.0 # via sphinx +toml==0.9.6 # via towncrier +towncrier==18.6.0 +urllib3==1.23 # via requests diff --git a/test-requirements.txt b/test-requirements.txt index 78b5c6ff7c..80aa163aad 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,8 +1,46 @@ -pytest == 3.7.4 # for catchlog fixture -pytest-cov >= 2.6.0 -ipython # for the IPython traceback integration tests -pyOpenSSL # for the ssl tests -trustme # for the ssl tests -pytest-faulthandler -pylint # for pylint finding all symbols tests -jedi # for jedi code completion tests +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile --output-file test-requirements.txt test-requirements.txt +# +appnope==0.1.0 # via ipython +asn1crypto==0.24.0 # via cryptography +astroid==2.0.4 # via pylint +atomicwrites==1.2.1 # via pytest +attrs==18.2.0 # via pytest +backcall==0.1.0 # via ipython +cffi==1.11.5 # via cryptography +coverage==4.5.1 # via pytest-cov +cryptography==2.3.1 # via pyopenssl, trustme +decorator==4.3.0 # via ipython, traitlets +idna==2.7 # via cryptography, trustme +ipython-genutils==0.2.0 # via traitlets +ipython==6.5.0 +isort==4.3.4 # via pylint +jedi==0.12.1 +lazy-object-proxy==1.3.1 # via astroid +mccabe==0.6.1 # via pylint +more-itertools==4.3.0 # via pytest +parso==0.3.1 # via jedi +pathlib2==2.3.2 # via pytest +pexpect==4.6.0 # via ipython +pickleshare==0.7.4 # via ipython +pluggy==0.7.1 # via pytest +prompt-toolkit==1.0.15 # via ipython +ptyprocess==0.6.0 # via pexpect +py==1.6.0 # via pytest +pycparser==2.18 # via cffi +pygments==2.2.0 # via ipython +pylint==2.1.1 +pyopenssl==18.0.0 +pytest-cov==2.6.0 +pytest-faulthandler==1.5.0 +pytest==3.7.4 +simplegeneric==0.8.1 # via ipython +six==1.11.0 # via astroid, cryptography, more-itertools, pathlib2, prompt-toolkit, pyopenssl, pytest, traitlets +traitlets==4.3.2 # via ipython +trustme==0.4.0 +typed-ast==1.1.0 # via astroid +wcwidth==0.1.7 # via prompt-toolkit +wrapt==1.10.11 # via astroid From a934868f9b627dd08cd3da10e95260b281a80c49 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 12 Sep 2018 09:58:27 +0400 Subject: [PATCH 5/6] Add .in requirements file with required env marker --- ci/rtd-requirements.in | 5 +++++ ci/rtd-requirements.txt | 2 +- test-requirements.in | 11 +++++++++++ test-requirements.txt | 6 ++++-- 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 ci/rtd-requirements.in create mode 100644 test-requirements.in diff --git a/ci/rtd-requirements.in b/ci/rtd-requirements.in new file mode 100644 index 0000000000..8f3d16fdc1 --- /dev/null +++ b/ci/rtd-requirements.in @@ -0,0 +1,5 @@ +# RTD is currently installing 1.5.3, which has a bug in :lineno-match: +sphinx >= 1.7.0 +sphinx_rtd_theme +sphinxcontrib-trio +towncrier diff --git a/ci/rtd-requirements.txt b/ci/rtd-requirements.txt index 7d87557c07..d2771d386c 100644 --- a/ci/rtd-requirements.txt +++ b/ci/rtd-requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file rtd-requirements.txt rtd-requirements.txt +# pip-compile --output-file rtd-requirements.txt rtd-requirements.in # alabaster==0.7.11 # via sphinx babel==2.6.0 # via sphinx diff --git a/test-requirements.in b/test-requirements.in new file mode 100644 index 0000000000..cd5625ceff --- /dev/null +++ b/test-requirements.in @@ -0,0 +1,11 @@ +pytest == 3.7.4 # for catchlog fixture +pytest-cov >= 2.6.0 +ipython # for the IPython traceback integration tests +pyOpenSSL # for the ssl tests +trustme # for the ssl tests +pytest-faulthandler + +# https://github.com/python-trio/trio/pull/654#issuecomment-420518745 +typed_ast;python_version<"3.7" and implementation_name=="cpython" +pylint # for pylint finding all symbols tests +jedi # for jedi code completion tests diff --git a/test-requirements.txt b/test-requirements.txt index 80aa163aad..863d6768c0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,8 +2,10 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file test-requirements.txt test-requirements.txt +# pip-compile --output-file test-requirements.txt test-requirements.in # +--index-url https://clustree:rbLnWxZhMWPRVQCr3ndtHfN7Q4Mah3DxXPvfDCKUzzXxXuPRay@devpi.clustree.net:3141/root/develop + appnope==0.1.0 # via ipython asn1crypto==0.24.0 # via cryptography astroid==2.0.4 # via pylint @@ -41,6 +43,6 @@ simplegeneric==0.8.1 # via ipython six==1.11.0 # via astroid, cryptography, more-itertools, pathlib2, prompt-toolkit, pyopenssl, pytest, traitlets traitlets==4.3.2 # via ipython trustme==0.4.0 -typed-ast==1.1.0 # via astroid +typed-ast==1.1.0 ; python_version < "3.7" and implementation_name == "cpython" wcwidth==0.1.7 # via prompt-toolkit wrapt==1.10.11 # via astroid From ca50541dc495d302ccf0d40f57ef16b8689874b6 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 12 Sep 2018 11:07:17 +0400 Subject: [PATCH 6/6] test-requirements: use same pytest version as master --- test-requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.in b/test-requirements.in index cd5625ceff..84b9542513 100644 --- a/test-requirements.in +++ b/test-requirements.in @@ -1,4 +1,4 @@ -pytest == 3.7.4 # for catchlog fixture +pytest >= 3.3 # for catchlog fixture pytest-cov >= 2.6.0 ipython # for the IPython traceback integration tests pyOpenSSL # for the ssl tests