Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit bfe255f

Browse filesBrowse files
mattipmattip
committed
BUILD: move all test dependencies to ./test_requirements.txt
1 parent d464d19 commit bfe255f
Copy full SHA for bfe255f

File tree

Expand file treeCollapse file tree

7 files changed

+34
-38
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+34
-38
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ environment:
3434
PYTHON_VERSION: 3.6
3535
PYTHON_ARCH: 64
3636
TEST_MODE: full
37-
INSTALL_PICKLE5: 1
3837

3938
- PYTHON: C:\Python37-x64
4039
PYTHON_VERSION: 3.7
4140
PYTHON_ARCH: 64
4241
TEST_MODE: full
43-
INSTALL_PICKLE5: 1
4442

4543
init:
4644
- "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
@@ -98,10 +96,8 @@ install:
9896
# Upgrade to the latest pip.
9997
- 'python -m pip install -U pip setuptools wheel'
10098

101-
- if [%INSTALL_PICKLE5%]==[1] echo pickle5 >> tools/ci/appveyor/requirements.txt
102-
10399
# Install the numpy test dependencies.
104-
- 'pip install -U --timeout 5 --retries 2 -r tools/ci/appveyor/requirements.txt'
100+
- 'pip install -U --timeout 5 --retries 2 -r test_requirements.txt'
105101

106102
build_script:
107103
# Here, we add MinGW to the path to be able to link an OpenBLAS.dll

‎azure-pipelines.yml

Copy file name to clipboardExpand all lines: azure-pipelines.yml
+21-8Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ jobs:
2121
apt-get -y update && \
2222
apt-get -y install python3.6-dev python3-pip locales python3-certifi && \
2323
locale-gen fr_FR && update-locale && \
24-
pip3 install setuptools nose cython==0.29.0 pytest pytz pickle5 && \
2524
apt-get -y install gfortran-5 wget && \
2625
target=\$(python3 tools/openblas_support.py) && \
2726
cp -r \$target/usr/local/lib/* /usr/lib && \
2827
cp \$target/usr/local/include/* /usr/include && \
28+
python3 -m pip install --user --upgrade pip setuptools && \
29+
python3 -m pip install --user -r test_requirements.txt && \
2930
python3 -m pip install . && \
3031
F77=gfortran-5 F90=gfortran-5 \
3132
CFLAGS='-UNDEBUG -std=c99' python3 runtests.py -n --mode=full -- -rsx --junitxml=junit/test-results.xml && \
@@ -85,7 +86,9 @@ jobs:
8586
displayName: 'install pre-built openblas'
8687
- script: python -m pip install --upgrade pip setuptools wheel
8788
displayName: 'Install tools'
88-
- script: python -m pip install cython nose pytz pytest pickle5 vulture docutils sphinx==1.8.5 numpydoc
89+
- script: |
90+
python -m pip install -r test_requirements.txt
91+
python -m pip install vulture docutils sphinx==1.8.5 numpydoc
8992
displayName: 'Install dependencies; some are optional to avoid test skips'
9093
- script: /bin/bash -c "! vulture . --min-confidence 100 --exclude doc/,numpy/distutils/ | grep 'unreachable'"
9194
displayName: 'Check for unreachable code paths in Python modules'
@@ -140,13 +143,11 @@ jobs:
140143
PYTHON_VERSION: '3.6'
141144
PYTHON_ARCH: 'x64'
142145
TEST_MODE: full
143-
INSTALL_PICKLE5: 1
144146
BITS: 64
145147
Python37-64bit-full:
146148
PYTHON_VERSION: '3.7'
147149
PYTHON_ARCH: 'x64'
148150
TEST_MODE: full
149-
INSTALL_PICKLE5: 1
150151
BITS: 64
151152
steps:
152153
- task: UsePythonVersion@0
@@ -156,11 +157,8 @@ jobs:
156157
architecture: $(PYTHON_ARCH)
157158
- script: python -m pip install --upgrade pip setuptools wheel
158159
displayName: 'Install tools'
159-
- script: python -m pip install cython nose pytz pytest
160+
- script: python -m pip install -r test_requirements.txt
160161
displayName: 'Install dependencies; some are optional to avoid test skips'
161-
- script: if [%INSTALL_PICKLE5%]==[1] python -m pip install pickle5
162-
displayName: 'Install optional pickle5 backport (only for python3.6 and 3.7)'
163-
164162
- powershell: |
165163
$pyversion = python -c "from __future__ import print_function; import sys; print(sys.version.split()[0])"
166164
Write-Host "Python Version: $pyversion"
@@ -220,3 +218,18 @@ jobs:
220218
testResultsFiles: '**/test-*.xml'
221219
testRunTitle: 'Publish test results for PyPy3'
222220
failTaskOnFailedTests: true
221+
222+
- job: Check_dependencies
223+
pool:
224+
vmIMage: 'ubuntu-16.04'
225+
steps:
226+
- script: |
227+
python3.6 -mvenv testenv
228+
source testenv/bin/activate
229+
pip install --upgrade pip setuptools
230+
pip list -o > /tmp/current_pkgs
231+
pip install -r test_requirements.txt
232+
pip list -o > /tmp/test_pkgs
233+
# any newer packages should cause the diff to return 1, which fails the job
234+
diff /tmp/current_pkgs /tmp/test_pkgs
235+
displayName: 'Show any possible updates to packages'

