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.

Sign up for GitHub

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

Remove deprecated FlowRouter component #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove deprecated FlowRouter component #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7231e03
remove deprecated FlowRouter component
mcflugen Nov 11, 2019
5f58f34
install dev versions of landlab and pymt
mcflugen Nov 11, 2019
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
5 changes: 1 addition & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ before_install:
- source activate test_env
install:
- pip install numpy bmi-tester model_metadata standard_names pytest
- conda install pymt -c conda-forge
- conda uninstall --force landlab
- pip install git+https://github.com/landlab/landlab.git@mcflugen/add-bc-to-bmi
- conda install pymt -c conda-forge -c conda-forge/label/dev
- pip install . -r requirements.txt
script:
- python -c 'import pymt_landlab'
Expand All @@ -57,7 +55,6 @@ script:
- bmi-test pymt_landlab.bmi:Vegetation -vvv
- bmi-test pymt_landlab.bmi:SoilMoisture -vvv
- bmi-test pymt_landlab.bmi:FlowDirectorSteepest -vvv
- bmi-test pymt_landlab.bmi:FlowRouter -vvv
- bmi-test pymt_landlab.bmi:FlowAccumulator -vvv
- bmi-test pymt_landlab.bmi:StreamPowerEroder -vvv
- bmi-test pymt_landlab.bmi:FlowDirectorD8 -vvv
Expand Down
7 changes: 0 additions & 7 deletions pymt_landlab/bmi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from landlab.bmi.components import FlowDirectorSteepest as FlowDirectorSteepest
from landlab.bmi.components import FlowAccumulator as FlowAccumulator
from landlab.bmi.components import StreamPowerEroder as StreamPowerEroder
from landlab.bmi.components import FlowRouter as FlowRouter
from landlab.bmi.components import FlowDirectorD8 as FlowDirectorD8
from landlab.bmi.components import FlowDirectorDINF as FlowDirectorDINF

Expand Down Expand Up @@ -74,11 +73,6 @@
pkg_resources.resource_filename("pymt_landlab", "data/StreamPowerEroder")
)

FlowRouter.__name__ = "FlowRouter"
FlowRouter.METADATA = os.path.abspath(
pkg_resources.resource_filename("pymt_landlab", "data/FlowRouter")
)

FlowDirectorD8.__name__ = "FlowDirectorD8"
FlowDirectorD8.METADATA = os.path.abspath(
pkg_resources.resource_filename("pymt_landlab", "data/FlowDirectorD8")
Expand All @@ -101,7 +95,6 @@
"FlowDirectorSteepest",
"FlowAccumulator",
"StreamPowerEroder",
"FlowRouter",
"FlowDirectorD8",
"FlowDirectorDINF",
]
4 changes: 0 additions & 4 deletions pymt_landlab/data/FlowRouter/api.yaml
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions pymt_landlab/data/FlowRouter/flow_router.yaml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions pymt_landlab/data/FlowRouter/info.yaml
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions pymt_landlab/data/FlowRouter/parameters.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion pymt_landlab/data/FlowRouter/run.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"Vegetation=pymt_landlab.bmi:Vegetation",
"SoilMoisture=pymt_landlab.bmi:SoilMoisture",
"FlowDirectorSteepest=pymt_landlab.bmi:FlowDirectorSteepest",
"FlowRouter=pymt_landlab.bmi:FlowRouter",
"FlowAccumulator=pymt_landlab.bmi:FlowAccumulator",
"StreamPowerEroder=pymt_landlab.bmi:StreamPowerEroder",
"FlowDirectorD8=pymt_landlab.bmi:FlowDirectorD8",
Expand Down