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

Improve Cython dependency version specificity #784

Merged
merged 4 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,25 +82,25 @@ Currently, there are no specific configuration details. Stand by for updates.
## Usage and Testing
To get a sense of the operation of the routing scheme, follow this sequence of commands:

```
```shell
# install required python modules
$ pip3 install numpy pandas xarray netcdf4 joblib toolz pyyaml Cython geopandas pyarrow deprecated wheel
pip3 install numpy pandas xarray netcdf4 joblib toolz pyyaml Cython>3,!=3.0.4 geopandas pyarrow deprecated wheel

# clone t-toute
$ git clone --progress --single-branch --branch master http://github.com/NOAA-OWP/t-route.git
git clone --progress --single-branch --branch master http://github.com/NOAA-OWP/t-route.git

# compile and install
$ ./compiler.sh
./compiler.sh

# execute a demonstration test with NHD network
$ cd test/LowerColorado_TX
$ python3 -m nwm_routing -f -V4 test_AnA_V4_NHD.yaml
cd test/LowerColorado_TX
python3 -m nwm_routing -f -V4 test_AnA_V4_NHD.yaml

# OR

# execute a demonstration test with HYFeature network
$ cd test/LowerColorado_TX_v4
$ python3 -m nwm_routing -f -V4 test_AnA_V4_HYFeature.yaml
cd test/LowerColorado_TX_v4
python3 -m nwm_routing -f -V4 test_AnA_V4_HYFeature.yaml
```

### T-Route Setup Instructions and Troubleshooting Guide for Windows Users
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
wheel
numpy
Cython<3.0.4
Cython>3,!=3.0.4
pandas >=1.1.5, <=2.2.0
xarray
netcdf4
Expand Down
2 changes: 1 addition & 1 deletion src/troute-network/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools", "numpy", "Cython<3.0.4", "wheel"]
requires = ["setuptools", "numpy", "Cython>3,!=3.0.4", "wheel"]
build-backend = "setuptools.build_meta"

[project]
Expand Down
24 changes: 18 additions & 6 deletions src/troute-nwm/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
[build-system]
requires = [
"setuptools>=42",
"wheel",
"pip",
"Cython<3.0.4"
]
requires = ["setuptools>=61.0"]
build-backend = "setuptools.build_meta"

[project]
name = "nwm_routing"
authors = [{ name = "Adam Wlostowski", email = "adam.wlostowski@noaa.gov" }]
dependencies = ["numpy", "pandas>=1.1.5", "xarray", "netcdf4", "pyyaml"]
description = "Hydrologic and hydraulic routing for the U.S. National Water Model"
version = "0.0.0"
license = { text = "DOC" }
readme = "README.md"
requires-python = ">=3.6"

[project.urls]
Homepage = "https://github.com/NOAA-OWP/t-route"
Issues = "https://github.com/NOAA-OWP/t-route/issues"

# [tool.setuptools.dynamic]
# version = {attr = "troute.config.__version__"}
27 changes: 0 additions & 27 deletions src/troute-nwm/setup.cfg

This file was deleted.

4 changes: 0 additions & 4 deletions src/troute-nwm/setup.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/troute-routing/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools", "numpy", "Cython<3.0.4", "wheel"]
requires = ["setuptools", "numpy", "Cython>3,!=3.0.4", "wheel"]
build-backend = "setuptools.build_meta"

[project]
Expand Down
Loading