Merge branch 'main' into deprecate-old-ceos

IDAES · Nov 20, 2024 · 4a15b6d · 4a15b6d
2 parents 0f26e01 + 3fa6904
commit 4a15b6d
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 274 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/docker/README.md b/docker/README.md
diff --git a/docker/idaes-jupyterhub/Dockerfile b/docker/idaes-jupyterhub/Dockerfile
diff --git a/docker/idaes-jupyterhub/README.md b/docker/idaes-jupyterhub/README.md
diff --git a/docker/ubuntu-conda/Dockerfile b/docker/ubuntu-conda/Dockerfile
diff --git a/docker/ubuntu-conda/README-build.md b/docker/ubuntu-conda/README-build.md
diff --git a/docker/ubuntu-conda/README.md b/docker/ubuntu-conda/README.md
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,12 +1,11 @@
---index-url https://pypi.python.org/simple/
-
 # Developer extra packages
 
 ### docs
-alabaster>=0.7.7
 # Newer sphinx needed for proper type hint support in docstrings
 sphinx>=3.0.0
 sphinxcontrib-napoleon>=0.5.0
+# sphinx-argparse 0.4.0 is the last version to support Python 3.9
+# see https://sphinx-argparse.readthedocs.io/en/latest/changelog.html#id3
 sphinx-argparse==0.4.0
 sphinx-book-theme<=1.1.2,>=1.0.0
 sphinx-copybutton==0.5.2
@@ -19,15 +18,11 @@ pytest-cov
 # @lbianchi-lbl: both pylint and astroid should be tightly pinned; see .pylint/idaes_transform.py for more info
 pylint==3.0.3
 astroid==3.0.3
-flake8
 black==24.3.0
 # pre-commit install, manage, and run pre-commit hooks
 pre-commit
 
 ### other/misc
-jsonschema
-jupyter_contrib_nbextensions
-snowballstemmer==1.2.1
 addheader>=0.2.2
 
 # this will install IDAES in editable mode using the dependencies defined under the `extras_require` tags defined in `setup.py`

diff --git a/setup.py b/setup.py
@@ -82,7 +82,7 @@ def __getitem__(self, key):
     # Put abstract (non-versioned) deps here.
     # Concrete dependencies go in requirements[-dev].txt
     install_requires=[
-        "pyomo @ https://github.com/IDAES/pyomo/archive/6.8.0.idaes.2024.10.25.zip",
+        "pyomo >= 6.8.2",
         "pint >= 0.24.1",  # required to use Pyomo units. Pint 0.24.1 needed for Python 3.9 support
         "networkx",  # required to use Pyomo network
         "numpy>=1,<3",