From e7f7cb8327e6e04e6a1c91b5d3a34ae6d62a1e21 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Thu, 5 Sep 2024 12:03:47 -0700 Subject: [PATCH] moving data101 to its own repo --- .circleci/config.yml | 25 ---- deployments/data101/hubploy.yaml | 9 -- deployments/data101/image/README.md | 5 + deployments/data101/image/apt.txt | 100 ---------------- deployments/data101/image/environment.yml | 111 ------------------ .../data101/image/infra-requirements.txt | 29 ----- deployments/data101/image/postBuild | 19 --- deployments/data101/image/start | 5 - 8 files changed, 5 insertions(+), 298 deletions(-) create mode 100644 deployments/data101/image/README.md delete mode 100644 deployments/data101/image/apt.txt delete mode 100644 deployments/data101/image/environment.yml delete mode 100644 deployments/data101/image/infra-requirements.txt delete mode 100644 deployments/data101/image/postBuild delete mode 100644 deployments/data101/image/start diff --git a/.circleci/config.yml b/.circleci/config.yml index d8ffe9839..bcfc1b225 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -211,12 +211,6 @@ jobs: hubploy deploy --timeout 30m data100 hub ${CIRCLE_BRANCH} no_output_timeout: 30m - - run: - name: Deploy data101 - command: | - hubploy deploy --timeout 30m data101 hub ${CIRCLE_BRANCH} - no_output_timeout: 30m - - run: name: Deploy data102 command: | @@ -362,15 +356,6 @@ workflows: ignore: - staging - prod - - hubploy/build-image: - deployment: data101 - name: data101 image build - # Filters can only be per-job? wtf - filters: - branches: - ignore: - - staging - - prod - hubploy/build-image: deployment: data102 name: data102 image build @@ -510,15 +495,6 @@ workflows: branches: only: - staging - - hubploy/build-image: - deployment: data101 - name: data101 image build - push: true - # Filters can only be per-job? wtf - filters: - branches: - only: - - staging - hubploy/build-image: deployment: data102 name: data102 image build @@ -620,7 +596,6 @@ workflows: - cee image build - data8 image build - data100 image build - - data101 image build - data102 image build - datahub image build - dev image build diff --git a/deployments/data101/hubploy.yaml b/deployments/data101/hubploy.yaml index f117bbf87..962c7e362 100644 --- a/deployments/data101/hubploy.yaml +++ b/deployments/data101/hubploy.yaml @@ -1,15 +1,6 @@ images: images: - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data101-user-image - path: image/ - repo2docker: - base_image: docker.io/library/buildpack-deps:jammy - - registry: - provider: gcloud - gcloud: - project: ucb-datahub-2018 - service_key: gcr-key.json cluster: provider: gcloud diff --git a/deployments/data101/image/README.md b/deployments/data101/image/README.md new file mode 100644 index 000000000..533c7ba9a --- /dev/null +++ b/deployments/data101/image/README.md @@ -0,0 +1,5 @@ +# Data101 Image + +This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/data101-user-image). + +Please see [the contribution guide](https://github.com/berkeley-dsep-infra/data101-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image. diff --git a/deployments/data101/image/apt.txt b/deployments/data101/image/apt.txt deleted file mode 100644 index 9b4955ded..000000000 --- a/deployments/data101/image/apt.txt +++ /dev/null @@ -1,100 +0,0 @@ -# Some linux packages for basic terminal work, particularly -# oriented at users new to Unix/cmd line environments. - -# installing less as more just isn't enough -less - -# Basic unix tools -man -man-db -manpages-posix -manpages-dev -manpages-posix-dev - -# Download tools -curl -wget - -# Core text editors on a *nix box: vim -vim - -# A couple of CLI editors that are easier than vim -# micro # currently not working on 18.04 -nano -jed -jed-extra - -# powerful terminal-based file manager, better than the one in JLab -mc - -# for easily managing multiple repositories with one command (perl-doc -# is needed for its help pages to work) -mr -perl-doc - -# Regular build tools for compiling common stuff -build-essential -gfortran - -# Dependencies for nbconvert -texlive-xetex -texlive-fonts-recommended -texlive-plain-generic -# https://github.com/berkeley-dsep-infra/datahub/issues/3719 -texlive-lang-chinese -lmodern - -# Other useful document-related tools -pandoc -latexdiff - -# Some useful git utilities use basic Ruby -ruby - -# Other niceties for command-line work and life -ack # powerful grep-like tool -pydf # colorized disk usage -tmux -screen -htop -nnn # cmd line file manager -zsh -rsync -tig # console UI for git -multitail - -# For later, these are not available in 18.04 -#browsh # text-based web browser, occasionally handy -#dasel # json/yml/csv/etc data wrangling at the terminal -#fzf # fuzzy file finder - -## This section adds tools for desktop environment usage -dbus-x11 -xorg -xubuntu-icon-theme -xfce4 -xfce4-goodies -xclip -xsel -firefox -chromium-browser - -# GUI text editors -vim-gtk3 -gedit - -# Git clients and tools -git-gui -gitg -qgit -meld - -# For jupyter-tree-download. Ref: https://github.com/berkeley-dsep-infra/datahub/issues/3979 -zip - -# DH-93, DH94 -postgresql-client - -# playwright deps https://jira-secure.berkeley.edu/browse/DH-305 -libnss3 -libnspr4 diff --git a/deployments/data101/image/environment.yml b/deployments/data101/image/environment.yml deleted file mode 100644 index 5c255e877..000000000 --- a/deployments/data101/image/environment.yml +++ /dev/null @@ -1,111 +0,0 @@ -name: data101 - -channels: -- conda-forge - -dependencies: -- python==3.11.* -- syncthing==1.20.4 -- git==2.39.1 -- altair==5.0.1 -- beautifulsoup4==4.11.1 -- black==22.6.0 -- bokeh==2.4.3 -- bqplot==0.12.34 -- cartopy==0.21.0 -- coverage==7.2.2 -- cython==0.29.32 -- distributed==2023.6.0 -- fortran-magic==0.7 -- graphviz==8.0.3 -- python-graphviz==0.20.1 -- h5netcdf==1.0.2 -- h5py==3.7.0 -- hdf4==4.2.15 -- hdf5==1.12.2 -- intake==0.6.5 -- intake-esm==2021.8.17 -- intake-xarray==0.6.0 -- ipycanvas==0.12.1 -- ipydatagrid==1.1.12 -- ipympl==0.9.2 -- ipyparallel==8.4.1 -- jsonschema==4.17.3 -- jupyter-archive==3.4.0 -- jupyter-book==0.15.1 -- jupyter-resource-usage==1.0.0 -- jupyter-server-proxy==4.2.0 -- jupyter_bokeh -- jupyterlab==4.0.11 -- jupyterlab-favorites==3.0.0 -- jupyterlab-geojson==3.2.0 -- jupyterlab-variableinspector==3.0.9 -- jupyterlab_pygments==0.2.2 -- jupyterlab_server==2.23.0 -- jupyterlab_widgets==3.0.8 -- jupyter_server==2.7.0 -- matplotlib==3.7.1 -- matplotlib-inline==0.1.6 -- mock==4.0.3 -# https://jira-secure.berkeley.edu/browse/DH-165 -- mongo-tools==4.0.4 -- nbclassic==1.0.0 -- nbdime==3.1.1 -- nbgitpuller==1.2.1 -- networkx==2.8.6 -- notebook==7.0.7 -- numba==0.57.0 -- numpy==1.24.2 -- pandas==2.0.2 -- pandoc==2.12 -- pandocfilters==1.5.0 -- pep8==1.7.1 -- pgspecial==1.13.1 -- pillow==9.2.0 -- plotly==5.13.1 -- pooch==1.6.0 -- prettytable==3.4.1 -- pyarrow==9.0.0 -- pypdf2==2.10.4 -- pytables==3.7.0 -- pytest==7.1.2 -- pytest-cov==3.0.0 -- python-pdfkit==1.0.0 -- requests==2.28.2 -- scikit-image==0.19.3 -- scikit-learn==1.2.2 -- scipy==1.10.1 -- seaborn==0.12.2 -- sphinx-jupyterbook-latex==0.5.2 -- sqlparse==0.4.3 -- statsmodels==0.14.0 -- sympy==1.10.1 -- tornado==6.2.0 -- tqdm==4.64.0 -- xarray==2023.5.0 -- xlrd==2.0.1 -- micro==2.0.8 -- websockify==0.11.0 -- folium==0.14.0 -- sqlalchemy==2.0.16 -- pip -- pip: - # - -r infra-requirements.txt - - jupyter-desktop-server - - otter-grader==5.1.3 - - jupysql==0.10.0 - - geopandas==0.12.1 - - iwut==0.0.4 - - tensorflow-cpu==2.12.0 - - ipywidgets==8.0.7 - # disable until fixed (probably this: https://github.com/jupyterlab/jupyter-collaboration/issues/162) - # - jupyter_collaboration==1.0.1 - - jupyterhub==4.1.6 - - nbconvert[webpdf]==7.16.4 - - pytest-notebook==0.8.1 - - pymongo==4.4.1 - - dbt-postgres==1.6.0 - - git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling - # pulled in by ottr, if not pinned to 1.16.2, 1.16.3 causes DH-323 - - jupytext==1.16.2 - - jupyterlab-a11y-checker==0.1.2 # Adding a11y-checker for Data 101 staff's exploration diff --git a/deployments/data101/image/infra-requirements.txt b/deployments/data101/image/infra-requirements.txt deleted file mode 100644 index 0fb0bd930..000000000 --- a/deployments/data101/image/infra-requirements.txt +++ /dev/null @@ -1,29 +0,0 @@ -# WARNING: Original source at scripts/infra-packages/requirements.txt -# PLEASE DO NOT EDIT ELSEWHERE -# After editing scripts/infra-packages/requirements.txt, please run -# scripts/infra-packages/sync.bash. - -# This file pins versions of notebook related python packages we want -# across all hubs. This makes sure we don't need to upgrade them -# everwhere one by one. - -# FIXME: Freeze this to get exact versions of all dependencies -notebook==7.0.7 -jupyterlab==4.0.11 -nbgitpuller==1.2.1 -jupyter-resource-usage==1.0.1 -# Matches version in images/hub/Dockerfile -jupyterhub==4.1.6 -appmode==0.8.0 -ipywidgets==8.0.7 -jupyter-tree-download==1.0.1 -git-credential-helpers==0.2 -# Measure popularity of different packages in our hubs -# https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling -# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 -RISE==5.7.1 -# syncthing for dropbox-like functionality -jupyter-syncthing-proxy==1.0.3 -# jupyter archival tool for easy user downloads -jupyter-archive==3.4.0 diff --git a/deployments/data101/image/postBuild b/deployments/data101/image/postBuild deleted file mode 100644 index 8b16a7df1..000000000 --- a/deployments/data101/image/postBuild +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -set -eux - -# install mongosh for DH-160 - -mkdir -p /tmp/mongosh -cd /tmp/mongosh -wget -q https://downloads.mongodb.com/compass/mongosh-2.0.2-linux-x64.tgz -tar xvfz mongosh-2.0.2-linux-x64.tgz -cp -v mongosh-2.0.2-linux-x64/bin/mongosh ${CONDA_DIR}/bin/ -cp -v mongosh-2.0.2-linux-x64/bin/mongosh_crypt_v1.so ${CONDA_DIR}/lib/ -chmod 775 ${CONDA_DIR}/bin/mongosh -chmod 775 ${CONDA_DIR}/lib/mongosh_crypt_v1.so -cd / -rm -rf /tmp/mongosh - -# installing chromium browser to enable webpdf conversion using nbconvert -export PLAYWRIGHT_BROWSERS_PATH=${CONDA_DIR} -playwright install chromium diff --git a/deployments/data101/image/start b/deployments/data101/image/start deleted file mode 100644 index c3a978b7f..000000000 --- a/deployments/data101/image/start +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -# See https://jira-secure.berkeley.edu/browse/DH-305 -export PLAYWRIGHT_BROWSERS_PATH=${CONDA_DIR} -exec "$@"