From 24eeea3a5b7612ac3b85da237449d49674fe4dd5 Mon Sep 17 00:00:00 2001 From: ndu Date: Tue, 15 Oct 2024 21:33:02 +0100 Subject: [PATCH 1/2] chore(fix): update requirements file --- server/requirements.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/requirements.txt b/server/requirements.txt index c2ec71a..a9ee425 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -2,7 +2,9 @@ amqp==5.2.0 anyio==4.4.0 asgiref==3.8.1 attrs==24.1.0 +beautifulsoup4==4.12.3 billiard==4.2.0 +bs4==0.0.2 celery==5.4.0 certifi==2024.7.4 cffi==1.17.0 @@ -21,6 +23,7 @@ django-cors-headers==4.4.0 django-filter==24.2 django-js-asset==2.2.0 django-shortcuts==1.6 +django-sortedm2m==4.0.0 django-timezone-field==7.0 django-tinymce==4.1.0 djangorestframework==3.15.2 @@ -49,6 +52,7 @@ requests==2.32.3 rpds-py==0.19.1 six==1.16.0 sniffio==1.3.1 +soupsieve==2.6 sqlparse==0.5.1 text-unidecode==1.3 tzdata==2024.1 @@ -57,4 +61,3 @@ urllib3==2.2.2 vine==5.1.0 wcwidth==0.2.13 whitenoise==6.7.0 -bs4==0.0.2 From 310d6ad5483e704bd9433821870493c2bc25058f Mon Sep 17 00:00:00 2001 From: ndu Date: Tue, 15 Oct 2024 21:45:21 +0100 Subject: [PATCH 2/2] chore(fix): update workflow --- .github/workflows/lock-main.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/lock-main.yaml b/.github/workflows/lock-main.yaml index 0cc0162..39a8a59 100644 --- a/.github/workflows/lock-main.yaml +++ b/.github/workflows/lock-main.yaml @@ -1,4 +1,4 @@ -name: Restrict Merge to Main +name: Merge to Main on: pull_request: @@ -8,11 +8,3 @@ on: jobs: check_source_branch: runs-on: ubuntu-latest - - steps: - - name: Check Source Branch - run: | - if [ "${{ github.event.pull_request.head.ref }}" != "staging" ]; then - echo "PRs to main branch must come from staging branch only." - exit 1 - fi