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

[DH-361] merging #6055, #6057 to prod #6058

Merged
merged 4 commits into from
Aug 30, 2024
Merged

[DH-361] merging #6055, #6057 to prod #6058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cbda7a
Remove ai-suggested fragment.
ryanlovett Aug 30, 2024
8e647bf
Merge pull request #6055 from ryanlovett/docs-no-var
ryanlovett Aug 30, 2024
3ba28cc
[DH-361] adding gh-scoped-creds for nature hub
felder Aug 30, 2024
05af072
Merge pull request #6057 from felder/felder_DH-361-packages
felder Aug 30, 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
5 changes: 2 additions & 3 deletions .github/workflows/quarto-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ jobs:
runs-on: ubuntu-latest
permissions:
contents: write
# Don't run in forks, unless the forker sets a secret variable. I chose to
# use a secret rather than a var because secrets are not copied to forks.
if: ${{ github.event.repository.fork == false || secrets.ALLOW_FORK_DEPLOY == 'true' }}
# Don't run in forks.
if: ${{ github.event.repository.fork == false }}
steps:
- name: Check out repository
uses: actions/checkout@v4
Expand Down
2 changes: 2 additions & 0 deletions deployments/nature/config/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ jupyterhub:
c.WebPDFExporter.embed_images = True
extraEnv:
# Unset NotebookApp from hub/values. Necessary for recent lab versions.
GH_SCOPED_CREDS_CLIENT_ID: Iv23liGBW8jtMBP0inyw
GH_SCOPED_CREDS_APP_URL: https://github.com/apps/uc-berkeley-nature-hub-git-access
JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"
nodeSelector:
hub.jupyter.org/pool-name: nature-pool
Expand Down
11 changes: 7 additions & 4 deletions deployments/nature/image/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,29 @@ channels:
dependencies:

# Items required for basic level functionality
- python==3.11.*
- git==2.46.0
- jupyter-resource-usage=1.1.0
- jupyterhub==4.1.6
- jupyterlab==4.2.5
- jupyter_server==2.14.2
- notebook==7.2.2
- nbgitpuller==1.2.1
- notebook==7.2.2
- python==3.11.*

# vscode
- code-server==4.23.1
- jupyter-vscode-proxy==0.6

# other packages
- seaborn==0.13.2
- altair==5.4.1
- gh-scoped-creds==4.1
- ibis-framework[pandas,duckdb]==9.3.0
- leafmap==0.36.10
- jupyterlab-myst==2.4.2
- leafmap==0.36.10
- seaborn==0.13.2
- streamlit==1.38.0

# pip installed packages, conda is prefered
- pip==24.2
- pip:
- nbconvert[webpdf]==7.16.4
Loading