Skip to content

Commit da5c4d1

Browse files
authored
Merge pull request #1709 from altendky/ipython_vs_3.6
CI: Use older ipython/traitlets on 3.6 since latest versions have dropped 3.6 support
2 parents 4f5dc9a + 3cd6ecc commit da5c4d1

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

ci.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,14 @@ python -m pip --version
393393
python setup.py sdist --formats=zip
394394
python -m pip install dist/*.zip
395395

396+
if python -c 'import sys; sys.exit(sys.version_info >= (3, 7))'; then
397+
# Python < 3.7, select last ipython with 3.6 support
398+
# macOS requires the suffix for --in-place or you get an undefined label error
399+
sed -i'.bak' 's/ipython==[^ ]*/ipython==7.16.1/' test-requirements.txt
400+
sed -i'.bak' 's/traitlets==[^ ]*/traitlets==4.3.3/' test-requirements.txt
401+
git diff test-requirements.txt
402+
fi
403+
396404
if [ "$CHECK_FORMATTING" = "1" ]; then
397405
python -m pip install -r test-requirements.txt
398406
source check.sh

test-requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ cffi==1.14.2 # via cryptography
1515
click==7.1.2 # via black
1616
coverage==5.2.1 # via pytest-cov
1717
cryptography==3.1 # via pyopenssl, trustme
18-
decorator==4.4.2 # via ipython, traitlets
18+
decorator==4.4.2 # via ipython
1919
flake8==3.8.3 # via -r test-requirements.in
2020
idna==2.10 # via -r test-requirements.in, trustme
2121
immutables==0.14 # via -r test-requirements.in
2222
iniconfig==1.0.1 # via pytest
2323
ipython-genutils==0.2.0 # via traitlets
24-
ipython==7.16.1 # via -r test-requirements.in
24+
ipython==7.18.1 # via -r test-requirements.in
2525
isort==5.4.2 # via pylint
2626
jedi==0.17.2 # via -r test-requirements.in, ipython
2727
lazy-object-proxy==1.4.3 # via astroid
@@ -49,11 +49,11 @@ pyparsing==2.4.7 # via packaging
4949
pytest-cov==2.10.1 # via -r test-requirements.in
5050
pytest==6.0.1 # via -r test-requirements.in, pytest-cov
5151
regex==2020.7.14 # via black
52-
six==1.15.0 # via astroid, cryptography, packaging, pyopenssl, traitlets
52+
six==1.15.0 # via astroid, cryptography, packaging, pyopenssl
5353
sniffio==1.1.0 # via -r test-requirements.in
5454
sortedcontainers==2.2.2 # via -r test-requirements.in
5555
toml==0.10.1 # via black, pylint, pytest
56-
traitlets==4.3.3 # via ipython
56+
traitlets==5.0.0 # via ipython
5757
trustme==0.6.0 # via -r test-requirements.in
5858
typed-ast==1.4.1 ; implementation_name == "cpython" # via -r test-requirements.in, black, mypy
5959
typing-extensions==3.7.4.3 ; implementation_name == "cpython" # via -r test-requirements.in, black, mypy

0 commit comments

Comments
 (0)