Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GitHub Actions Errors #427

Merged
merged 3 commits into from
Jun 16, 2023
Merged

Fix GitHub Actions Errors #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2319b35
ci: fix GitHub Actions error
VKTB Jun 2, 2023
be37a71
Ignore werkzeug vulnerability
VKTB Jun 2, 2023
623a4b3
Ignore flask vulnerability
VKTB Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ jobs:
run: pip install nox==2020.8.22
- name: Install Poetry
run: pip install poetry==1.1.9
# This fixes the issue with cachecontrol (https://github.com/psf/cachecontrol/issues/292).
# We will not be facing this issue when we upgrade to a newer Poetry version.
- name: Install Requests
run: pip install 'requests<2.30'

# This command is a workaround for getting Poetry working with Python 3.10. An
# fix is made in Poetry 1.2.0a2 but there is currently no official release for
Expand Down Expand Up @@ -275,6 +279,10 @@ jobs:
run: cd /home/runner/work/datagateway-api/datagateway-api; cp datagateway_api/search_api_mapping.json.example datagateway_api/search_api_mapping.json
- name: Install Poetry
run: pip install poetry==1.1.9
# This fixes the issue with cachecontrol (https://github.com/psf/cachecontrol/issues/292).
# We will not be facing this issue when we upgrade to a newer Poetry version.
- name: Install Requests
run: pip install 'requests<2.30'

- name: Install dependencies
run: poetry install
Expand Down
11 changes: 8 additions & 3 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,10 @@ def safety(session):
# Ignore 50916 as the latest version of pydantic and
# Ignore 51457 as the latest version of pytest and
# Ignore 51668 as the latest version of SQLAchemy and
# Ignore 52355 and 52518 as the latest version of gitpython
# as they do not support
# python 3.6 which is still used in production
# Ignore 52322 and 52518 as the latest version of Gitpython does not
# support python 3.6 which is still used in production
# Ignore 53325, 53326, 54456, and 55261 as the fixed versions do not support
# python 3.6
session.run(
"safety",
"check",
Expand All @@ -97,6 +98,10 @@ def safety(session):
"53325",
"--ignore",
"53326",
"--ignore",
"54456",
"--ignore",
"55261",
)

try:
Expand Down