weatherdb 1.2.1__tar.gz → 1.2.2__tar.gz

{weatherdb-1.2.1 → weatherdb-1.2.2}/.gitlab-ci.yml

@@ -45,11 +45,10 @@ test_single:
   interruptible: true
   variables:
     PYTHON_VERSION: 3.8
-    PYTHON_VERSION_ESCAPED: $PY_VERSION | replace(".", "_")
     PIP_CACHE_DIR: $CI_PROJECT_DIR/.cache/pip
     POSTGRES_USER: postgres
     POSTGRES_PASSWORD: postgres
-    POSTGRES_DB: test_db_$PYTHON_VERSION_ESCAPED
+    POSTGRES_DB: test_db_$PYTHON_VERSION
     POSTGRES_HOST_AUTH_METHOD: trust
     WEATHERDB_DB_HOST: postgres
     WEATHERDB_DB_PORT: 5432

{weatherdb-1.2.1 → weatherdb-1.2.2}/CHANGES.md

@@ -1,5 +1,10 @@
 # Change-log
 
+## Version 1.2.2
+
+- config: define utf-8 as default encoding for config files
+- fix: GroupStation(s).create_ts parameter "paras"="n" should be "p", changes create_roger_ts conversion for roger_toolbox
+
 ## Version 1.2.1
 
 - fix: filllup linear regression did not take configuration value and therefor did never work

