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.

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

Prepare for 2024.1 release #137

Merged
merged 22 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1e4524a
Link to pyOpenSci package guide
mdpiper Apr 23, 2024
abaa7fa
Change to standard CSDMS contributing and code of conduct docs
mdpiper Apr 23, 2024
f3f0ecc
Bump actions versions
mdpiper Apr 23, 2024
4d6f2b9
Link to blog post on top 12 git commands
mdpiper Jun 23, 2024
99f74df
Merge branch 'mdpiper/link-to-pyopensci-guide' into mdpiper/prep-for-…
mdpiper Jun 23, 2024
6c5aafd
Merge branch 'mdpiper/link-to-pyopensci-guide' into mdpiper/prep-for-…
mdpiper Jul 2, 2024
13c6229
Skip pymt notebooks unti l pymt is updated for gimli.units=0.3.2
mdpiper Jul 2, 2024
5adab57
Install nox for all testing and development needs
mdpiper Jul 2, 2024
e317e92
Use OpenTopography demo API key
mdpiper Jul 2, 2024
91915d1
Update directory listings
mdpiper Jul 2, 2024
e6e040a
Remove reference to deprecated Atom editor
mdpiper Jul 2, 2024
9160c49
Update conda env listing
mdpiper Jul 2, 2024
2d37511
Drop 3.8, add 3.12 in CI testing
mdpiper Jul 9, 2024
3795b4d
Use Git for software, git for command
mdpiper Jul 11, 2024
b02402b
Merge branch 'main' into mdpiper/prep-for-2024.1
mdpiper Jul 15, 2024
242d365
Update author list
mdpiper Jul 15, 2024
de00eb0
Caption figure
mdpiper Jul 15, 2024
3996ee3
Use current version of the test Actions workflow
mdpiper Jul 15, 2024
f264741
Organize recommendations into headings
mdpiper Jul 15, 2024
422cae2
Run on explore instead of lab
mdpiper Jul 23, 2024
56d5eba
Update heartfelt-hooks to latest release
mdpiper Jul 23, 2024
fab1afb
Use hooks from latest heartfelt-hooks release
mdpiper Jul 23, 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
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python 3.11
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.11

Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]

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

Expand All @@ -24,8 +24,8 @@ jobs:
shell: bash -l {0}

steps:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
python-version: "${{ matrix.python-version }}"
miniforge-variant: Mambaforge
Expand All @@ -46,9 +46,9 @@ jobs:
name: Test the notebooks
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
python-version: "3.11"
miniforge-variant: Mambaforge
Expand All @@ -60,4 +60,5 @@ jobs:
- name: Test
env:
MPLBACKEND: "Agg"
OPENTOPOGRAPHY_API_KEY: ${{ secrets.OPENTOPOGRAPHY_API_KEY }}
run: nox -s test-notebooks --python "3.11"
19 changes: 6 additions & 13 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,13 @@ repos:
files: \.py$

- repo: https://github.com/mcflugen/heartfelt-hooks
rev: v0.3.2
rev: v1.3.3
hooks:
- id: file-name-check-whitespace
- id: nb-check-kernel
args: [
--verbose,
--fix,
--kernel-name=ivy,
--kernel-display-name=Ivy,
--kernel-language=python
]
- id: nb-check-hidden-cells
args: [--tags=solution, --solution-suffix=.a.ipynb, --diff]
- id: notebook-check-heading-levels
- id: check-whitespace
# - id: check-mixed-case
# - id: check-snake-case
- id: check-heading-levels
# - id: hide-solution-cells

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
Expand Down
1 change: 1 addition & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Contributors

* Jordan Adams
* Katy Barnhart
* Tian Gan
* Eric Hutton
* Albert Kettner
* Allen Lee
Expand Down
3 changes: 3 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ authors:
- family-names: Hutton
given-names: Eric
orcid: 'https://orcid.org/0000-0002-5864-6459'
- family-names: Gan
given-names: Tian
orcid: 'https://orcid.org/0000-0003-3624-6910'
- family-names: Overeem
given-names: Irina
orcid: 'https://orcid.org/0000-0002-8422-580X'
Expand Down
5 changes: 5 additions & 0 deletions CODE-OF-CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Code of Conduct