‎test_requirements.txt

Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
cython==0.29.13
2+
pytest==5.0.1
3+
pytz==2018.9
4+
pytest-cov==2.6.1
5+
pickle5; python_version == '3.7'
6+
pickle5; python_version == '3.6' and platform_python_implementation != 'PyPy'

‎tools/ci/appveyor/requirements.txt

Copy file name to clipboardExpand all lines: tools/ci/appveyor/requirements.txt
-6Lines changed: 0 additions & 6 deletions
This file was deleted.

‎tools/pypy-test.sh

Copy file name to clipboardExpand all lines: tools/pypy-test.sh
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ mkdir -p pypy3
3232
(cd pypy3; tar --strip-components=1 -xf ../pypy.tar.bz2)
3333
pypy3/bin/pypy3 -mensurepip
3434
pypy3/bin/pypy3 -m pip install --upgrade pip setuptools
35-
pypy3/bin/pypy3 -m pip install --user cython==0.29.0 pytest pytz --no-warn-script-location
35+
pypy3/bin/pypy3 -m pip install --user -r test_requirements.txt --no-warn-script-location
3636

3737
echo
3838
echo pypy3 version

‎tools/travis-before-install.sh

Copy file name to clipboardExpand all lines: tools/travis-before-install.sh
+2-6Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,8 @@ fi
3030
source venv/bin/activate
3131
python -V
3232

33-
if [ -n "$INSTALL_PICKLE5" ]; then
34-
pip install pickle5
35-
fi
36-
33+
popd
3734

3835
pip install --upgrade pip setuptools
39-
pip install pytz cython pytest
36+
pip install -r test_requirements.txt
4037
if [ -n "$USE_ASV" ]; then pip install asv; fi
41-
popd

‎tools/travis-test.sh

Copy file name to clipboardExpand all lines: tools/travis-test.sh
+3-12Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ setup_base()
6565

6666
run_test()
6767
{
68+
$PIP install -r test_requirements.txt
6869
if [ -n "$USE_DEBUG" ]; then
6970
export PYTHONPATH=$PWD
7071
fi
7172

7273
if [ -n "$RUN_COVERAGE" ]; then
73-
$PIP install pytest-cov
7474
COVERAGE_FLAG=--coverage
7575
fi
7676

@@ -158,14 +158,10 @@ if [ -n "$USE_WHEEL" ] && [ $# -eq 0 ]; then
158158
# Move out of source directory to avoid finding local numpy
159159
pushd dist
160160
$PIP install --pre --no-index --upgrade --find-links=. numpy
161-
$PIP install nose pytest
162-
163-
if [ -n "$INSTALL_PICKLE5" ]; then
164-
$PIP install pickle5
165-
fi
166-
167161
popd
162+
168163
run_test
164+
169165
elif [ -n "$USE_SDIST" ] && [ $# -eq 0 ]; then
170166
# use an up-to-date pip / setuptools inside the venv
171167
$PIP install -U virtualenv
@@ -182,11 +178,6 @@ elif [ -n "$USE_SDIST" ] && [ $# -eq 0 ]; then
182178
# Move out of source directory to avoid finding local numpy
183179
pushd dist
184180
$PIP install numpy*
185-
$PIP install nose pytest
186-
if [ -n "$INSTALL_PICKLE5" ]; then
187-
$PIP install pickle5
188-
fi
189-
190181
popd
191182
run_test
192183
else

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.