From 683ff36087247413000fd0637df7c23b6d8f9b96 Mon Sep 17 00:00:00 2001 From: Matthew Li Date: Tue, 15 Apr 2025 15:18:59 -0700 Subject: [PATCH 1/5] Update GitHub Actions build base --- .github/workflows/django_testing_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django_testing_ci.yml b/.github/workflows/django_testing_ci.yml index 66e239f0e0..c7f4075571 100644 --- a/.github/workflows/django_testing_ci.yml +++ b/.github/workflows/django_testing_ci.yml @@ -15,7 +15,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 # Default github actions environment for Linux + runs-on: ubuntu-22.04 services: postgres: # Set up a database container with the following specifications From f56051ec016f2890e5a21fe9a197b717882c0cc9 Mon Sep 17 00:00:00 2001 From: Hesham Elbashandy <47407500+helbashandy@users.noreply.github.com> Date: Mon, 30 Jun 2025 14:35:02 -0700 Subject: [PATCH 2/5] Create dependabot.yml (#680) * Create dependabot.yml * Update dependabot.yml * Update django_testing_ci.yml --- .github/dependabot.yml | 11 +++++++++++ .github/workflows/django_testing_ci.yml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..9d866e3928 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "pip" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" diff --git a/.github/workflows/django_testing_ci.yml b/.github/workflows/django_testing_ci.yml index 9780cd3949..0347a3b5ce 100644 --- a/.github/workflows/django_testing_ci.yml +++ b/.github/workflows/django_testing_ci.yml @@ -52,7 +52,7 @@ jobs: uses: actions/cache@v3 with: path: ~/venv - key: ${{ runner.os }}-python310-packages-${{ hashFiles('requirements.txt') }} + key: ${{ runner.os }}-python-310-packages-${{ hashFiles('requirements.txt') }} - if: ${{ steps.cache-python.outputs.cache-hit != 'true' }} # If a cache is not found name: Install Python packages From 38816a60b1dd4dcbc661e6e89c620a1480acc1a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Jul 2025 01:38:01 +0000 Subject: [PATCH 3/5] Bump future from 0.17.1 to 1.0.0 Bumps [future](https://github.com/PythonCharmers/python-future) from 0.17.1 to 1.0.0. - [Release notes](https://github.com/PythonCharmers/python-future/releases) - [Changelog](https://github.com/PythonCharmers/python-future/blob/master/docs/changelog.rst) - [Commits](https://github.com/PythonCharmers/python-future/compare/v0.17.1...v1.0.0) --- updated-dependencies: - dependency-name: future dependency-version: 1.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 313ebd9361..e801a7fe8a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,7 +30,7 @@ drf-nested-routers==0.91 drf-yasg==1.17.1 factory-boy==2.12.0 Faker==3.0.0 -future==0.17.1 +future==1.0.0 gspread==3.6.0 humanize==0.5.1 idna==2.8 diff --git a/setup.py b/setup.py index bea2699fa2..4f2042c69a 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ 'django-sslserver==0.20', 'django-su==0.8.0', 'doi2bib==0.3.0', - 'future==0.17.1', + 'future==1.0.0', 'humanize==0.5.1', 'idna==2.8', 'pyparsing==2.3.1', From d4da9c04a6ca9aa492cb2b42f37ae44cdda54001 Mon Sep 17 00:00:00 2001 From: Matthew Li Date: Mon, 7 Jul 2025 10:13:22 -0700 Subject: [PATCH 4/5] Remove unused future dependency --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e801a7fe8a..d68f634faa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,7 +30,6 @@ drf-nested-routers==0.91 drf-yasg==1.17.1 factory-boy==2.12.0 Faker==3.0.0 -future==1.0.0 gspread==3.6.0 humanize==0.5.1 idna==2.8 From ce061c1b9da7df56440b279a68bb0687a44ea893 Mon Sep 17 00:00:00 2001 From: Matthew Li Date: Mon, 7 Jul 2025 11:23:13 -0700 Subject: [PATCH 5/5] Restore older future version in unused setup.py file from original repo --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4f2042c69a..bea2699fa2 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ 'django-sslserver==0.20', 'django-su==0.8.0', 'doi2bib==0.3.0', - 'future==1.0.0', + 'future==0.17.1', 'humanize==0.5.1', 'idna==2.8', 'pyparsing==2.3.1',