Skip to content

Commit 14df96c

Browse files
committed
[R] Add BigQuery table import to Makefile and rename post_deploy script
1 parent 6e2b2e1 commit 14df96c

9 files changed

+25
-11
lines changed

.gitlab-ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,16 @@ deploy:
9797
paths:
9898
- terraform/plan.json
9999

100+
import:
101+
extends: .base_on_push
102+
stage: deploy
103+
timeout: 5m # probably needs to be extended
104+
needs:
105+
- build_image
106+
- deploy
107+
script:
108+
- make import
109+
100110
deploy_browser:
101111
extends: .base_on_push
102112
stage: deploy

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,16 @@ $(1)terraform: lambdas
102102

103103
.PHONY: $(1)deploy
104104
$(1)deploy: check_python $(1)terraform
105-
python $(project_root)/scripts/post_deploy_tdr.py
106105
endef
107106

108107
$(eval $(call deploy,))
109108
$(eval $(call deploy,auto_))
110109

110+
.PHONY: import
111+
import: check_python
112+
python $(project_root)/scripts/reindex.py --import --sources "tdr:parquet:gcp:${GOOGLE_PROJECT}:*"
113+
python $(project_root)/scripts/verify_tdr_sources.py
114+
111115
.PHONY: destroy
112116
destroy:
113117
$(MAKE) -C terraform destroy

requirements.all.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ blinker==1.8.2
1010
boto3==1.28.63
1111
boto3-stubs==1.28.63
1212
botocore==1.31.63
13-
botocore-stubs==1.35.6
13+
botocore-stubs==1.35.8
1414
brotli==1.1.0
1515
cachetools==5.5.0
1616
certifi==2024.7.4
@@ -49,9 +49,9 @@ google-cloud-core==2.4.1
4949
google-cloud-storage==2.12.0
5050
google-crc32c==1.5.0
5151
google-resumable-media==2.7.2
52-
googleapis-common-protos==1.64.0
52+
googleapis-common-protos==1.65.0
5353
greenlet==3.0.3
54-
grpcio==1.66.0
54+
grpcio==1.66.1
5555
grpcio-status==1.62.3
5656
http-message-signatures==0.4.4
5757
http_sfv==0.9.9
@@ -128,7 +128,7 @@ strict-rfc3339==0.7
128128
toml==0.10.2
129129
tqdm==4.66.5
130130
types-awscrt==0.21.2
131-
types-s3transfer==0.10.1
131+
types-s3transfer==0.10.2
132132
types-toml==0.10.8.20240310
133133
typing_extensions==4.12.2
134134
tzlocal==2.1
@@ -142,4 +142,4 @@ wrapt==1.16.0
142142
www-authenticate==0.9.2
143143
xmltodict==0.13.0
144144
zope.event==5.0
145-
zope.interface==7.0.2
145+
zope.interface==7.0.3

requirements.dev.trans.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
blessed==1.20.0
22
blinker==1.8.2
3-
botocore-stubs==1.35.6
3+
botocore-stubs==1.35.8
44
brotli==1.1.0
55
click==8.1.7
66
colorama==0.4.4
@@ -52,11 +52,11 @@ smmap==5.0.1
5252
toml==0.10.2
5353
tqdm==4.66.5
5454
types-awscrt==0.21.2
55-
types-s3transfer==0.10.1
55+
types-s3transfer==0.10.2
5656
types-toml==0.10.8.20240310
5757
uritemplate==4.1.1
5858
wcwidth==0.2.13
5959
www-authenticate==0.9.2
6060
xmltodict==0.13.0
6161
zope.event==5.0
62-
zope.interface==7.0.2
62+
zope.interface==7.0.3

requirements.trans.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ cryptography==43.0.0
88
google-cloud-core==2.4.1
99
google-crc32c==1.5.0
1010
google-resumable-media==2.7.2
11-
googleapis-common-protos==1.64.0
12-
grpcio==1.66.0
11+
googleapis-common-protos==1.65.0
12+
grpcio==1.66.1
1313
grpcio-status==1.62.3
1414
http_sfv==0.9.9
1515
idna==3.8
File renamed without changes.

0 commit comments

Comments
 (0)