Skip to content

Commit

Permalink
Merge branch 'main' into license
Browse files Browse the repository at this point in the history
  • Loading branch information
dcherian committed Jun 10, 2024
2 parents 9efe9bb + a5f63f3 commit aac5de3
Show file tree
Hide file tree
Showing 46 changed files with 18,129 additions and 16,875 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM pangeo/base-image:2024.02.02
FROM pangeo/base-image:2024.06.02
21 changes: 21 additions & 0 deletions .devcontainer/scipy2024/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"build": {
"dockerfile": "../Dockerfile",
"context": "../../conda"
},
"postCreateCommand": {
"jupyterlab": "mkdir /home/jovyan/.jupyter && cp ${containerWorkspaceFolder}/.devcontainer/scipy2024/jupyter_lab_config.py /home/jovyan/.jupyter/jupyter_lab_config.py",
"vscode": "mkdir ${containerWorkspaceFolder}/.vscode && cp ${containerWorkspaceFolder}/.devcontainer/scipy2024/tasks.json ${containerWorkspaceFolder}/.vscode/tasks.json"
},
"hostRequirements": {
"cpus": 2
},
"customizations": {
"codespaces": {
"openFiles": ["workshops/scipy2024/README.md"]
},
"vscode": {
"extensions": ["ms-toolsai.jupyter", "ms-python.python"]
}
}
}
15 changes: 15 additions & 0 deletions .devcontainer/scipy2024/jupyter_lab_config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Configuration file for lab.

c = get_config() # noqa

## The default URL to redirect to from `/`
# Default: '/lab'
c.LabApp.default_url = '/lab/tree/workshops/scipy2024/index.ipynb'

## Set the Access-Control-Allow-Origin header
#
# Use '*' to allow any origin to access your server.
#
# Takes precedence over allow_origin_pat.
# Default: ''
c.ServerApp.allow_origin = '*'
16 changes: 16 additions & 0 deletions .devcontainer/scipy2024/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "jupyterlab",
"type": "shell",
"command": "/srv/conda/envs/notebook/bin/jupyter lab --no-browser",
"presentation": {
"reveal": "always"
},
"runOptions": {
"runOn": "folderOpen"
}
}
]
}
10 changes: 7 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
version: 2
updates:
- package-ecosystem: 'docker'
directory: '/.devcontainer'
- package-ecosystem: "docker"
directory: "/.devcontainer"
schedule:
interval: 'daily'
interval: "daily"
- package-ecosystem: "github-actions"
directory: "/.github"
schedule:
interval: "monthly"
2 changes: 1 addition & 1 deletion .github/workflows/qaqc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
with:
check_filenames: true
check_hidden: true
skip: '.git,*.js,qaqc.yml'
skip: ".git,*.js,qaqc.yml"
ignore_words_list: hist,nd

# borrowed from https://github.com/ProjectPythia/pythia-foundations/blob/main/.github/workflows/link-checker.yaml
Expand Down
13 changes: 7 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-docstring-first
- id: check-json
exclude: ^.devcontainer/
- id: check-yaml
- id: double-quote-string-fixer

- repo: https://github.com/psf/black
rev: 23.10.1
rev: 24.4.2
hooks:
- id: black
- id: black-jupyter
Expand All @@ -24,22 +25,22 @@ repos:
- id: blackdoc

- repo: https://github.com/PyCQA/flake8
rev: 6.1.0
rev: 7.0.0
hooks:
- id: flake8

- repo: https://github.com/PyCQA/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.3
rev: v4.0.0-alpha.8
hooks:
- id: prettier

