restricting pandas in ci #21 #3

eclipse-sumo · Jan 24, 2024 · d383aea · d383aea
1 parent 9b6ca8c
commit d383aea
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -115,7 +115,7 @@ jobs:
       if: matrix.build_type == 'full' && (github.repository == 'DLR-TS/sumo' || matrix.compiler == 'gcc')
       run: |
         sudo apt-get install python3-pyproj python3-rtree python3-pandas python3-flake8 python3-autopep8 python3-scipy python3-pulp python3-ezdxf python3-pyperclip python3-polib
-        python -m pip install ortools==9.5.2237
+        python -m pip install -r sumo/tools/req_ci.txt
         python -m pip install -r sumo/tools/requirements.txt
         cd sumo/cmake-build
         make CTEST_OUTPUT_ON_FAILURE=1 examples test

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -103,6 +103,7 @@ jobs:
     - name: Examples and extra tests
       if: matrix.build_type == 'extra' && github.repository == 'DLR-TS/sumo'
       run: |
+        python -m pip install -r sumo/tools/req_ci.txt
         python -m pip install -r sumo/tools/requirements.txt
         cd sumo/build_msvc
         cmake --build . --config Release --target examples

diff --git a/.github/workflows/wheel-linux.yml b/.github/workflows/wheel-linux.yml
@@ -99,6 +99,7 @@ jobs:
     - name: Running "sumo in the wheel" tests
       if: github.repository == 'DLR-TS/sumo'
       run: |
+        python -m pip install -r sumo/tools/req_ci.txt
         python -m pip install -r tools/requirements.txt
         tests/runTests.sh -b ci -v ci.fast
 

diff --git a/.github/workflows/wheel-windows.yml b/.github/workflows/wheel-windows.yml
@@ -151,6 +151,7 @@ jobs:
     - name: Running "sumo in the wheel" tests
       if: github.repository == 'DLR-TS/sumo'
       run: |
+        python -m pip install -r tools/req_ci.txt
         python -m pip install -r tools/requirements.txt
         $env:TEXTTEST_CI_APPS = "-v ci.fast -a activitygen,dfrouter,duarouter,jtrrouter,marouter,netgen,od2trips,polyconvert,netconvert,sumo"
         tests\runCiTests.bat $env:pythonLocation\Scripts\texttestc.py

diff --git a/tools/req_ci.txt b/tools/req_ci.txt
@@ -0,0 +1,4 @@
+# these requirements are used to make sure the tests run only with versions known to work on GitHub actions
+# the "normal" requirements should be used in addition
+ortools==9.5.2237
+pandas<2.2.0