Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert lxml/xmlsec/uwsgi version bumps #1279

Merged
merged 1 commit into from
Jun 25, 2024
Merged

Revert lxml/xmlsec/uwsgi version bumps #1279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
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 libxmlsec1 libxmlsec1-openssl gettext postgresql-client libgdal-dev gdal-bin'
apt-packages: 'libxml2-dev libxmlsec1-dev 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 libxmlsec1 libxmlsec1-openssl gettext postgresql-client libgdal-dev gdal-bin'
apt-packages: 'libxml2-dev libxmlsec1-dev 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 libxmlsec1 libxmlsec1-openssl gettext libgdal-dev gdal-bin graphviz'
apt-packages: 'libxml2-dev libxmlsec1-dev 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
View file
Open in desktop
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 libxmlsec1 libxmlsec1-openssl
sudo apt-get install -y libxml2-dev libxmlsec1-dev 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 libxmlsec1 libxmlsec1-openssl
sudo apt-get install -y libxml2-dev libxmlsec1-dev 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 libxmlsec1 libxmlsec1-openssl gdal-bin'
apt-packages: 'libxml2-dev libxmlsec1-dev 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 libxmlsec1 libxmlsec1-openssl
sudo apt-get install -y libxml2-dev libxmlsec1-dev 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 libxmlsec1 libxmlsec1-openssl
sudo apt-get install -y libxml2-dev libxmlsec1-dev libxmlsec1-openssl
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ 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 @@ -69,6 +71,7 @@ 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
6 changes: 3 additions & 3 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ jsonschema==4.1.0
# via drf-spectacular
kombu==5.3.7
# via celery
lxml==5.2.2
lxml==4.9.1
# via
# django-digid-eherkenning
# mail-editor
Expand Down Expand Up @@ -557,7 +557,7 @@ urllib3==1.26.18
# elasticsearch
# requests
# sentry-sdk
uwsgi==2.0.26
uwsgi==2.0.23
# via -r requirements/base.in
vine==5.1.0
# via
Expand All @@ -581,7 +581,7 @@ xlrd==2.0.1
# via tablib
xlwt==1.3.0
# via tablib
xmlsec==1.3.14
xmlsec==1.3.12
# via maykin-python3-saml
xsdata==23.8
# via -r requirements/base.in
Expand Down
6 changes: 3 additions & 3 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ kombu==5.3.7
# celery
lazy-object-proxy==1.6.0
# via astroid
lxml==5.2.2
lxml==4.9.1
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -1080,7 +1080,7 @@ urllib3==1.26.18
# elasticsearch
# requests
# sentry-sdk
uwsgi==2.0.26
uwsgi==2.0.23
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -1134,7 +1134,7 @@ xlwt==1.3.0
# -c requirements/base.txt
# -r requirements/base.txt
# tablib
xmlsec==1.3.14
xmlsec==1.3.12
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down
6 changes: 3 additions & 3 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ lazy-object-proxy==1.6.0
# astroid
locust==2.20.0
# via -r requirements/dev.in
lxml==5.2.2
lxml==4.9.1
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down Expand Up @@ -1283,7 +1283,7 @@ urllib3==1.26.18
# elasticsearch
# requests
# sentry-sdk
uwsgi==2.0.26
uwsgi==2.0.23
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down Expand Up @@ -1352,7 +1352,7 @@ xlwt==1.3.0
# -c requirements/ci.txt
# -r requirements/ci.txt
# tablib
xmlsec==1.3.14
xmlsec==1.3.12
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down
Loading