Skip to content

Commit

Permalink
Merge branch 'develop' into repr_rehash
Browse files Browse the repository at this point in the history
  • Loading branch information
michplunkett authored Jan 3, 2025
2 parents e8f5488 + a6e078e commit 68956e0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test_prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
FLASK_APP: OpenOversight.app
strategy:
matrix:
python-version: ["3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13"]
steps:
- uses: actions/checkout@v3
- name: Run tests
Expand Down
8 changes: 6 additions & 2 deletions dockerfiles/web/Dockerfile-test
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ENV DISPLAY=:1
ENV PYTHONDONTWRITEBYTECODE=1

# install apt dependencies
RUN apt-get update && apt-get install -y xvfb firefox-esr libpq-dev python3-dev && \
RUN apt-get update && apt-get install -y curl xvfb firefox-esr libpq-dev python3-dev && \
apt-get install -y libsqlite3-0 && apt-get clean

# install geckodriver
Expand All @@ -24,7 +24,11 @@ RUN mkdir geckodriver
RUN tar -xzf geckodriver-${GECKODRIVER_VERSION}-linux64.tar.gz -C geckodriver

COPY requirements.txt dev-requirements.txt /usr/src/app/
RUN pip3 install --no-cache-dir -r requirements.txt && pip3 install --no-cache-dir -r dev-requirements.txt
# install rust and cargo so we can use jellyfish
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
. "$HOME/.cargo/env" && \
pip3 install --no-cache-dir -r requirements.txt && \
pip3 install --no-cache-dir -r dev-requirements.txt

COPY test_data.py /usr/src/app/

Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
alembic~=1.11.1
apiclient==1.0.4
attrs~=23.1.0
Authlib==1.3.1
Authlib==1.4.0
Babel~=2.12.1
bleach==6.0.0
bleach-allowlist==1.0.3
Expand All @@ -11,9 +11,9 @@ boto3==1.28.1
botocore==1.31.1
cachetools==5.3.1
certifi==2024.07.04
cffi~=1.15.1
cffi==1.17.1
click==8.1.4
cryptography~=43.0.1
cryptography==44.0.0
Deprecated~=1.2.14
dnspython==2.6.1
docutils~=0.20.1
Expand Down Expand Up @@ -63,7 +63,7 @@ SQLAlchemy==1.4.52
tornado~=6.4
trio==0.22.1
urllib3==1.26.20
us==3.1.1
us==3.2.0
visitor~=0.1.3
webencodings~=0.5.1
Werkzeug==3.0.6
Expand Down

0 comments on commit 68956e0

Please sign in to comment.