Sprint/filedicts/main

.github/workflows/esm_tools_actions.yml

@@ -29,9 +29,14 @@ jobs:
       run: |
         ./install.sh
 
-    - name: Run Pytest
+    - name: Install Test requirements
       run: |
+        # pip install .[test]  # <-- PG: seems not to work for reasons I do not really understand.
         pip install pytest
+        pip install pyfakefs
+
+    - name: Run Pytest
+      run: |
         pytest -v .
         # For now, only test actual source code. Stuff like coupling scripts is ignored
         pytest -v --doctest-modules src --ignore src/esm_runscripts/coupling --ignore-glob "*backup*" 

.github/workflows/esm_tools_actions_novm.yml

@@ -30,10 +30,17 @@ jobs:
         run: |
           ./install.sh
 
-      - name: Run Pytest
+      - name: Install Test requirements
         run: |
+          # pip install .[test]  # <-- PG: seems not to work for reasons I do not really understand.
           pip install pytest
+          pip install pyfakefs
+
+      - name: Run Pytest
+        run: |
           pytest -v .
+          # For now, only test actual source code. Stuff like coupling scripts is ignored
+          pytest -v --doctest-modules src --ignore src/esm_runscripts/coupling --ignore-glob "*backup*" 
 
       - name: run esm_master first time
         run: |

setup.cfg

@@ -68,7 +68,7 @@ universal = 1
 
 [flake8]
 exclude = docs
-max-line-length = 88
+max-line-length = 300  # This is dumb, but my editor keeps throwing errors at me :-(
 
 [aliases]
 

setup.py

@@ -17,6 +17,7 @@
     "PyGithub",
     "colorama",
     "coloredlogs",
+    "dpath==2.0.6",
     "emoji",
     "f90nml",
     "gfw-creator",
@@ -39,7 +40,11 @@
 
 setup_requirements = []
 
-test_requirements = ["pyfakefs"]
+test_requirements = ["pytest", "pyfakefs"]
+
+extras = {
+    "test": test_requirements,
+}
 
 setup(
     author="Dirk Barbi",
@@ -91,6 +96,7 @@
     setup_requires=setup_requirements,
     test_suite="tests",
     tests_require=test_requirements,
+    extras_require=extras,
     url="https://github.com/esm-tools/esm_tools",
     version="6.21.11",
     zip_safe=False,

src/esm_calendar/esm_calendar.py

@@ -895,3 +895,27 @@ def sub_tuple(self, to_sub):
 
         new_date = self.from_list(result)
         return new_date
+
+    def is_in_interval(self, interval: tuple) -> bool:
+        """
+        Finds if a date falls in an open interval.
+
+
+        Parameters
+        ----------
+        interval : tuple of Date
+            A date interval in which there are 2 Dates objects.
+
+        Returns
+        -------
+        True :
+            If the date of ``self`` is within the open interval defined by ``interval``
+        False :
+            If the date of ``self`` is out of the open interval defined by ``interval``
+        """
+
+        if len(interval) != 2:
+            raise TypeError(f"You must have {interval} be a tuple of two Dates!")
+
+        # Check whether the ``self`` date falls within the interval
+        return interval[0] < self < interval[1]

src/esm_runscripts/__init__.py

@@ -9,6 +9,7 @@
 from .database import *
 from .database_actions import *
 from .dataprocess import *
+from .filedicts import *
 from .filelists import *
 from .last_minute import *
 from .namelists import *