Skip to content

Commit

Permalink
Merge branch 'riverBedDynamics_dev' of https://github.com/angelmons/l…
Browse files Browse the repository at this point in the history
…andlab into riverBedDynamics_dev
  • Loading branch information
angelmons committed Oct 23, 2023
2 parents 3e3eeff + 644effb commit 9c94ef5
Show file tree
Hide file tree
Showing 22 changed files with 286 additions and 832 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ updates:
labels: ["skip news", "dependencies"]

- package-ecosystem: "pip"
directory: "."
directory: "/requirements"
schedule:
interval: "daily"
target-branch: "dependencies"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# `towncrier check` runs `git diff --name-only origin/main...`, which
# needs a non-shallow clone.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
shell: bash -l {0}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
os: "windows-latest"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Python 3.10
uses: actions/setup-python@v4
Expand All @@ -80,7 +80,7 @@ jobs:

- name: Set up QEMU # Needed to build aarch64 wheels
if: runner.os == 'Linux'
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: all

Expand All @@ -90,7 +90,7 @@ jobs:
python -m cibuildwheel --only ${{ matrix.cibw-only }} --print-build-identifiers
- name: Build wheels
uses: pypa/cibuildwheel@v2.15.0
uses: pypa/cibuildwheel@v2.16.2
with:
only: ${{ matrix.cibw-only }}

Expand All @@ -103,7 +103,7 @@ jobs:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build sdist
run: pipx run build --sdist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rebase_dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Rebase `dependencies` with `master`
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
ref: dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
os: "windows-latest"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Python 3.10
uses: actions/setup-python@v4
Expand All @@ -81,7 +81,7 @@ jobs:

- name: Set up QEMU # Needed to build aarch64 wheels
if: runner.os == 'Linux'
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: all

Expand All @@ -91,7 +91,7 @@ jobs:
python -m cibuildwheel --only ${{ matrix.cibw-only }} --print-build-identifiers
- name: Build wheels
uses: pypa/cibuildwheel@v2.15.0
uses: pypa/cibuildwheel@v2.16.2
with:
only: ${{ matrix.cibw-only }}

Expand All @@ -104,7 +104,7 @@ jobs:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build sdist
run: pipx run build --sdist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
markers: ["slow", "not slow"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: mamba-org/setup-micromamba@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
pytest-marker: ["slow", "not slow"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: mamba-org/setup-micromamba@v1
with:
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ recursive-include docs *.txt
recursive-include landlab *.pyx *.pxd *.hpp
recursive-include landlab README.md
recursive-include landlab/data *
recursive-include requirements *.md *.txt
recursive-include tests *py
recursive-include tests *.asc
recursive-include tests *.dbf
Expand Down
95 changes: 0 additions & 95 deletions docs/requirements.txt

This file was deleted.

Loading

0 comments on commit 9c94ef5

Please sign in to comment.