{weatherdb-1.2.1 → weatherdb-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: weatherdb
-Version: 1.2.1
+Version: 1.2.2
 Summary: This is a package to work with and to create the Weather Database which handles, checks, fills and corrects DWD Weather Station data.
 Author-email: Max Schmit <max.schmit@hydrology.uni-freiburg.de>
 License:                     GNU GENERAL PUBLIC LICENSE

weatherdb-1.2.2/weatherdb/_version.py

@@ -0,0 +1 @@
+__version__ = "1.2.2"

{weatherdb-1.2.1 → weatherdb-1.2.2}/weatherdb/cli.py

@@ -76,7 +76,8 @@ def upgrade_db_schema(revision):
 
 @cli.command(short_help="Create User configuration file.")
 @click.option('--file', '-f',
-              type=click.Path(), default="ask", show_default=True,
+              type=click.Path(resolve_path=True, dir_okay=False, file_okay=True),
+              default="ask", show_default=True,
               help="The file to save the user configuration to.")
 @click.option('--on-exists', '-e',
               type=str, default="ask", show_default=True,

{weatherdb-1.2.1 → weatherdb-1.2.2}/weatherdb/config/ConfigParser.py

@@ -36,11 +36,24 @@ class ConfigParser(configparser.ConfigParser):
         self._user_listeners = []
 
         # read the configuration files
-        self.read(self._DEFAULT_CONFIG_FILE)
+        self.read(self._DEFAULT_CONFIG_FILE, encoding="utf-8")
         self._read_main_config()
         self.load_user_config(raise_undefined_error=False)
         self.load_environment_variables()
 
+    def read(self, filenames, encoding="utf-8"):
+        """Read and parse a list of filenames.
+
+        Parameters
+        ----------
+        filenames : list or str
+            A list of filenames or a single filename to read.
+        encoding : str, optional
+            The encoding of the file.
+            The default is None.
+        """
+        super().read(filenames=filenames, encoding=encoding)
+
     def add_listener(self, section, option, callback):
         """Add a callback function to be called when a configuration option is changed.
 

{weatherdb-1.2.1 → weatherdb-1.2.2}/weatherdb/station/GroupStation.py

@@ -163,7 +163,7 @@ class GroupStation(object):
             The default is True.
         paras : list of str or str, optional
             Give the parameters for which to get the meta information.
-            Can be "n", "t", "et" or "all".
+            Can be "p", "t", "et" or "all".
             If "all", then every available station parameter is returned.
             The default is "all"
         add_na_share : bool, optional
@@ -298,7 +298,7 @@ class GroupStation(object):
         ----------
         paras : list of str or str, optional
             Give the parameters for which to get the meta information.
-            Can be "n", "t", "et" or "all".
+            Can be "p", "t", "et" or "all".
             If "all", then every available station parameter is returned.
             The default is "all"
         **kwargs : dict, optional
@@ -398,8 +398,8 @@ class GroupStation(object):
                 agg_to="10 min", r_r0=r_r0, split_date=True,
                 nas_allowed=False,
                 add_t_min=add_t_min, add_t_max=add_t_max,
-                file_names={"N":"PREC.txt", "T":"TA.txt", "ET":"PET.txt"},
-                col_names={"N":"PREC", "ET":"PET",
+                file_names={"P":"PREC.txt", "T":"TA.txt", "ET":"PET.txt"},
+                col_names={"P":"PREC", "ET":"PET",
                            "T":"TA", "T_min":"TA_min", "T_max":"TA_max",
                            "Jahr":"YYYY", "Monat":"MM", "Tag":"DD",
                            "Stunde":"hh", "Minute":"mm"},
@@ -443,7 +443,7 @@ class GroupStation(object):
             If only one kind is asked for, then the columns get renamed to only have the parameter name as column name.
         paras : list of str or str, optional
             Give the parameters for which to get the meta information.
-            Can be "n", "t", "et" or "all".
+            Can be "p", "t", "et" or "all".
             If "all", then every available station parameter is returned.
             The default is "all"
         agg_to : str, optional
@@ -484,12 +484,12 @@ class GroupStation(object):
             The default is True.
         file_names : dict, optional
             A dictionary with the file names for the different parameters.
-            e.g.{"N":"PREC.txt", "T":"TA.txt", "ET":"ET.txt"}
+            e.g.{"P":"PREC.txt", "T":"TA.txt", "ET":"ET.txt"}
             If an empty dictionary is given, then the standard names are used.
             The default is {}.
         col_names : dict, optional
             A dictionary with the column names for the different parameters.
-            e.g.{"N":"PREC", "T":"TA", "ET":"ET", "Jahr":"YYYY", "Monat":"MM", "Tag":"DD", "Stunde":"HH", "Minute":"MN"}
+            e.g.{"P":"PREC", "T":"TA", "ET":"ET", "Jahr":"YYYY", "Monat":"MM", "Tag":"DD", "Stunde":"HH", "Minute":"MN"}
             If an empty dictionary is given, then the standard names are used.
             The default is {}.
         keep_date_parts : bool, optional

{weatherdb-1.2.1 → weatherdb-1.2.2}/weatherdb/stations/GroupStations.py

@@ -46,7 +46,7 @@ class GroupStations(object):
         if isinstance(paras, str) and paras != "all":
             paras = [paras,]
 
-        valid_paras=["n", "t", "et"]
+        valid_paras=["p", "t", "et"]
         if isinstance(paras, str) and (paras == "all"):
             return valid_paras
         else:
@@ -502,8 +502,8 @@ class GroupStations(object):
                 agg_to="10 min", r_r0=r_r0, stids=stids,
                 split_date=True, nas_allowed=False,
                 add_t_min=add_t_min, add_t_max=add_t_max,
-                file_names={"N":"PREC.txt", "T":"TA.txt", "ET":"PET.txt"},
-                col_names={"N":"PREC", "ET":"PET",
+                file_names={"P":"PREC.txt", "T":"TA.txt", "ET":"PET.txt"},
+                col_names={"P":"PREC", "ET":"PET",
                            "T":"TA", "T_min":"TA_min", "T_max":"TA_max",
                            "Jahr":"YYYY", "Monat":"MM", "Tag":"DD",
                            "Stunde":"hh", "Minute":"mm"},

{weatherdb-1.2.1 → weatherdb-1.2.2}/weatherdb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: weatherdb
-Version: 1.2.1
+Version: 1.2.2
 Summary: This is a package to work with and to create the Weather Database which handles, checks, fills and corrects DWD Weather Station data.
 Author-email: Max Schmit <max.schmit@hydrology.uni-freiburg.de>
 License:                     GNU GENERAL PUBLIC LICENSE

weatherdb-1.2.1/weatherdb/_version.py

@@ -1 +0,0 @@
-__version__ = "1.2.1"