sdsstools 1.9.1__py3-none-any.whl → 1.9.3__py3-none-any.whl

sdsstools/_vendor/yanny.py

@@ -886,7 +886,7 @@ class yanny(OrderedDict):
             raise PydlutilsException("{0} exists, aborting write!".format(newfile))
         if comments is None:
             basefile = os.path.basename(newfile)
-            timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
+            timestamp = datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%d %H:%M:%S UTC")
             comments = "#\n# {0}\n#\n# Created by pydl.pydlutils.yanny.yanny\n#\n# {1}\n#\n".format(
                 basefile, timestamp
             )
@@ -968,7 +968,7 @@ class yanny(OrderedDict):
             raise ValueError(
                 "Data to append is not of the correct type. " + "Use a dict!"
             )
-        timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
+        timestamp = datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%d %H:%M:%S UTC")
         contents = ""
         #
         # Print any key/value pairs

sdsstools/configuration.py

@@ -330,7 +330,7 @@ class Configuration(RecursiveDict):
             if isinstance(config, dict):
                 return config
             elif isinstance(config, (str, pathlib.Path)):
-                return read_yaml_file(config)
+                return read_yaml_file(config, return_class=self.__class__)
             else:
                 raise ValueError("Invalid config of type {}".format(type(config)))
 
@@ -392,9 +392,32 @@ def read_yaml_file(
     path: AnyPath,
     use_extends: bool = True,
     loader: Any = yaml.FullLoader,
-    return_class: Type[ReturnClass] = Configuration,
+    return_class: Type[ReturnClass] = dict,
+    use_variables: bool = True,
 ) -> ReturnClass:
-    """Read a YAML file and returns a dictionary."""
+    """Reads a YAML file and returns a dictionary.
+
+    Parameters
+    ----------
+    path
+        The path to the YAML file or a file-like object.
+    use_extends
+        If :obj:`True`, looks for lines starting with ``#!extends <basefile>`` and
+        merges the current file with the base file.
+    loader
+        The YAML loader to use.
+    return_class
+        The class of the returned object. Typically a subclass of :obj:`dict`.
+    use_variables
+        If :obj:`True`, looks for a ``variables`` section in the YAML file and
+        replaces occurrences of ``$(VARNAME)`` with the value of that variable.
+
+    Returns
+    -------
+    yaml_data
+        The YAML data as an object of type ``return_class``.
+
+    """
 
     if isinstance(path, (str, pathlib.Path)):
         fp = open(path, "r")
