From ef81dff23a518757a66f0011453ee879f6178d25 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Thu, 20 Jun 2024 13:25:33 -0700 Subject: [PATCH 1/2] Installing gh-scoped-creds app in dev hub secondary image --- deployments/dev/config/common.yaml | 3 +++ deployments/dev/images/secondary/environment.yml | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deployments/dev/config/common.yaml b/deployments/dev/config/common.yaml index c8c081302..63e2cd3d0 100644 --- a/deployments/dev/config/common.yaml +++ b/deployments/dev/config/common.yaml @@ -69,6 +69,9 @@ jupyterhub: default: true - display_name: "Dashboard image" description: "A newer repo2docker-based image with a primary focus of building dashboards." + extraEnv: + GH_SCOPED_CREDS_CLIENT_ID: "Iv23liFjgKFgkSBWph4C" + GH_SCOPED_CREDS_APP_URL: "https://github.com/apps/test-gh-scoped-creds" kubespawner_override: image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary:36280727a - display_name: "1524699: DataHub Infrastructure" diff --git a/deployments/dev/images/secondary/environment.yml b/deployments/dev/images/secondary/environment.yml index c1483db3e..b8450dfce 100644 --- a/deployments/dev/images/secondary/environment.yml +++ b/deployments/dev/images/secondary/environment.yml @@ -31,7 +31,6 @@ dependencies: - scipy==1.10.1 - seaborn==0.12.2 - statsmodels==0.14.0 -- tensorflow-cpu==2.12.1 - sqlalchemy==2.0.16 - mlxtend==0.23.0 # Spring 2024 data 100 @@ -41,7 +40,7 @@ dependencies: # Spring 2024 table demos - lxml==5.1.0 # Spring 2024 Econ 148 Packages -- geopandas==0.14.2 +- geopandas==0.13.2 - geopy==2.4.1 - lifelines==0.27.8 - pycountry==22.3.5 From aa0abf0f254c70fb4a5efe045d5f979fa2529654 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Thu, 20 Jun 2024 13:27:02 -0700 Subject: [PATCH 2/2] Reverting geopandas version --- deployments/dev/images/secondary/environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/dev/images/secondary/environment.yml b/deployments/dev/images/secondary/environment.yml index b8450dfce..c4ab722d6 100644 --- a/deployments/dev/images/secondary/environment.yml +++ b/deployments/dev/images/secondary/environment.yml @@ -40,7 +40,7 @@ dependencies: # Spring 2024 table demos - lxml==5.1.0 # Spring 2024 Econ 148 Packages -- geopandas==0.13.2 +- geopandas==0.14.2 - geopy==2.4.1 - lifelines==0.27.8 - pycountry==22.3.5 @@ -72,4 +72,4 @@ dependencies: - ydata-profiling==4.6.4 - otter-grader==5.4.0 - duckdb==0.10.1 - - duckdb_engine==0.11.2 \ No newline at end of file + - duckdb_engine==0.11.2