Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,7 @@ matrix:

script:
- ci/travis.sh

branches:
except:
- /renovate/*/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Problem here, actually: if we skip CI for these branches, we'll update to incompatible versions of our dependencies too!

We should just delete the exclusion. Ideally we would also rewrite our CI scripts to use the pinned versions everywhere and check they're consistent, but you might want to leave that to a future PR (or even push them onto me 😉)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is that renovate puts these branches directly into the main repo, so the CI services want to run CI twice – once b/c it's a branch in the main repo, and a second time b/c it's a PR. I think this should eliminate the first CI, but keep the second?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Zac-HD what @njsmith says. :) Notice that the PR is indeed tested below, but the branch itself is not.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...Derp, yeah, that makes sense. (in my defence- no, wait, pyup does the same 🤦‍♂️)

4 changes: 4 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/*/
5 changes: 5 additions & 0 deletions ci/rtd-requirements.in
Original file line number Diff line number Diff line change
@@ -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
36 changes: 31 additions & 5 deletions ci/rtd-requirements.txt
Original file line number Diff line number Diff line change
@@ -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.in
#
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
6 changes: 6 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": [
"config:base"
],
"automerge": true
}
11 changes: 11 additions & 0 deletions test-requirements.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
pytest >= 3.3 # 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
56 changes: 48 additions & 8 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,48 @@
pytest >= 3.3 # 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.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
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 ; python_version < "3.7" and implementation_name == "cpython"
wcwidth==0.1.7 # via prompt-toolkit
wrapt==1.10.11 # via astroid