Skip to content

Commit

Permalink
Remove lxml dev packages from CI and Dockerfile
Browse files Browse the repository at this point in the history
Since bumping our lxml/xmlsec requirements, we can utilize
the pre-built binaries and no longer have a need for the
*-dev system packages. Apart from making things leaner,
this also addresses the following issue in python-xmlsec:
xmlsec/python-xmlsec#320
  • Loading branch information
swrichards committed Jun 24, 2024
1 parent 0b9a673 commit c9def92
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Set up backend environment
uses: maykinmedia/setup-django-backend@v1
with:
apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext postgresql-client libgdal-dev gdal-bin'
apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gettext postgresql-client libgdal-dev gdal-bin'
python-version: '3.11'
optimize-postgres: 'yes'
pg-service: 'postgres'
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
- name: Set up backend environment
uses: maykinmedia/setup-django-backend@v1
with:
apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext postgresql-client libgdal-dev gdal-bin'
apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gettext postgresql-client libgdal-dev gdal-bin'
python-version: '3.11'
optimize-postgres: 'yes'
pg-service: 'postgres'
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
- name: Set up backend environment
uses: maykinmedia/setup-django-backend@v1
with:
apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext libgdal-dev gdal-bin graphviz'
apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gettext libgdal-dev gdal-bin graphviz'
python-version: '3.11'
setup-node: 'no'

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Install libxml
run: |
sudo apt-get update
sudo apt-get install -y libxml2-dev libxmlsec1-dev libxmlsec1-openssl
sudo apt-get install -y libxml2 libxmlsec1 libxmlsec1-openssl
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Install libxml
run: |
sudo apt-get update
sudo apt-get install -y libxml2-dev libxmlsec1-dev libxmlsec1-openssl
sudo apt-get install -y libxml2 libxmlsec1 libxmlsec1-openssl
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
Expand All @@ -59,7 +59,7 @@ jobs:
- name: Set up backend environment
uses: maykinmedia/setup-django-backend@v1
with:
apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gdal-bin'
apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gdal-bin'
python-version: '3.11'
setup-node: 'no'
- name: Run flake8
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libxml2-dev libxmlsec1-dev libxmlsec1-openssl
sudo apt-get install -y libxml2 libxmlsec1 libxmlsec1-openssl
pip install -r requirements/dev.txt
- name: Run manage.py makemigrations --check --dry-run
run: |
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
- name: Install libxml
run: |
sudo apt-get update
sudo apt-get install -y libxml2-dev libxmlsec1-dev libxmlsec1-openssl
sudo apt-get install -y libxml2 libxmlsec1 libxmlsec1-openssl
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
Expand Down
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
git \
libpq-dev \
libxml2-dev \
libxmlsec1-dev \
libxmlsec1-openssl \
libgdk-pixbuf2.0-0 \
libffi-dev \
Expand Down Expand Up @@ -71,7 +69,6 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco
libgdal32 \
libgeos-c1v5 \
libproj25 \
libxmlsec1-dev \
libxmlsec1-openssl \
libgdk-pixbuf2.0-0 \
libffi-dev \
Expand Down

0 comments on commit c9def92

Please sign in to comment.