From 0fa9609d2d608b8677d9938616f4b56f523ab3ab Mon Sep 17 00:00:00 2001 From: Conor Holden Date: Tue, 1 Oct 2024 12:17:24 +0200 Subject: [PATCH 1/2] :construction_worker: check OAF version on PRs --- .github/workflows/oaf-check.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/oaf-check.yml b/.github/workflows/oaf-check.yml index 720a2064..9a28141b 100644 --- a/.github/workflows/oaf-check.yml +++ b/.github/workflows/oaf-check.yml @@ -1,9 +1,15 @@ name: Check Open API Framework Version on: + push: + branches: + - master + tags: + - '**' + pull_request: workflow_dispatch: schedule: - - cron: '36 0 * * 0' + - cron: '00 7 * * 1' jobs: run: From 8b764d256e6d69c9deb4c2194e005dfc1fa879dc Mon Sep 17 00:00:00 2001 From: Conor Holden Date: Tue, 1 Oct 2024 14:40:56 +0200 Subject: [PATCH 2/2] :arrow_up: update pip tools --- .github/workflows/oaf-check.yml | 4 +++- requirements/base.txt | 4 +--- requirements/ci.txt | 2 -- requirements/dev.txt | 8 ++++---- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/oaf-check.yml b/.github/workflows/oaf-check.yml index 9a28141b..9dc8bf35 100644 --- a/.github/workflows/oaf-check.yml +++ b/.github/workflows/oaf-check.yml @@ -20,8 +20,10 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.11' + cache: 'pip' + cache-dependency-path: 'requirements/dev.txt' - name: Install dependencies - run: pip install -U pip-tools + run: pip install $(grep "pip-tools==" requirements/dev.txt) - name: Run compile dependencies run: ./bin/compile_dependencies.sh --upgrade-package open-api-framework diff --git a/requirements/base.txt b/requirements/base.txt index fca3e8d3..f49d186e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -179,9 +179,7 @@ djangorestframework-inclusions==1.2.0 drf-nested-routers==0.93.3 # via commonground-api-common drf-spectacular[sidecar]==0.27.2 - # via - # drf-spectacular - # open-api-framework + # via open-api-framework drf-spectacular-sidecar==2024.7.1 # via drf-spectacular drf-yasg==1.21.7 diff --git a/requirements/ci.txt b/requirements/ci.txt index 60bcebb4..be1aa5b3 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -240,7 +240,6 @@ django-solo==2.2.0 django-two-factor-auth[phonenumberslite,webauthn]==1.17.0 # via # -r requirements/base.txt - # django-two-factor-auth # maykin-2fa django-webtest==1.9.7 # via -r requirements/test-tools.in @@ -275,7 +274,6 @@ drf-nested-routers==0.93.3 drf-spectacular[sidecar]==0.27.2 # via # -r requirements/base.txt - # drf-spectacular # open-api-framework drf-spectacular-sidecar==2024.7.1 # via diff --git a/requirements/dev.txt b/requirements/dev.txt index 9e7bf619..8d3f0aff 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -266,7 +266,6 @@ django-solo==2.2.0 django-two-factor-auth[phonenumberslite,webauthn]==1.17.0 # via # -r requirements/ci.txt - # django-two-factor-auth # maykin-2fa django-webtest==1.9.7 # via -r requirements/ci.txt @@ -307,7 +306,6 @@ drf-nested-routers==0.93.3 drf-spectacular[sidecar]==0.27.2 # via # -r requirements/ci.txt - # drf-spectacular # open-api-framework drf-spectacular-sidecar==2024.7.1 # via @@ -459,7 +457,7 @@ phonenumberslite==8.13.30 # via # -r requirements/ci.txt # django-two-factor-auth -pip-tools==7.3.0 +pip-tools==7.4.1 # via -r requirements/dev.in platformdirs==4.0.0 # via black @@ -500,7 +498,9 @@ pyopenssl==24.0.0 # webauthn # zgw-consumers pyproject-hooks==1.0.0 - # via build + # via + # build + # pip-tools pyquery==1.4.3 # via -r requirements/ci.txt pyrsistent==0.17.3