Skip to content

Commit

Permalink
Merge pull request #669 from UW-GAC/maint/ubuntu-22.04
Browse files Browse the repository at this point in the history
Ubuntu 22.04 upgrade
  • Loading branch information
amstilp authored Jul 30, 2024
2 parents fdbd48f + 2a9d38b commit c33a3dc
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 43 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]
python-version: ["3.10"]
backend: ["sqlite", "mariadb"]
mariadb-version: ["10.4"]
mariadb-version: ["10.6"]
include:
- python-version: "3.10" # Future ubuntu 22.04 upgrade.
backend: "mariadb"
mariadb-version: "10.6"
pip-recompile: true
- python-version: 3.12 # Future ubuntu 24.04.01 upgrade.
backend: "mariadb"
mariadb-version: "10.11"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pip-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
with:
ref: ${{ github.head_ref }}

- name: Set up Python 3.8
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: "3.10"

- name: Update requirements files
uses: UW-GAC/pip-tools-actions/[email protected]
Expand Down
19 changes: 1 addition & 18 deletions requirements/dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile requirements/dev-requirements.in
Expand All @@ -16,10 +16,6 @@ babel==2.14.0
# via sphinx
backcall==0.2.0
# via ipython
backports-zoneinfo==0.2.1
# via
# -c requirements/requirements.txt
# django
certifi==2024.7.4
# via
# -c requirements/requirements.txt
Expand Down Expand Up @@ -67,10 +63,6 @@ idna==3.7
# requests
imagesize==1.4.1
# via sphinx
importlib-metadata==7.0.0
# via
# -c requirements/requirements.txt
# sphinx
ipdb==0.13.13
# via -r requirements/dev-requirements.in
ipython==8.12.3
Expand Down Expand Up @@ -123,10 +115,6 @@ pyparsing==3.1.1
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# packaging
pytz==2023.3.post1
# via
# -c requirements/requirements.txt
# babel
pyyaml==6.0.1
# via
# -c requirements/test-requirements.txt
Expand Down Expand Up @@ -197,7 +185,6 @@ typing-extensions==4.8.0
# asgiref
# django-stubs
# django-stubs-ext
# ipython
# mypy
urllib3==2.2.2
# via
Expand All @@ -211,10 +198,6 @@ wcwidth==0.2.13
# via prompt-toolkit
werkzeug==3.0.3
# via -r requirements/dev-requirements.in
zipp==3.19.1
# via
# -c requirements/requirements.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
16 changes: 1 addition & 15 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile requirements/requirements.in
Expand All @@ -16,8 +16,6 @@ attrs==23.2.0
# via
# jsonschema
# referencing
backports-zoneinfo==0.2.1
# via django
build==1.0.3
# via pip-tools
cachetools==5.3.2
Expand Down Expand Up @@ -109,12 +107,6 @@ google-auth==2.28.1
# via django-anvil-consortium-manager
idna==3.7
# via requests
importlib-metadata==7.0.0
# via build
importlib-resources==6.1.1
# via
# jsonschema
# jsonschema-specifications
jsonapi-requests==0.7.0
# via -r requirements/requirements.in
jsonschema==4.23.0
Expand Down Expand Up @@ -143,8 +135,6 @@ pandas==2.0.3
# via -r requirements/requirements.in
pip-tools==7.4.1
# via -r requirements/requirements.in
pkgutil-resolve-name==1.3.10
# via jsonschema
plotly==5.19.0
# via django-anvil-consortium-manager
pronto==2.5.7
Expand Down Expand Up @@ -222,10 +212,6 @@ wheel==0.42.0
# via pip-tools
whitenoise==6.7.0
# via -r requirements/requirements.in
zipp==3.19.1
# via
# importlib-metadata
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
3 changes: 1 addition & 2 deletions requirements/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile requirements/test-requirements.in
Expand Down Expand Up @@ -96,7 +96,6 @@ typing-extensions==4.8.0
# via
# -c requirements/requirements.txt
# django-test-migrations
# faker
urllib3==2.2.2
# via
# -c requirements/requirements.txt
Expand Down

0 comments on commit c33a3dc

Please sign in to comment.