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

Update idaes-pse requirement to 2.7.0 #1534

Merged
merged 8 commits into from
Dec 13, 2024
Merged

Update idaes-pse requirement to 2.7.0 #1534

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
88b37b2
Update idaes-pse requirement to 2.7.0rc0
lbianchi-lbl Nov 28, 2024
f0d5279
Update idaes-pse requirement and get rid of separate variable for rel…
lbianchi-lbl Dec 10, 2024
6947980
Update parameter-sweep requirement after 0.1.0 tag
lbianchi-lbl Dec 10, 2024
1aa091b
Remove leftover pydantic requirement
lbianchi-lbl Dec 10, 2024
39473dd
Remove importlib-resources as not required anymore
lbianchi-lbl Dec 10, 2024
0c920e5
Update idaes-flowsheet-processor requirement to PyPI
lbianchi-lbl Dec 10, 2024
565930c
Merge branch 'main' into idaes-2.7
lbianchi-lbl Dec 11, 2024
904ad15
Merge branch 'main' into idaes-2.7
lbianchi-lbl Dec 13, 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
20 changes: 3 additions & 17 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,6 @@
cwd = Path(__file__).parent
long_description = (cwd / "README.md").read_text()

SPECIAL_DEPENDENCIES_FOR_RELEASE = [
"idaes-pse>=2.7.0,<2.8.0rc0", # from PyPI
]

SPECIAL_DEPENDENCIES_FOR_PRERELEASE = [
# update with a tag from the nawi-hub/idaes-pse
# when a version of IDAES newer than the latest stable release from PyPI
# will become needed for the watertap development
"idaes-pse @ git+https://github.com/watertap-org/[email protected]",
]

# Arguments marked as "Required" below must be included for upload to PyPI.
# Fields marked as "Optional" may be commented out.
Expand Down Expand Up @@ -77,16 +67,12 @@
python_requires=">=3.8",
install_requires=[
# primary requirements for unit and property models
# maintainers: switch to SPECIAL_DEPENDENCIES_FOR_RELEASE when cutting a release of watertap
*SPECIAL_DEPENDENCIES_FOR_PRERELEASE,
"idaes-pse >=2.7.0,<2.8.0rc0",
"pyomo>=6.6.1",
"pyyaml", # watertap.core.wt_database
# for parameter_sweep
"parameter-sweep>=0.1.dev5",
# for watertap.ui.api_model (though may be generally useful)
"pydantic >= 2, <3",
"parameter-sweep >=0.1.0",
"numpy",
"importlib-resources",
],
extras_require={
"testing": [
Expand All @@ -95,7 +81,7 @@
# treebeardtech/nbmake#121
"nbmake != 1.5.1",
"nbconvert",
"idaes-flowsheet-processor @ git+https://github.com/watertap-org/idaes-flowsheet-processor@0.1.dev1",
"idaes-flowsheet-processor >=0.1.dev4",
],
"notebooks": [
"jupyter",
Expand Down
Loading