Skip to content
This repository has been archived by the owner on Nov 20, 2024. It is now read-only.

Release PR #1055

Merged
merged 5 commits into from
Aug 13, 2024
Merged

Release PR #1055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7666f36
Updating urls in header to point at great-cms hosted buy-from-the-uk …
stuart-mindt Aug 12, 2024
cbe2cce
Fixing import
stuart-mindt Aug 12, 2024
3e7dfaa
Merge pull request #1053 from uktrade/IGUK-313_buy-from-uk-into-great…
stuart-mindt Aug 12, 2024
3e31cd3
Bump Sentry sdk and Django
davidu1975 Aug 13, 2024
e8a89c9
Merge pull request #1054 from uktrade/GREATUK-1065-bump-django-sentry…
davidu1975 Aug 13, 2024
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
4 changes: 3 additions & 1 deletion core/header_config/tier_one_nav_items.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
INTERNATIONAL_CONTACT = urls.international.HOME / 'contact/'
EXPAND_YOUR_BUSINESS = urls.international.HOME / 'expand-your-business-in-the-uk/'

BUY_FROM_THE_UK_URL = urls.international.HOME / 'buy-from-the-uk/'

ABOUT_UK = NavItem(
name='about-uk',
title=_('About the UK'),
Expand All @@ -29,7 +31,7 @@
BUY_FROM_THE_UK = NavItem(
name='trade',
title=_('Buy from the UK'),
url=urls.international.TRADE_HOW_WE_HELP
url=BUY_FROM_THE_UK_URL
)

ABOUT_DIT = NavItem(
Expand Down
3 changes: 2 additions & 1 deletion core/header_config/tier_two_nav_items.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from core.header_config.helpers import NavItem
from django.utils.translation import gettext_lazy as _
from directory_constants import urls
from core.header_config.tier_one_nav_items import BUY_FROM_THE_UK_URL


# Until we can update directory-constants, define this just here
Expand Down Expand Up @@ -113,7 +114,7 @@
HOW_WE_HELP_BUY = NavItem(
name='how-we-help-buy',
title=_('How we help'),
url=urls.international.TRADE_HOW_WE_HELP
url=BUY_FROM_THE_UK_URL
)

CONTACT_US_TRADE = NavItem(
Expand Down
10 changes: 5 additions & 5 deletions requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==4.2.14
Django==4.2.15
django-countries==7.5.1
django-environ==0.11.2
django-formtools==2.5.1
Expand All @@ -8,20 +8,20 @@ django-recaptcha==3.0.0
django-redis==5.4.0
django-storages==1.14.2
djangorestframework==3.15.2
directory-api-client==26.4.7
directory-api-client==26.9.0
directory-client-core==7.2.13
directory-cms-client==12.3.4
directory-components==40.2.3
directory-constants==24.1.3
directory-forms-api-client==7.4.2
directory-healthcheck==3.5
directory-validators==9.3.3
directory-healthcheck==3.7
directory-validators==9.3.4
boto3==1.34.25
dateparser==0.7.0
elastic-apm==6.1.*
pir-client==1.2.1
requests[security]>=2.32.0
sentry-sdk==1.14.0
sentry-sdk>=1.20.0.a,<3.0.0
sorl-thumbnail==12.9.0
urllib3>=1.26.19,<2.0.0
waitress==2.1.2
Expand Down
22 changes: 11 additions & 11 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ asgiref==3.8.1
# django-countries
async-timeout==4.0.3
# via redis
attrs==23.2.0
attrs==24.2.0
# via jsonschema
beautifulsoup4==4.12.3
# via directory-components
boto3==1.34.25
# via -r requirements.in
botocore==1.34.150
botocore==1.34.159
# via
# boto3
# s3transfer
Expand All @@ -25,7 +25,7 @@ certifi==2024.7.4
# elastic-apm
# requests
# sentry-sdk
cffi==1.16.0
cffi==1.17.0
# via cryptography
charset-normalizer==3.3.2
# via requests
Expand All @@ -35,7 +35,7 @@ cryptography==43.0.0
# jwcrypto
dateparser==0.7.0
# via -r requirements.in
directory-api-client==26.4.7
directory-api-client==26.9.0
# via -r requirements.in
directory-client-core==7.2.13
# via
Expand All @@ -54,11 +54,11 @@ directory-constants==24.1.3
# directory-components
directory-forms-api-client==7.4.2
# via -r requirements.in
directory-healthcheck==3.5
directory-healthcheck==3.7
# via -r requirements.in
directory-validators==9.3.3
directory-validators==9.3.4
# via -r requirements.in
django==4.2.14
django==4.2.15
# via
# -r requirements.in
# directory-api-client
Expand All @@ -81,7 +81,7 @@ django-environ==0.11.2
# via -r requirements.in
django-formtools==2.5.1
# via -r requirements.in
django-health-check==3.18.1
django-health-check==3.18.2
# via directory-healthcheck
django-ipware==6.0.3
# via -r requirements.in
Expand Down Expand Up @@ -151,7 +151,7 @@ pytz==2023.3
# via
# dateparser
# directory-validators
redis==5.0.7
redis==5.0.8
# via django-redis
regex==2022.1.18
# via
Expand All @@ -165,7 +165,7 @@ requests[security]==2.32.3
# django-oauth-toolkit
s3transfer==0.10.2
# via boto3
sentry-sdk==1.14.0
sentry-sdk==2.12.0
# via -r requirements.in
sigauth==5.2.7
# via directory-client-core
Expand Down Expand Up @@ -204,7 +204,7 @@ whitenoise==6.4.0
# via -r requirements.in
zope-event==5.0
# via gevent
zope-interface==6.4.post2
zope-interface==7.0.1
# via gevent

# The following packages are considered to be unsafe in a requirements file:
Expand Down
28 changes: 14 additions & 14 deletions requirements_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ asgiref==3.8.1
# django-countries
async-timeout==4.0.3
# via redis
attrs==23.2.0
attrs==24.2.0
# via jsonschema
beautifulsoup4==4.12.3
# via directory-components
boto3==1.34.25
# via -r requirements.in
botocore==1.34.150
botocore==1.34.159
# via
# boto3
# s3transfer
Expand All @@ -27,13 +27,13 @@ certifi==2024.7.4
# elastic-apm
# requests
# sentry-sdk
cffi==1.16.0
cffi==1.17.0
# via cryptography
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via pip-tools
coverage[toml]==7.6.0
coverage[toml]==7.6.1
# via
# pytest-codecov
# pytest-cov
Expand All @@ -43,7 +43,7 @@ cryptography==43.0.0
# jwcrypto
dateparser==0.7.0
# via -r requirements.in
directory-api-client==26.4.7
directory-api-client==26.9.0
# via -r requirements.in
directory-client-core==7.2.13
# via
Expand All @@ -62,11 +62,11 @@ directory-constants==24.1.3
# directory-components
directory-forms-api-client==7.4.2
# via -r requirements.in
directory-healthcheck==3.5
directory-healthcheck==3.7
# via -r requirements.in
directory-validators==9.3.3
directory-validators==9.3.4
# via -r requirements.in
django==4.2.14
django==4.2.15
# via
# -r requirements.in
# directory-api-client
Expand All @@ -89,7 +89,7 @@ django-environ==0.11.2
# via -r requirements.in
django-formtools==2.5.1
# via -r requirements.in
django-health-check==3.18.1
django-health-check==3.18.2
# via directory-healthcheck
django-ipware==6.0.3
# via -r requirements.in
Expand Down Expand Up @@ -223,7 +223,7 @@ pytz==2023.3
# via
# dateparser
# directory-validators
redis==5.0.7
redis==5.0.8
# via django-redis
regex==2022.1.18
# via
Expand All @@ -241,7 +241,7 @@ requests-mock==1.12.1
# via -r requirements_test.in
s3transfer==0.10.2
# via boto3
sentry-sdk==1.14.0
sentry-sdk==2.12.0
# via -r requirements.in
sigauth==5.2.7
# via directory-client-core
Expand Down Expand Up @@ -287,15 +287,15 @@ w3lib==1.22.0
# via directory-client-core
waitress==2.1.2
# via -r requirements.in
wheel==0.43.0
wheel==0.44.0
# via pip-tools
whitenoise==6.4.0
# via -r requirements.in
zipp==3.19.2
zipp==3.20.0
# via importlib-metadata
zope-event==5.0
# via gevent
zope-interface==6.4.post2
zope-interface==7.0.1
# via gevent

# The following packages are considered to be unsafe in a requirements file:
Expand Down