Requirements fixes

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added "Unit-tests" GitHub action to run the unit test suite
 - Added `CeleryTaskManager` context manager to the test suite to ensure tasks are safely purged from queues if tests fail
 - Added `command-tests`, `workflow-tests`, and `integration-tests` to the Makefile
+- Python 3.8 now requires `orderly-set==5.3.0` to avoid a bug with the deepdiff library
 
 ### Changed
 - Dropped support for Python 3.7

merlin/config/broker.py

@@ -37,16 +37,11 @@
 import ssl
 from os.path import expanduser
 from typing import Dict, List, Optional, Union
+from urllib.parse import quote
 
 from merlin.config.configfile import CONFIG, get_ssl_entries
 
 
-try:
-    from urllib import quote
-except ImportError:
-    from urllib.parse import quote
-
-
 LOG: logging.Logger = logging.getLogger(__name__)
 
 BROKERS: List[str] = ["rabbitmq", "redis", "rediss", "redis+socket", "amqps", "amqp"]

merlin/config/results_backend.py

@@ -35,16 +35,11 @@
 
 import logging
 import os
+from urllib.parse import quote
 
 from merlin.config.configfile import CONFIG, get_ssl_entries
 
 
-try:
-    from urllib import quote
-except ImportError:
-    from urllib.parse import quote
-
-
 LOG = logging.getLogger(__name__)
 
 BACKENDS = ["sqlite", "mysql", "redis", "rediss", "none"]

merlin/server/server_config.py

@@ -35,6 +35,7 @@
 import random
 import string
 import subprocess
+from importlib import resources
 from io import BufferedReader
 from typing import Tuple
 
@@ -52,12 +53,6 @@
 )
 
 
-try:
-    from importlib import resources
-except ImportError:
-    import importlib_resources as resources
-
-
 LOG = logging.getLogger("merlin")
 
 # Default values for configuration

merlin/utils.py

@@ -34,6 +34,7 @@
 import getpass
 import logging
 import os
+import pickle
 import re
 import socket
 import subprocess
@@ -51,12 +52,6 @@
 from tabulate import tabulate
 
 
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
-
-
 LOG = logging.getLogger(__name__)
 ARRAY_FILE_FORMATS = ".npy, .csv, .tab"
 DEFAULT_FLUX_VERSION = "0.48.0"

requirements/dev.txt

@@ -12,5 +12,6 @@ sphinx>=2.0.0
 alabaster
 johnnydep
 deepdiff
+orderly-set==5.3.0; python_version == '3.8'
 pytest-order
 pytest-mock

requirements/release.txt

@@ -2,8 +2,6 @@ cached_property
 celery[redis,sqlalchemy]>=5.0.3
 coloredlogs
 cryptography
-importlib_metadata<5.0.0; python_version == '3.7'
-importlib_resources; python_version < '3.7'
 maestrowf>=1.1.9dev1
 numpy
 parse

tests/unit/server/test_server_config.py

@@ -6,6 +6,7 @@
 import logging
 import os
 import string
+from importlib import resources
 from typing import Dict, Tuple, Union
 
 import pytest
@@ -30,12 +31,6 @@
 from merlin.server.server_util import CONTAINER_TYPES, MERLIN_SERVER_SUBDIR, ServerConfig
 
 
-try:
-    from importlib import resources
-except ImportError:
-    import importlib_resources as resources
-
-
 def test_generate_password_no_pass_command():
     """
     Test the `generate_password` function with no password command.