Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/validate-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9.15
python-version: 3.12.13
Comment thread
matyasselmeci marked this conversation as resolved.
- name: Install packages
run: |
sudo apt-get update
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9.15
python-version: 3.12.13
Comment thread
matyasselmeci marked this conversation as resolved.
- name: Install packages
run: |
sudo apt-get update
Expand Down
10 changes: 4 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM hub.opensciencegrid.org/opensciencegrid/software-base:24-el8-release
FROM hub.osg-htc.org/osg-htc/software-base:25-el9-release

# Install dependencies (application, Apache)
RUN \
Expand All @@ -7,8 +7,8 @@ RUN \
gcc \
git \
libyaml-devel \
python39-devel \
python39-pip \
python3.12-devel \
python3.12-pip \
&& yum install -y \
fetch-crl \
httpd \
Expand All @@ -21,13 +21,11 @@ RUN \
osg-internal-cas \
&& yum clean all && rm -rf /var/cache/yum/*

RUN alternatives --set python3 /usr/bin/python3.9

WORKDIR /app

# Install application dependencies
COPY requirements-apache.txt requirements-rootless.txt ./
RUN pip3 install --no-cache-dir -r requirements-apache.txt
RUN python3.12 -m pip install --no-cache-dir -r requirements-apache.txt

# Create data directory, and gather SSH keys for git
RUN mkdir /data && \
Expand Down
2 changes: 1 addition & 1 deletion docker/apache.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Listen 8080
Listen 8443

LoadModule wsgi_module /usr/local/lib64/python3.9/site-packages/mod_wsgi/server/mod_wsgi-py39.cpython-39-x86_64-linux-gnu.so
LoadModule wsgi_module /usr/local/lib64/python3.12/site-packages/mod_wsgi/server/mod_wsgi-py312.cpython-312-x86_64-linux-gnu.so
Comment thread
matyasselmeci marked this conversation as resolved.
WSGIPythonPath /app

# Run apps in separate processes to stop yaml.CSafeLoader import-time error
Expand Down
4 changes: 2 additions & 2 deletions requirements-apache.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-r requirements-rootless.txt

# mod-wsgi requires apache httpd headers (redhat package httpd-devel, ubuntu package apache2-dev)
# also gcc and python headers (redhat package python39-devel or similar)
mod-wsgi~=4.9.4
# also gcc and python headers (redhat package python3.12-devel or similar)
mod-wsgi~=6.0.4

58 changes: 30 additions & 28 deletions requirements-rootless.txt
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
# This file is included in requirements-apache.txt

asn1~=2.7.0
blinker~=1.6.2
certifi>=2023.5.7
chardet~=5.1.0
charset-normalizer~=3.1.0
click~=8.1.3
configobj~=5.0.8
asn1~=3.3.0
blinker~=1.9.0
certifi>=2026.5.20
chardet~=7.4.3
charset-normalizer~=3.4.7
click~=8.4.1
configobj~=5.0.9
enum-compat~=0.0.3
Flask~=2.3.2
Flask-WTF~=1.1.1
gitdb~=4.0.10
GitPython~=3.1.31
icalendar~=5.0.5
idna~=3.4
itsdangerous~=2.1.2
Jinja2~=3.1.2
Flask~=3.1.3
Flask-WTF~=1.3.0
gitdb~=4.0.12
GitPython~=3.1.50
icalendar~=7.1.3
idna~=3.18
itsdangerous~=2.2.0
Jinja2~=3.1.6
ldap3~=2.9.1
MarkupSafe~=2.1.2
prometheus-client~=0.20.0
MarkupSafe~=3.0.3
prometheus-client~=0.25.0
pyasn1~=0.6.3
python-dateutil~=2.8.2
python-gnupg~=0.5.0
pytz>=2023.3
PyYAML~=6.0
requests~=2.32.4
six~=1.16.0
smmap~=5.0.0
urllib3~=2.6.3
Werkzeug~=3.1.4
WTForms~=3.0.1
xmltodict~=0.13.0
python-dateutil~=2.9.0
python-gnupg~=0.5.6
pytz>=2026.2
PyYAML~=6.0.3
requests~=2.34.2
six~=1.17.0
smmap~=5.0.3
typing-extensions~=4.15.0
tzdata>=2026.2
urllib3~=2.7.0
Werkzeug~=3.1.8
WTForms~=3.2.2
xmltodict~=1.0.4
Loading