Miscellaneous fixes

pyproject.toml

@@ -13,13 +13,13 @@ authors = [
     { name="Sam Webster", email="[email protected]" },
     { name="Tom Minka", email="[email protected]" },
     { name="Siddharth Krishna", email="[email protected]" },
-    { name="Olexandr Balyk", email="[email protected]" },
+    { name="Olexandr Balyk", email="[email protected]" }
 ]
 maintainers = [
     { name="Siddharth Krishna", email="[email protected]" },
-    { name="Olexandr Balyk", email="[email protected]" },
+    { name="Olexandr Balyk", email="[email protected]" }
 ]
-description = 'An open source tool to convert TIMES models specified in Excel a format ready for processing by GAMS'
+description = 'An open source tool to convert TIMES models specified in Excel to a format ready for processing by GAMS'
 readme = "README.md"
 requires-python = ">=3.11"
 license = { file = "LICENSE" }
@@ -28,7 +28,7 @@ classifiers = [
     "Development Status :: 4 - Beta",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3"
 ]
 dependencies = [
     "GitPython >= 3.1.31, < 3.2",
@@ -52,7 +52,7 @@ dev = [
 ]
 
 [project.urls]
-Documentation = "https://github.com/etsap-TIMES/xl2times#readme"
+Documentation = "https://xl2times.readthedocs.io"
 Issues = "https://github.com/etsap-TIMES/xl2times/issues"
 Source = "https://github.com/etsap-TIMES/xl2times"
 

xl2times/datatypes.py

@@ -187,7 +187,9 @@ def data_years(self) -> set[int]:
         data_years = set()
         for attributes in [self.attributes, self.uc_attributes]:
             if not attributes.empty:
-                data_years.update(attributes["year"].astype(int).values)
+                # Index of the year column with non-empty values
+                index = attributes["year"] != ""
+                data_years.update(attributes["year"][index].astype(int).values)
         # Remove interpolation rules before return
         return {y for y in data_years if y >= 1000}
 

xl2times/transforms.py

@@ -2391,7 +2391,7 @@ def query(
         qs.append(f"attribute == '{attribute}'")
     if region is not None:
         qs.append(f"region == '{region}'")
-    if year is not None:
+    if year not in [None, ""]:
         qs.append(f"year == {year}")
     query_str = " and ".join(qs)
     row_idx = table.query(query_str).index

xl2times/utils.py

@@ -232,12 +232,16 @@ def has_negative_patterns(pattern: str) -> bool:
 
 
 def remove_negative_patterns(pattern: str) -> str:
+    # Remove trailing commas
+    pattern = pattern.rstrip(",")
     if len(pattern) == 0:
         return pattern
     return ",".join([word for word in pattern.split(",") if word[0] != "-"])
 
 
 def remove_positive_patterns(pattern: str) -> str:
+    # Remove trailing commas
+    pattern = pattern.rstrip(",")
     if len(pattern) == 0:
         return pattern
     return ",".join([word[1:] for word in pattern.split(",") if word[0] == "-"])