Everyone participating in this project is governed by
the CSDMS [Code of Conduct](https://github.com/csdms/project/blob/main/CODE-OF-CONDUCT.md).
By participating, you are expected to uphold this code.
83 changes: 0 additions & 83 deletions CODE-OF-CONDUCT.rst

This file was deleted.

6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Contributing

We welcome, and greatly appreciate, contributions
to [CSDMS Workbench](https://csdms.colorado.edu/wiki/Workbench) tools.
For recommendations on how you can contribute,
please see the CSDMS project [CONTRIBUTING](https://github.com/csdms/project/blob/main/CONTRIBUTING.md) document.
103 changes: 0 additions & 103 deletions CONTRIBUTING.rst

This file was deleted.

10 changes: 5 additions & 5 deletions README.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"[permamodel]: ./lessons/permamodel/index.ipynb\n",
"[best-practices]: ./lessons/best-practices/index.md\n",
"[hpc]: ./lessons/hpc/index.md\n",
"[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",
"[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",
"[jhub-info]: https://csdms.colorado.edu/wiki/JupyterHub\n",
"[swc]: http://software-carpentry.org\n",
"[swc-license]: https://github.com/swcarpentry/python-novice-inflammation/blob/gh-pages/LICENSE.md\n",
Expand Down Expand Up @@ -72,17 +72,17 @@
"\n",
"[![Run on EarthscapeHub][badge]][jhub-link]\n",
"\n",
"to open the lessons directly on the EarthscapeHub *lab* instance!\n",
"to open the lessons directly on the EarthscapeHub *explore* instance!\n",
"\n",
"> **Note:** The EarthscapeHub *lab* instance is password-protected.\n",
"> **Note:** The EarthscapeHub *explore* instance is password-protected.\n",
" Please contact your instructor about obtaining a login,\n",
" or visit [this][jhub-info] CSDMS wiki page for more information.\n",
"\n",
"## Contributing\n",
"\n",
"CSDMS Ivy is an open source project;\n",
"[contributions](./CONTRIBUTING.rst) that follow\n",
"the [contributor code of conduct](./CODE-OF-CONDUCT.rst) are welcomed\n",
"[contributions](./CONTRIBUTING.md) that follow\n",
"the [contributor code of conduct](./CODE-OF-CONDUCT.md) are welcomed\n",
"and are [acknowledged](./AUTHORS.rst).\n",
"All CSDMS Ivy course material is\n",
"released under [CC BY 4.0 and MIT licenses](./LICENSE.md).\n",
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
[permamodel]: ./lessons/permamodel/index.ipynb
[best-practices]: ./lessons/best-practices/index.md
[hpc]: ./lessons/hpc/index.md
[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
[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
[jhub-info]: https://csdms.colorado.edu/wiki/JupyterHub
[swc]: http://software-carpentry.org
[swc-license]: https://github.com/swcarpentry/python-novice-inflammation/blob/gh-pages/LICENSE.md
Expand Down Expand Up @@ -65,17 +65,17 @@ Click this button:

[![Run on EarthscapeHub][badge]][jhub-link]

to open the lessons directly on the EarthscapeHub *lab* instance!
to open the lessons directly on the EarthscapeHub *explore* instance!

> **Note:** The EarthscapeHub *lab* instance is password-protected.
> **Note:** The EarthscapeHub *explore* instance is password-protected.
Please contact your instructor about obtaining a login,
or visit [this][jhub-info] CSDMS wiki page for more information.

## Contributing

CSDMS Ivy is an open source project;
[contributions](./CONTRIBUTING.rst) that follow
the [contributor code of conduct](./CODE-OF-CONDUCT.rst) are welcomed
[contributions](./CONTRIBUTING.md) that follow
the [contributor code of conduct](./CODE-OF-CONDUCT.md) are welcomed
and are [acknowledged](./AUTHORS.rst).
All CSDMS Ivy course material is
released under [CC BY 4.0 and MIT licenses](./LICENSE.md).
Expand Down
3 changes: 1 addition & 2 deletions environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ dependencies:
- scipy
- terrainbento
- tqdm
- coverage # testing
- pytest # testing
- nox
- pip:
- git+https://github.com/csdms/bmi-example-python.git
Loading