@@ -402,9 +425,19 @@ def read_yaml_file(
         fp = path
 
     fp.seek(0)
-    config: Union[ConfigType, None] = yaml.load(fp, Loader=loader)
+    yaml_data: Union[ConfigType, None] = yaml.load(fp, Loader=loader)
+
+    if yaml_data is not None and use_variables:
+        variables = yaml_data.get("variables", {})
+
+        fp.seek(0)
+        file_content = fp.read()
+
+        for var, value in variables.items():
+            file_content = re.sub(rf"\$\(\s*{var}\s*\)", str(value), file_content)
+        yaml_data = yaml.load(file_content, Loader=loader)
 
-    if config is None or config == {}:
+    if yaml_data is None or yaml_data == {}:
         return return_class({})
 
     if use_extends:
@@ -418,10 +451,10 @@ def read_yaml_file(
                     raise FileExistsError(f"cannot find !extends file {base_file}.")
 
                 base = read_yaml_file(base_file, use_extends=False, return_class=dict)
-                new_config = merge_config(base, config)
+                new_config = merge_config(base, yaml_data)
                 return return_class(new_config)
 
             elif line.strip().startswith("#") or line.strip() == "":
                 continue
 
-    return return_class(config)
+    return return_class(yaml_data)

sdsstools/logger.py

@@ -426,7 +426,7 @@ class SDSSLogger(logging.Logger):
                 os.makedirs(logdir)
 
             if os.path.exists(log_file_path) and rotating and rollover:
-                now = datetime.datetime.utcnow()
+                now = datetime.datetime.now(datetime.timezone.utc)
                 dst = str(log_file_path) + "." + now.strftime(SUFFIX)
                 shutil.move(str(log_file_path), dst)
 

sdsstools/time.py

@@ -142,7 +142,7 @@ def get_sjd(
     """
 
     if date is None:
-        date = datetime.datetime.utcnow()
+        date = datetime.datetime.now(datetime.timezone.utc)
 
     jd = datetime2jd(date)
 

{sdsstools-1.9.1.dist-info → sdsstools-1.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdsstools
-Version: 1.9.1
+Version: 1.9.3
 Summary: Small tools for SDSS products
 Project-URL: Homepage, https://github.com/sdss/sdsstools
 Project-URL: Repository, https://github.com/sdss/sdsstools
@@ -141,6 +141,25 @@ you can use `read_yaml_file` to parse the result
 
 The path to the base file must be absolute or relative to the location of the file to be extended.
 
+### Using variables in YAML files
+
+`read_yaml_file` and `get_config` support the use of variables in YAML files. A special section `variables` can be defined at the top level of the YAML file, and any `$(VAR)` string in the file will be replaced by the value of the variable. For example
+
+```yaml
+variables:
+  greeting: hello
+
+cat1:
+  key1: $(greeting) world
+```
+
+```python
+>>> read_yaml_file('file.yaml', use_variables=True)
+{'cat1': {'key1': 'hello world'}, 'variables': {'greeting': 'hello'}}
+```
+
+Environment variables can also be used by including a `${ENV_VAR}` string in the YAML file, which will be replaced with the content of the `$ENV_VAR` environment variable.
+
 ### The `Configuration` class
 
 By default `get_config()` and `read_yaml_file()` return a `Configuration` instance. For the most part a `Configuration` object is the same as a dictionary, and it can be used as such. It has two main differences:

{sdsstools-1.9.1.dist-info → sdsstools-1.9.3.dist-info}/RECORD

@@ -1,22 +1,22 @@
 sdsstools/__init__.py,sha256=G8u94gRu4THFJvptEITykK0Q_3jHqhQY9p01j9QCQH4,744
 sdsstools/_tasks.py,sha256=U7fvxk9IExzE6voNjio2QqRTw-H9Upu1d0zKQlQFs5I,4263
 sdsstools/cli.py,sha256=e4BS4b1cJThCj5tytajr_VMUvmVP1xYq_r90EtEscg8,1348
-sdsstools/configuration.py,sha256=i2KkrjS5hE4o-d4VDwzWZKacxO-rNKewgDKoeqE3uuQ,13417
+sdsstools/configuration.py,sha256=lvutpHf7wYIVOoFXd3NMkbh-zJrTTi2q6HVkWQOH9ns,14496
 sdsstools/daemonizer.py,sha256=TMzq3RgD0KqY6jmeeJASlCsw7CjDpLmF8QrENaxCHBU,7796
-sdsstools/logger.py,sha256=L_ZfTCbV22gNtqBhLNYHAu1a5SQ3jpN7b9rodrvKjqA,18364
+sdsstools/logger.py,sha256=nGAC_hDK0dWVMAS-a-vBsw0oSCxAwx-ZsJUE5GMzILs,18382
 sdsstools/metadata.py,sha256=LZWO0KI-gVvzdJNIaVlIn4bBBHxbglU8BLW-MdlxOFA,3268
-sdsstools/time.py,sha256=6LsJpF0k2LUI8gCXZGznAu4ZCVuX7X_7OQHwfEWMlDo,4588
+sdsstools/time.py,sha256=cqLrch0ZUCt3ShagN1v-5GhgLyNjzPXgaQRem4j7vAk,4606
 sdsstools/utils.py,sha256=kl3FtvJdw3uEZye7gcBI9Ksvd1rk0EwkriiDkuyvlrU,5077
 sdsstools/_vendor/__init__.py,sha256=sy3LqhCDgkFjMQY7mLQolVOgvD7y9LM6DuWp2ylG0vc,282
 sdsstools/_vendor/color_print.py,sha256=lD3qS-U77cw1OR_XoA7pV7qOqH0Rql5cScPdAYZnstg,6457
-sdsstools/_vendor/yanny.py,sha256=qCq32FZUqZijXTUJZC_7RVWAi9LDWScTpbvSSCMtdg0,48667
+sdsstools/_vendor/yanny.py,sha256=ur40GkJ3pG50kLQPsXfnF_2I3McS5K9Fg1K1RUGK3A8,48703
 sdsstools/_vendor/toml/__init__.py,sha256=l1rGAaRKxb8_tQtToqdVmvS6zWXtWj-Gw5PC2TPRE4c,705
 sdsstools/_vendor/toml/decoder.py,sha256=hWUJ3UQ43MGVER35rSUUj7Hdh85Vat8Od_B4HeFdp3w,38050
 sdsstools/_vendor/toml/encoder.py,sha256=OBRwH2tRUhRI8nJgKBwKbkyQnBAuhcUf60r3wykjPco,9989
 sdsstools/_vendor/toml/ordered.py,sha256=aW5woa5xOqR4BjIz9t10_lghxyhF54KQ7FqUNVv7WJ0,334
 sdsstools/_vendor/toml/tz.py,sha256=8TAiXrTqU08sE0ruz2TXH_pFY2rlwNKE47MSE4rDo8Y,618
-sdsstools-1.9.1.dist-info/METADATA,sha256=WF2fVOdt6z9KDGnTOZF80BInwyMDg3KKOLgFoMDirYc,15027
-sdsstools-1.9.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sdsstools-1.9.1.dist-info/entry_points.txt,sha256=H1UefQFMHyzmGcdNib_qxiOfFSx3351wr4c2ax0PJbQ,87
-sdsstools-1.9.1.dist-info/licenses/LICENSE.md,sha256=_7dAUQQ5Ph_x1hcFXhi9aHBcqq9H11zco12eO4B3Cyg,1504
-sdsstools-1.9.1.dist-info/RECORD,,
+sdsstools-1.9.3.dist-info/METADATA,sha256=IwrO_J-v0fUFPfaByUchYYoc_2bmYSni--E4RQnHg34,15701
+sdsstools-1.9.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sdsstools-1.9.3.dist-info/entry_points.txt,sha256=H1UefQFMHyzmGcdNib_qxiOfFSx3351wr4c2ax0PJbQ,87
+sdsstools-1.9.3.dist-info/licenses/LICENSE.md,sha256=_7dAUQQ5Ph_x1hcFXhi9aHBcqq9H11zco12eO4B3Cyg,1504
+sdsstools-1.9.3.dist-info/RECORD,,