- repo: https://github.com/kynan/nbstripout
rev: 0.6.1
rev: 0.7.1
hooks:
- id: nbstripout
args: [--extra-keys=metadata.kernelspec metadata.language_info.version]
3 changes: 1 addition & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
*lock.yml
conda/
conda/**
10 changes: 5 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Learn more at https://jupyterbook.org/customize/config.html
title: ''
title: ""
author: The Xarray Community
copyright: '2024'
logo: images/logo.png
Expand Down Expand Up @@ -35,7 +35,7 @@ parse:
# Force re-execution of notebooks on each build.
# See https://jupyterbook.org/content/execute.html
execute:
execute_notebooks: 'cache'
execute_notebooks: "cache"
allow_errors: false
# Per-cell notebook execution limit (seconds)
timeout: 300
Expand All @@ -48,11 +48,11 @@ latex:
# Configure your Binder links, such as the URL of the BinderHub.
launch_buttons:
notebook_interface: jupyterlab
binderhub_url: 'https://mybinder.org'
binderhub_url: "https://mybinder.org"

# Information about where the book exists on the web
repository:
url: 'https://github.com/xarray-contrib/xarray-tutorial'
url: "https://github.com/xarray-contrib/xarray-tutorial"
branch: main

# Bibliography
Expand All @@ -71,7 +71,7 @@ sphinx:
config:
language: en # accessibility
# application/vnd.holoviews_load.v0+json, application/vnd.holoviews_exec.v0+json
suppress_warnings: ['mystnb.unknown_mime_type', 'misc.highlighting_failure']
suppress_warnings: ["mystnb.unknown_mime_type", "misc.highlighting_failure"]
notfound_context:
body: "<h1>Whoops! 404 Page Not Found</h1>\n\n<p>Sorry, this page doesn't exist. Many sections of this book have been updated recently.</p><p> Try the search box 🔎 to find what you're looking for!</p>"
notfound_urls_prefix: /
Expand Down
4 changes: 2 additions & 2 deletions advanced/accessors/01_accessor_examples.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"\n",
"Perhaps you find yourself running similar code for multiple xarray objects or across related projects. By packing your code into an extension, it makes it easy to repeat the same operation while reducing the likelihood of [human introduced] errors.\n",
"\n",
"Here we wrap the reorganization of InSAR ice velocity data illustrated in [this tutorial](https://tutorial.xarray.dev/data_cleaning/ice_velocity.html?highlight=ice_velocity) into a custom Xarray extension that makes it easy to re-apply each time you begin working with a new InSAR velocity dataset. Please see the linked tutorial for details on the data, applications, and each step in this process."
"Here we wrap the reorganization of InSAR ice velocity data illustrated in [this tutorial](https://tutorial.xarray.dev/intermediate/data_cleaning/05.3_ice_velocity.html) into a custom Xarray extension that makes it easy to re-apply each time you begin working with a new InSAR velocity dataset. Please see the linked tutorial for details on the data, applications, and each step in this process."
]
},
{
Expand Down Expand Up @@ -425,5 +425,5 @@
}
},
"nbformat": 4,
"nbformat_minor": 2
"nbformat_minor": 4
}
28 changes: 14 additions & 14 deletions advanced/apply_ufunc/automatic-vectorizing-numpy.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "markdown",
"id": "6849dcdc-3484-4f41-8b23-51613d36812f",
"id": "0",
"metadata": {
"tags": []
},
Expand All @@ -13,7 +13,7 @@
},
{
"cell_type": "markdown",
"id": "afc56d28-6e55-4967-b27d-28e2cc539cc7",
"id": "1",
"metadata": {
"tags": []
},
Expand Down Expand Up @@ -100,7 +100,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "76aa13b8-5ced-4468-a72e-6b0a29172d6d",
"id": "2",
"metadata": {
"tags": []
},
Expand All @@ -123,7 +123,7 @@
},
{
"cell_type": "markdown",
"id": "81356724-6c1a-4d4a-9a32-bb906a9419b2",
"id": "3",
"metadata": {
"tags": []
},
Expand All @@ -139,7 +139,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "cb286fa0-deba-4929-b18a-79af5acb0b5b",
"id": "4",
"metadata": {
"tags": []
},
Expand All @@ -160,7 +160,7 @@
},
{
"cell_type": "markdown",
"id": "e3382658-14e1-4842-a618-ce7a27948c31",
"id": "5",
"metadata": {
"tags": []
},
Expand All @@ -175,7 +175,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "1476bcce-cc7b-4252-90dd-f45502dffb09",
"id": "6",
"metadata": {
"tags": [
"raises-exception"
Expand All @@ -198,7 +198,7 @@
},
{
"cell_type": "markdown",
"id": "1d1da9c2-a634-4920-890c-74d9bec9eab9",
"id": "7",
"metadata": {
"tags": []
},
Expand All @@ -213,7 +213,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "fa306dcf-eec3-425c-b278-42d15bbc0e4f",
"id": "8",
"metadata": {
"tags": [
"raises-exception"
Expand All @@ -239,7 +239,7 @@
},
{
"cell_type": "markdown",
"id": "6f5c928b-f8cb-4016-9d6d-39743f9c2976",
"id": "9",
"metadata": {
"tags": []
},
Expand All @@ -255,7 +255,7 @@
},
{
"cell_type": "markdown",
"id": "737cc6b4-522f-488c-9124-524cc42ebef3",
"id": "10",
"metadata": {
"tags": []
},
Expand All @@ -265,7 +265,7 @@
},
{
"cell_type": "markdown",
"id": "b6dac8da-8420-4fc4-9aeb-29b8999d4b37",
"id": "11",
"metadata": {
"tags": []
},
Expand All @@ -291,7 +291,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "d72fdd8c-44d2-4f6e-9fc4-7084e0e49986",
"id": "12",
"metadata": {
"tags": [],
"user_expressions": []
Expand All @@ -313,7 +313,7 @@
},
{
"cell_type": "markdown",
"id": "d81f399e-1649-4d4b-ad28-81cba8403210",
"id": "13",
"metadata": {
"tags": []
},
Expand Down
Loading

0 comments on commit aac5de3

Please sign in to comment.