Skip to content

Commit 1865bb1

Browse files
authored
Prepare for 2024.1 release (#137)
* Link to pyOpenSci package guide * Change to standard CSDMS contributing and code of conduct docs * Bump actions versions * Link to blog post on top 12 git commands * Skip pymt notebooks unti l pymt is updated for gimli.units=0.3.2 * Install nox for all testing and development needs * Use OpenTopography demo API key * Update directory listings * Remove reference to deprecated Atom editor * Update conda env listing * Drop 3.8, add 3.12 in CI testing * Use Git for software, git for command * Update author list * Caption figure * Use current version of the test Actions workflow * Organize recommendations into headings * Run on explore instead of lab * Update heartfelt-hooks to latest release * Use hooks from latest heartfelt-hooks release
1 parent 6fc043f commit 1865bb1

24 files changed

Lines changed: 147 additions & 292 deletions

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313

1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1717
- name: Set up Python 3.11
18-
uses: actions/setup-python@v4
18+
uses: actions/setup-python@v5
1919
with:
2020
python-version: 3.11
2121

.github/workflows/test.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [ubuntu-latest, macos-latest, windows-latest]
18-
python-version: ["3.8", "3.9", "3.10", "3.11"]
18+
python-version: ["3.9", "3.10", "3.11", "3.12"]
1919

2020
runs-on: ${{ matrix.os }}
2121

@@ -24,8 +24,8 @@ jobs:
2424
shell: bash -l {0}
2525

2626
steps:
27-
- uses: actions/checkout@v3
28-
- uses: conda-incubator/setup-miniconda@v2
27+
- uses: actions/checkout@v4
28+
- uses: conda-incubator/setup-miniconda@v3
2929
with:
3030
python-version: "${{ matrix.python-version }}"
3131
miniforge-variant: Mambaforge
@@ -46,9 +46,9 @@ jobs:
4646
name: Test the notebooks
4747
runs-on: ubuntu-latest
4848
steps:
49-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
5050

51-
- uses: conda-incubator/setup-miniconda@v2
51+
- uses: conda-incubator/setup-miniconda@v3
5252
with:
5353
python-version: "3.11"
5454
miniforge-variant: Mambaforge
@@ -60,4 +60,5 @@ jobs:
6060
- name: Test
6161
env:
6262
MPLBACKEND: "Agg"
63+
OPENTOPOGRAPHY_API_KEY: ${{ secrets.OPENTOPOGRAPHY_API_KEY }}
6364
run: nox -s test-notebooks --python "3.11"

.pre-commit-config.yaml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,13 @@ repos:
7070
files: \.py$
7171

7272
- repo: https://github.com/mcflugen/heartfelt-hooks
73-
rev: v0.3.2
73+
rev: v1.3.3
7474
hooks:
75-
- id: file-name-check-whitespace
76-
- id: nb-check-kernel
77-
args: [
78-
--verbose,
79-
--fix,
80-
--kernel-name=ivy,
81-
--kernel-display-name=Ivy,
82-
--kernel-language=python
83-
]
84-
- id: nb-check-hidden-cells
85-
args: [--tags=solution, --solution-suffix=.a.ipynb, --diff]
86-
- id: notebook-check-heading-levels
75+
- id: check-whitespace
76+
# - id: check-mixed-case
77+
# - id: check-snake-case
78+
- id: check-heading-levels
79+
# - id: hide-solution-cells
8780

8881
- repo: https://github.com/pre-commit/pre-commit-hooks
8982
rev: v4.4.0

AUTHORS.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Contributors
1515

1616
* Jordan Adams
1717
* Katy Barnhart
18+
* Tian Gan
1819
* Eric Hutton
1920
* Albert Kettner
2021
* Allen Lee

CITATION.cff

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ authors:
1717
- family-names: Hutton
1818
given-names: Eric
1919
orcid: 'https://orcid.org/0000-0002-5864-6459'
20+
- family-names: Gan
21+
given-names: Tian
22+
orcid: 'https://orcid.org/0000-0003-3624-6910'
2023
- family-names: Overeem
2124
given-names: Irina
2225
orcid: 'https://orcid.org/0000-0002-8422-580X'

CODE-OF-CONDUCT.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Code of Conduct
2+
3+
Everyone participating in this project is governed by
4+
the CSDMS [Code of Conduct](https://github.com/csdms/project/blob/main/CODE-OF-CONDUCT.md).
5+
By participating, you are expected to uphold this code.

CODE-OF-CONDUCT.rst

Lines changed: 0 additions & 83 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Contributing
2+
3+
We welcome, and greatly appreciate, contributions
4+
to [CSDMS Workbench](https://csdms.colorado.edu/wiki/Workbench) tools.
5+
For recommendations on how you can contribute,
6+
please see the CSDMS project [CONTRIBUTING](https://github.com/csdms/project/blob/main/CONTRIBUTING.md) document.

CONTRIBUTING.rst

Lines changed: 0 additions & 103 deletions
This file was deleted.

README.ipynb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"[permamodel]: ./lessons/permamodel/index.ipynb\n",
2424
"[best-practices]: ./lessons/best-practices/index.md\n",
2525
"[hpc]: ./lessons/hpc/index.md\n",
26-
"[jhub-link]: https://lab.openearthscape.org/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Fcsdms%2Fivy&urlpath=lab%2Ftree%2Fivy%2FREADME.ipynb%3Fautodecode&branch=main\n",
26+
"[jhub-link]: https://explore.openearthscape.org/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Fcsdms%2Fivy&urlpath=lab%2Ftree%2Fivy%2FREADME.ipynb%3Fautodecode&branch=main\n",
2727
"[jhub-info]: https://csdms.colorado.edu/wiki/JupyterHub\n",
2828
"[swc]: http://software-carpentry.org\n",
2929
"[swc-license]: https://github.com/swcarpentry/python-novice-inflammation/blob/gh-pages/LICENSE.md\n",
@@ -72,17 +72,17 @@
7272
"\n",
7373
"[![Run on EarthscapeHub][badge]][jhub-link]\n",
7474
"\n",
75-
"to open the lessons directly on the EarthscapeHub *lab* instance!\n",
75+
"to open the lessons directly on the EarthscapeHub *explore* instance!\n",
7676
"\n",
77-
"> **Note:** The EarthscapeHub *lab* instance is password-protected.\n",
77+
"> **Note:** The EarthscapeHub *explore* instance is password-protected.\n",
7878
" Please contact your instructor about obtaining a login,\n",
7979
" or visit [this][jhub-info] CSDMS wiki page for more information.\n",
8080
"\n",
8181
"## Contributing\n",
8282
"\n",
8383
"CSDMS Ivy is an open source project;\n",
84-
"[contributions](./CONTRIBUTING.rst) that follow\n",
85-
"the [contributor code of conduct](./CODE-OF-CONDUCT.rst) are welcomed\n",
84+
"[contributions](./CONTRIBUTING.md) that follow\n",
85+
"the [contributor code of conduct](./CODE-OF-CONDUCT.md) are welcomed\n",
8686
"and are [acknowledged](./AUTHORS.rst).\n",
8787
"All CSDMS Ivy course material is\n",
8888
"released under [CC BY 4.0 and MIT licenses](./LICENSE.md).\n",

0 commit comments

Comments
 (0)