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

Release PR #1364

Merged
merged 21 commits into from
Dec 13, 2024
Merged

Release PR #1364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8b135a3
wip
davidu1975 Dec 8, 2024
5d4dba6
merge develop
davidu1975 Dec 8, 2024
d7c6a09
refactor postcode s2 save method
davidu1975 Dec 8, 2024
9663720
wip
davidu1975 Dec 9, 2024
da30ce8
merged develop
davidu1975 Dec 9, 2024
a9b917a
black
davidu1975 Dec 9, 2024
f1a574b
Remove test
davidu1975 Dec 9, 2024
d024bb0
Fix failing test
davidu1975 Dec 9, 2024
f712ca3
Merge branch 'develop' into feature-GREATUK-1289-eyb_business_cluster…
davidu1975 Dec 10, 2024
7757bf6
wip
davidu1975 Dec 10, 2024
36f97cc
Add Ingestion of Nomis Employee info
davidu1975 Dec 10, 2024
d154e55
Add basic error handling
davidu1975 Dec 10, 2024
9616e04
debugging
davidu1975 Dec 10, 2024
17be96a
use 3 s3 downloads for data now
davidu1975 Dec 10, 2024
9287dfb
Ingest nomis UK employee data from s3
davidu1975 Dec 11, 2024
0bc1648
no --write option
davidu1975 Dec 11, 2024
271e611
remove unnecessary temp table columns
davidu1975 Dec 11, 2024
072cc70
Add tests for ingestion of nomis uk employee data from s3
davidu1975 Dec 11, 2024
5ddb5c0
Merge branch 'develop' into feature-GREATUK-1289-eyb_business_cluster…
davidu1975 Dec 11, 2024
3a770f3
removed duplicate code
davidu1975 Dec 12, 2024
95aa5f7
Merge pull request #1361 from uktrade/feature-GREATUK-1289-eyb_busine…
davidu1975 Dec 12, 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
3 changes: 3 additions & 0 deletions conf/env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@ class BaseSettings(PydanticBaseSettings):
eyb_salary_s3_prefix: str = ''
eyb_rent_s3_prefix: str = ''
postcode_from_s3_prefix: str = ''
nomis_uk_business_employee_counts_from_s3_prefix: str = ''
ref_sic_codes_mapping_from_s3_prefix: str = ''
sector_reference_dataset_from_s3_prefix: str = ''


class CIEnvironment(BaseSettings):
Expand Down
3 changes: 3 additions & 0 deletions conf/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,3 +613,6 @@
EYB_SALARY_S3_PREFIX = env.eyb_salary_s3_prefix
EYB_RENT_S3_PREFIX = env.eyb_rent_s3_prefix
POSTCODE_FROM_S3_PREFIX = env.postcode_from_s3_prefix
NOMIS_UK_BUSINESS_EMPLOYEE_COUNTS_FROM_S3_PREFIX = env.nomis_uk_business_employee_counts_from_s3_prefix
REF_SIC_CODES_MAPPING_FROM_S3_PREFIX = env.ref_sic_codes_mapping_from_s3_prefix
SECTOR_REFERENCE_DATASET_FROM_S3_PREFIX = env.sector_reference_dataset_from_s3_prefix
Loading
Loading