From 07f9ad7e9b9693179b71f88e6a6788dabe20a458 Mon Sep 17 00:00:00 2001 From: John Siirola Date: Thu, 27 Jul 2023 11:40:18 -0600 Subject: [PATCH 1/2] Bumping pyomo tag (6.6.2 prerelease) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fd82f66646..c25c8011a7 100644 --- a/setup.py +++ b/setup.py @@ -126,7 +126,7 @@ def __getitem__(self, key): # Put abstract (non-versioned) deps here. # Concrete dependencies go in requirements[-dev].txt install_requires=[ - "pyomo>=6.6.1", + "pyomo @ https://github.com/IDAES/pyomo/archive/6.6.2.idaes.2023.07.27.zip" "pint", # required to use Pyomo units "networkx", # required to use Pyomo network "numpy", From 4b546770e322610d32747530a969e36876d14ff9 Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Thu, 27 Jul 2023 13:19:42 -0500 Subject: [PATCH 2/2] Fix comma-before-linebreak, the silent killer --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c25c8011a7..1f9b132d00 100644 --- a/setup.py +++ b/setup.py @@ -126,7 +126,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.6.2.idaes.2023.07.27.zip" + "pyomo @ https://github.com/IDAES/pyomo/archive/6.6.2.idaes.2023.07.27.zip", "pint", # required to use Pyomo units "networkx", # required to use Pyomo network "numpy",