diff options
| author | William Deegan <bill@baddogconsulting.com> | 2021-08-04 21:31:37 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2021-08-04 21:31:37 (GMT) |
| commit | 6f8d43ddd8f02153a4529bcbacf34fd9126ad3a4 (patch) | |
| tree | 55320ec07fceabc1c1db616e4d6acc4cd3f6df2d | |
| parent | 202a77c895d9c6a8b5cd193e041ff1371f708d31 (diff) | |
| download | SCons-6f8d43ddd8f02153a4529bcbacf34fd9126ad3a4.zip SCons-6f8d43ddd8f02153a4529bcbacf34fd9126ad3a4.tar.gz SCons-6f8d43ddd8f02153a4529bcbacf34fd9126ad3a4.tar.bz2 | |
move psutil into requirements.txt and remove from travis/appveyor's setup files
| -rw-r--r-- | .appveyor/install.bat | 2 | ||||
| -rwxr-xr-x | .travis/install.sh | 1 | ||||
| -rw-r--r-- | requirements.txt | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.appveyor/install.bat b/.appveyor/install.bat index eaf22a2..d009e54 100644 --- a/.appveyor/install.bat +++ b/.appveyor/install.bat @@ -3,7 +3,7 @@ for /F "tokens=*" %%g in ('C:\\%WINPYTHON%\\python.exe -c "import sys; print(sys REM use mingw 32 bit until #3291 is resolved set PATH=C:\\%WINPYTHON%;C:\\%WINPYTHON%\\Scripts;C:\\ProgramData\\chocolatey\\bin;C:\\MinGW\\bin;C:\\MinGW\\msys\\1.0\\bin;C:\\cygwin\\bin;C:\\msys64\\usr\\bin;C:\\msys64\\mingw64\\bin;%PATH% C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off pip setuptools wheel -C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off coverage codecov psutil +C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off coverage codecov set STATIC_DEPS=true & C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off lxml C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off -r requirements.txt REM install 3rd party tools to test with diff --git a/.travis/install.sh b/.travis/install.sh index 1212c92..942aeab 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -57,7 +57,6 @@ else pip install git+https://github.com/cython/cython.git@0.29.x pip install git+https://github.com/lxml/lxml.git fi - pip install psutil # sudo wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list # wget -qO - https://dlang.org/d-keyring.gpg | sudo apt-key add - diff --git a/requirements.txt b/requirements.txt index 4093f19..0d5e0f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,7 @@ sphinx<3.5.0 sphinx_rtd_theme lxml==4.6.3 rst2pdf -ninja
\ No newline at end of file +ninja + +# Needed for test/Parallel/failed-build/failed-build.py +psutil |