bring up to date with upstream

CrayLabs · May 26, 2023 · 0ac9386 · 0ac9386
2 parents bdda273 + 02d111f
commit 0ac9386
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 560 deletions.
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -25,13 +25,18 @@ Description
 
 A full list of changes and detailed notes can be found below:
 
+- Remove deprecated code
+- Relax the coloredlogs version
 - Update Fortran tutorials for SmartRedis
 - Add support for multiple network interface binding in Orchestrator and Colocated DBs
 
 Detailed notes
 
 - Update full test suite to no longer require a tensorflow wheel to be available
   at test time. (PR291_)
+- Deprecated launcher-specific orchestrators, constants, and ML utilities
+were removed. (PR289_)
+- Relax the coloredlogs version to be greater than 10.0 (PR288_)
 - Update the Github Actions runner image from `macos-10.15`` to `macos-12``. The
 former began deprecation in May 2022 and was finally removed in May 2023. (PR285_)
 - The Fortran tutorials had not been fully updated to show how to handle return/error
@@ -40,6 +45,8 @@ codes. These have now all been updated. (PR284_)
 argument name is still `interface` for backward compatibility reasons. (PR281_)
 
 .. _PR291: https://github.com/CrayLabs/SmartSim/pull/291
+.. _PR289: https://github.com/CrayLabs/SmartSim/pull/289
+.. _PR288: https://github.com/CrayLabs/SmartSim/pull/288
 .. _PR285: https://github.com/CrayLabs/SmartSim/pull/285
 .. _PR284: https://github.com/CrayLabs/SmartSim/pull/284
 .. _PR281: https://github.com/CrayLabs/SmartSim/pull/281

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 psutil>=5.7.2
-coloredlogs==10.0
+coloredlogs>=10.0
 tabulate>=0.8.9
 smartredis>=0.4.0
 redis==3.5.3

diff --git a/setup.py b/setup.py
@@ -161,7 +161,7 @@ def has_ext_modules(_placeholder):
 # Define needed dependencies for the installation
 deps = [
     "psutil>=5.7.2",
-    "coloredlogs==10.0",
+    "coloredlogs>=10.0",
     "tabulate>=0.8.9",
     "redis-py-cluster==2.1.3",
     "redis==3.5.3",

diff --git a/smartsim/constants.py b/smartsim/constants.py
diff --git a/smartsim/database/__init__.py b/smartsim/database/__init__.py
@@ -24,11 +24,4 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# deprecated classes
-from .orchestrator import (
-    CobaltOrchestrator,
-    LSFOrchestrator,
-    Orchestrator,
-    PBSOrchestrator,
-    SlurmOrchestrator,
-)
+from .orchestrator import Orchestrator