ssb-konjunk 0.1.11__tar.gz → 0.1.13__tar.gz

{ssb_konjunk-0.1.11 → ssb_konjunk-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ssb-konjunk
-Version: 0.1.11
+Version: 0.1.13
 Summary: SSB Konjunk
 Home-page: https://github.com/statisticsnorway/ssb-konjunk
 License: MIT

{ssb_konjunk-0.1.11 → ssb_konjunk-0.1.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-konjunk"
-version = "0.1.11"
+version = "0.1.13"
 description = "SSB Konjunk"
 authors = ["Edvard Garmannslund <ged@ssb.no>"]
 license = "MIT"

{ssb_konjunk-0.1.11 → ssb_konjunk-0.1.13}/src/ssb_konjunk/saving.py

@@ -87,7 +87,7 @@ def _structure_ssb_filepath(
 
     # Handle versionizing or not.
     if version_number is None:
-        file_path = f"{file_path}/{file_name}_{time_stamp}"
+        file_path = f"{file_path}/{file_name}_{time_stamp}_"
     elif isinstance(version_number, int):
         file_path = f"{file_path}/{file_name}_{time_stamp}_v{version_number}.{filetype}"
     else:
@@ -324,6 +324,8 @@ def write_ssb_file(
     version_number = _find_version_number(files, stable_version)
 
     if version_number:
+        if file_path.endswith("_"):
+            file_path = file_path[:-1]
         file_path = f"{file_path}_v{version_number}.{filetype}"
 
         _save_df(df, file_path, filetype, fs, seperator, encoding)

{ssb_konjunk-0.1.11 → ssb_konjunk-0.1.13}/src/ssb_konjunk/timestamp.py

@@ -196,6 +196,8 @@ def _get_timestamp_special(*args: int, frequency: str) -> str | None:
     if frequency in ["M", "W"]:
         if frequency == "M":
             frequency = "-"
+        if frequency == "W":
+            frequency = "-W"
         if len(args) == 2:
             return f"p{args[0]}{frequency}{args[1]:02}"
         elif len(args) == 4:
@@ -204,7 +206,10 @@ def _get_timestamp_special(*args: int, frequency: str) -> str | None:
             )
         else:
             return None
+
     else:
+        if frequency in ["Q", "B", "T", "H"]:
+            frequency = f"-{frequency}"
         if len(args) == 2:
             return f"p{args[0]}{frequency}{args[1]}"
         elif len(args) == 4: