Skip to content

Commit

Permalink
Merge branch 'loroberge/add-component-concentration-tracker-for-space…
Browse files Browse the repository at this point in the history
…' of https://github.com/loroberge/landlab into loroberge/add-component-concentration-tracker-for-space
  • Loading branch information
loroberge committed Oct 23, 2024
2 parents 5f3dca1 + 6520bfa commit cb04a38
Show file tree
Hide file tree
Showing 412 changed files with 17,378 additions and 18,906 deletions.
28 changes: 28 additions & 0 deletions .credits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,17 @@ aliases = [
alternate_emails = [
]

[[tool.landlab.credits.author]]
name = 'Annie Thompson'
email = '[email protected]'
aliases = [
'annie',
]
alternate_emails = [
'[email protected]',
]
github = 'anweiii'

[[tool.landlab.credits.author]]
name = 'Benjamin Campforts'
email = '[email protected]'
Expand All @@ -51,9 +62,18 @@ aliases = [
]
alternate_emails = [
'[email protected]',
'[email protected]',
]
github = 'BCampforts'

[[tool.landlab.credits.author]]
name = 'Berkan M'
email = '[email protected]'
aliases = [
]
alternate_emails = [
]

[[tool.landlab.credits.author]]
name = 'Charlie Shobe'
email = '[email protected]'
Expand Down Expand Up @@ -361,6 +381,14 @@ aliases = [
alternate_emails = [
]

[[tool.landlab.credits.author]]
name = 'pankajiitkgp'
email = '[email protected]'
aliases = [
]
alternate_emails = [
]

[[tool.landlab.credits.author]]
name = 'pre-commit-ci[bot]'
email = '66853113+pre-commit-ci[bot]@users.noreply.github.com'
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,18 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up Python 3.12
uses: actions/setup-python@v4
- uses: conda-incubator/setup-miniconda@v3
with:
python-version: 3.12
miniforge-variant: Miniforge3
miniforge-version: latest
auto-update-conda: true

- name: install and check pandoc
run: |
conda install pandoc -c conda-forge
pandoc --help
pandoc --version
- name: Install dependencies
run: pip install nox
Expand Down
131 changes: 0 additions & 131 deletions .github/workflows/prerelease.yml

This file was deleted.

131 changes: 0 additions & 131 deletions .github/workflows/release.yml

This file was deleted.

56 changes: 0 additions & 56 deletions .github/workflows/test-notebooks.yml

This file was deleted.

Loading

0 comments on commit cb04a38

Please sign in to comment.