Skip to content

Commit

Permalink
dependency and docker cleanup #15605 #3
Browse files Browse the repository at this point in the history
  • Loading branch information
behrisch committed Oct 17, 2024
1 parent 9ccbd7c commit 55fe604
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,12 @@ jobs:
- name: Building Examples and Tests
if: matrix.build_type == 'full' && (github.repository == 'DLR-TS/sumo' || matrix.compiler == 'gcc')
# need to explicitly uninstall matplotlib below because pandas pulls it in but we need a newer version for test stability
# having both installed confuses matplotlib https://github.com/matplotlib/matplotlib/issues/26827
# the pipdeptree below is also just for debugging but often comes handy so keep it enabled
run: |
sudo apt-get install $(cat sumo/build_config/tools_req_deb.txt)
sudo apt-get -y uninstall python3-matplotlib
python3 -m venv testenv --system-site-packages
source testenv/bin/activate
python3 -m pip install -r sumo/tools/req_ci.txt -r sumo/tools/requirements.txt
Expand All @@ -122,6 +126,7 @@ jobs:
- name: Extra tests
if: matrix.build_type == 'full' && matrix.compiler == 'gcc'
run: |
source testenv/bin/activate
sumo/tests/runTests.sh -b ci -a sumo.meso.ci,sumo.extra.ci
sumo/tests/runTests.sh -b ci -a netconvert.gdal.ci,polyconvert.gdal.ci
Expand Down
3 changes: 2 additions & 1 deletion build_config/docker/Dockerfile.ubuntu.git
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
FROM ubuntu:jammy

ENV SUMO_HOME=/usr/share/sumo
ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get -y update
RUN apt-get -y install git
Expand All @@ -21,7 +22,7 @@ RUN apt-get -y install $(cat /opt/sumo/build_config/build_req_deb.txt)
# 3D GUI, video recording
RUN apt-get -y install libopenscenegraph-dev libavformat-dev libswscale-dev
# packages needed for the tools (some are also listed in tools/requirements.txt but we prefer the ubuntu packages)
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install $(cat /opt/sumo/build_config/tools_req_deb.txt)
RUN apt-get -y install $(cat /opt/sumo/build_config/tools_req_deb.txt)

# python packages needed for the tools (the ones where we do not have ubuntu packages)
RUN pip3 install -r /opt/sumo/tools/requirements.txt
Expand Down
1 change: 0 additions & 1 deletion build_config/tools_req_deb.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
python3-autopep8
python3-contourpy
python3-ezdxf
python3-flake8
python3-pandas
Expand Down

0 comments on commit 55fe604

Please sign in to comment.