Nikwl development

.github/workflows/ci.yml

@@ -119,6 +119,15 @@ jobs:
             python:
               name: CPython 3.8
               action: 3.8
+          - task:
+              name: Check format
+              tox: check-format
+            os:
+              name: Linux
+              runs-on: ubuntu-latest
+            python:
+              name: CPython 3.8
+              action: 3.8
 
 
     env:

CHANGELOG.md

@@ -16,10 +16,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#885](https://github.com/ericaltendorf/plotman/pull/885))
 - `supervisord` now used in Docker image.
   ([#898](https://github.com/ericaltendorf/plotman/pull/898))
-- `plotman graph` command to create a matplotlib plot for completed
-  plots ([#612](https://github.com/ericaltendorf/plotman/pull/612)). 
-  Creates a graph image showing plots over time, average plot rage,
-  average plot time, and total number of plots over time.
+- Output same entries to plotman.log from 'plotman interactive' and ' plotman plot/archive' "daemons".
+  ([#878](https://github.com/ericaltendorf/plotman/pull/878))
+- `plotman graph` command to create a matplotlib plot for completed plots. 
+  Creates a graph image showing plots over time, average plot rate, average plot time, and total number of plots over time.
+  ([#612](https://github.com/ericaltendorf/plotman/pull/612))
 
 ## [0.5.1] - 2021-07-15
 ### Fixed

pyproject.toml

@@ -1,3 +1,12 @@
 [build-system]
 requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
+
+[tool.black]
+target-version =  ['py36', 'py37', 'py38', 'py39']
+include = '''
+^/(
+    setup.py
+    | src/plotman/.*\.pyi?
+)$
+'''

setup.cfg

@@ -68,6 +68,7 @@ test =
     pytest-cov
     pyfakefs
 checks =
+    black == 21.7b0
     check-manifest ~= 0.46
     mypy == 0.902
     types-pkg_resources ~= 0.1.2

src/plotman/_tests/archive_test.py

@@ -2,5 +2,6 @@
 
 
 def test_compute_priority() -> None:
-    assert (archive.compute_priority( job.Phase(major=3, minor=1), 1000, 10) >
-            archive.compute_priority( job.Phase(major=3, minor=6), 1000, 10) )
+    assert archive.compute_priority(
+        job.Phase(major=3, minor=1), 1000, 10
+    ) > archive.compute_priority(job.Phase(major=3, minor=6), 1000, 10)

src/plotman/_tests/configuration_test.py

@@ -8,24 +8,30 @@
 from plotman import resources as plotman_resources
 
 
-@pytest.fixture(name='config_text')
+@pytest.fixture(name="config_text")
 def config_text_fixture() -> str:
     return importlib.resources.read_text(plotman_resources, "plotman.yaml")
 
 
-@pytest.fixture(name='target_definitions_text')
+@pytest.fixture(name="target_definitions_text")
 def target_definitions_text_fixture() -> str:
     return importlib.resources.read_text(
-        plotman_resources, "target_definitions.yaml",
+        plotman_resources,
+        "target_definitions.yaml",
     )
 
 
-def test_get_validated_configs__default(config_text: str, target_definitions_text: str) -> None:
+def test_get_validated_configs__default(
+    config_text: str, target_definitions_text: str
+) -> None:
     """Check that get_validated_configs() works with default/example plotman.yaml file."""
-    res = configuration.get_validated_configs(config_text, '', target_definitions_text)
+    res = configuration.get_validated_configs(config_text, "", target_definitions_text)
     assert isinstance(res, configuration.PlotmanConfig)
 
-def test_get_validated_configs__malformed(config_text: str, target_definitions_text: str) -> None:
+
+def test_get_validated_configs__malformed(
+    config_text: str, target_definitions_text: str
+) -> None:
     """Check that get_validated_configs() raises exception with invalid plotman.yaml contents."""
     loaded_yaml = yaml.load(config_text, Loader=yaml.SafeLoader)
 
@@ -34,71 +40,81 @@ def test_get_validated_configs__malformed(config_text: str, target_definitions_t
     malformed_config_text = yaml.dump(loaded_yaml, Dumper=yaml.SafeDumper)
 
     with pytest.raises(configuration.ConfigurationException) as exc_info:
-        configuration.get_validated_configs(malformed_config_text, '/the_path', target_definitions_text)
+        configuration.get_validated_configs(
+            malformed_config_text, "/the_path", target_definitions_text
+        )
 
     assert exc_info.value.args[0] == f"Config file at: '/the_path' is malformed"
 
 
 def test_get_validated_configs__missing() -> None:
     """Check that get_validated_configs() raises exception when plotman.yaml does not exist."""
     with pytest.raises(configuration.ConfigurationException) as exc_info:
-        configuration.read_configuration_text('/invalid_path')
+        configuration.read_configuration_text("/invalid_path")
 
     assert exc_info.value.args[0] == (
         f"No 'plotman.yaml' file exists at expected location: '/invalid_path'. To generate "
         f"default config file, run: 'plotman config generate'"
     )
 
 
-def test_loads_without_user_interface(config_text: str, target_definitions_text: str) -> None:
+def test_loads_without_user_interface(
+    config_text: str, target_definitions_text: str
+) -> None:
     loaded_yaml = yaml.load(config_text, Loader=yaml.SafeLoader)
 
     del loaded_yaml["user_interface"]
 
     stripped_config_text = yaml.dump(loaded_yaml, Dumper=yaml.SafeDumper)
 
-    reloaded_yaml = configuration.get_validated_configs(stripped_config_text, '', target_definitions_text)
+    reloaded_yaml = configuration.get_validated_configs(
+        stripped_config_text, "", target_definitions_text
+    )
 
     assert reloaded_yaml.user_interface == configuration.UserInterface()
 
 
-def test_loads_without_user_archiving(config_text: str, target_definitions_text: str) -> None:
+def test_loads_without_user_archiving(
+    config_text: str, target_definitions_text: str
+) -> None:
     loaded_yaml = yaml.load(config_text, Loader=yaml.SafeLoader)
 
     del loaded_yaml["archiving"]
 
     stripped_config_text = yaml.dump(loaded_yaml, Dumper=yaml.SafeDumper)
 
-    reloaded_yaml = configuration.get_validated_configs(stripped_config_text, '', target_definitions_text)
+    reloaded_yaml = configuration.get_validated_configs(
+        stripped_config_text, "", target_definitions_text
+    )
 
     assert reloaded_yaml.archiving is None
 
 
 def test_get_dst_directories_gets_dst() -> None:
-    tmp = ['/tmp']
-    dst = ['/dst0', '/dst1']
+    tmp = ["/tmp"]
+    dst = ["/dst0", "/dst1"]
     directories = configuration.Directories(tmp=tmp, dst=dst)
 
     assert directories.get_dst_directories() == dst
 
 
 def test_get_dst_directories_gets_tmp() -> None:
-    tmp = ['/tmp']
+    tmp = ["/tmp"]
     directories = configuration.Directories(tmp=tmp)
 
     assert directories.get_dst_directories() == tmp
 
 
 def test_dst_is_dst() -> None:
-    tmp = ['/tmp']
-    dst = ['/dst0', '/dst1']
+    tmp = ["/tmp"]
+    dst = ["/dst0", "/dst1"]
     directories = configuration.Directories(tmp=tmp, dst=dst)
 
     assert not directories.dst_is_tmp()
 
 
 def test_dst_is_tmp() -> None:
-    tmp = ['/tmp']
+    tmp = ["/tmp"]
     directories = configuration.Directories(tmp=tmp)
 
     assert directories.dst_is_tmp()