weatherdb 1.2.1__tar.gz → 1.2.3__tar.gz

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

@@ -16,7 +16,7 @@ test_single:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
   image: "python:$PYTHON_VERSION"
   services:
-    - name: postgis/postgis:16-3.4
+    - name: timescale/timescaledb-ha:pg17
       alias: postgres
       command: ["postgres", "-c", "fsync=off"]
   before_script:
@@ -44,12 +44,11 @@ test_single:
       - $WEATHERDB_TEST_ARTIFACT_DIR/*
   interruptible: true
   variables:
-    PYTHON_VERSION: 3.8
-    PYTHON_VERSION_ESCAPED: $PY_VERSION | replace(".", "_")
+    PYTHON_VERSION: 3.12
     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
@@ -78,7 +77,7 @@ test_matrix:
   extends: test_single
   parallel:
     matrix:
-      - PY_VERSION: ["3.9","3.10","3.11","3.12","3.13"]
+      - PY_VERSION: ["3.8", "3.9","3.10","3.11","3.13"]
   variables:
     PYTHON_VERSION: $PY_VERSION
 
@@ -93,8 +92,7 @@ test_download_rasters:
   variables:
     PYTHON_VERSION: $PY_VERSION
   parallel:
-    matrix:
-      - PY_VERSION: ["3.9","3.10","3.11","3.12","3.13"]
+    matrix: !reference [test_matrix, parallel, matrix ]
 
 build:
   stage: build
@@ -102,7 +100,7 @@ build:
     - if: $CI_COMMIT_TAG =~ /^[Vv]*\d+\.\d+\.\d+$/
   dependencies:
     - test_matrix
-  image: python:3.11
+  image: python:3.12
   script:
     - python -m pip install --upgrade pip --root-user-action=ignore
     - python -m pip install setuptools wheel build setuptools-scm --root-user-action=ignore

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

@@ -1,8 +1,19 @@
 # Change-log
 
+## Version 1.2.3
+
+- fix: dropping stations
+- fix: test environment as DWD kicked station 2388
+- docker: optimize image with timescaledb image instead of postgis
+
+## 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
+- fix: fillup linear regression did not take configuration value and therefor did never work
 - config: change LINEAR_INTERPOLATION_LIMIT to be a category
 - cli: add version parameter
 - multiprocessing: make process count configurable through user configuration

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: weatherdb
-Version: 1.2.1
+Version: 1.2.3
 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
@@ -693,8 +693,27 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Natural Language :: English
 Requires-Python: <3.14,>=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: optionals
 License-File: LICENSE
+Requires-Dist: geopandas
+Requires-Dist: shapely>=2
+Requires-Dist: pandas
+Requires-Dist: numpy
+Requires-Dist: progressbar2
+Requires-Dist: rasterio
+Requires-Dist: sqlalchemy>2.0
+Requires-Dist: psycopg2-binary
+Requires-Dist: GeoAlchemy2
+Requires-Dist: alembic
+Requires-Dist: requests
+Requires-Dist: keyring
+Requires-Dist: keyrings.alt; sys_platform == "linux"
+Requires-Dist: rasterstats
+Requires-Dist: click
+Requires-Dist: setuptools>=61.0
+Requires-Dist: setuptools_scm
+Provides-Extra: optionals
+Requires-Dist: coloredlogs; extra == "optionals"
+Requires-Dist: colorama; extra == "optionals"
 
 # WeatherDB - module
 

{weatherdb-1.2.1 → weatherdb-1.2.3}/docker/docker-compose.yaml

@@ -38,11 +38,13 @@ services:
           target: /src/tests
 
   db:
-    image: postgis/postgis:16-3.4
+    image: timescale/timescaledb-ha:pg17 # about 1 minute faster for tests
+    # image: postgis/postgis:17-3.4
     environment:
       POSTGRES_DB: weatherdb
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD_FILE: /run/secrets/db_password
+    shm_size: '2g'
     ports:
       - 5454:5432
     volumes:

weatherdb-1.2.3/weatherdb/_version.py

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

{weatherdb-1.2.1 → weatherdb-1.2.3}/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.3}/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.3}/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.3}/weatherdb/station/StationBases.py

@@ -595,7 +595,7 @@ class StationBase:
             DROP TABLE IF EXISTS timeseries."{self.id}_{self._para}";
             DELETE FROM meta_{self._para} WHERE station_id={self.id};
             DELETE FROM station_ma_raster WHERE station_id={self.id} and parameter='{self._para}';
-            DELETE FROM station_ma_timeseries WHERE station_id={self.id} and parameter='{self._para}';
+            DELETE FROM station_ma_timeserie WHERE station_id={self.id} and parameter='{self._para}';
             INSERT INTO dropped_stations(station_id, parameter, why, timestamp)
             VALUES ('{self.id}', '{self._para}', '{why}', NOW())
             ON CONFLICT (station_id, parameter)

{weatherdb-1.2.1 → weatherdb-1.2.3}/weatherdb/station/StationP.py

@@ -240,8 +240,8 @@ class StationP(StationPBase):
     @db_engine.deco_create_privilege
     def _create_timeseries_table(self):
         """Create the timeseries table in the DB if it is not yet existing."""
-        sql_add_table = '''
-            CREATE TABLE IF NOT EXISTS timeseries."{stid}_{para}"  (
+        sql_add_table = f'''
+            CREATE TABLE IF NOT EXISTS timeseries."{self.id}_{self._para}"  (
                 timestamp timestamp PRIMARY KEY,
                 raw int4,
                 qn smallint,
@@ -250,7 +250,7 @@ class StationP(StationPBase):
                 filled_by int2,
                 corr int4
             );
-        '''.format(stid=self.id, para=self._para)
+        '''
         with db_engine.connect() as con:
             con.execute(sqltxt(sql_add_table))
             con.commit()

{weatherdb-1.2.1 → weatherdb-1.2.3}/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.3}/weatherdb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: weatherdb
-Version: 1.2.1
+Version: 1.2.3
 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
@@ -693,8 +693,27 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Natural Language :: English
 Requires-Python: <3.14,>=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: optionals
 License-File: LICENSE
+Requires-Dist: geopandas
+Requires-Dist: shapely>=2
+Requires-Dist: pandas
+Requires-Dist: numpy
+Requires-Dist: progressbar2
+Requires-Dist: rasterio
+Requires-Dist: sqlalchemy>2.0
+Requires-Dist: psycopg2-binary
+Requires-Dist: GeoAlchemy2
+Requires-Dist: alembic
+Requires-Dist: requests
+Requires-Dist: keyring
+Requires-Dist: keyrings.alt; sys_platform == "linux"
+Requires-Dist: rasterstats
+Requires-Dist: click
+Requires-Dist: setuptools>=61.0
+Requires-Dist: setuptools_scm
+Provides-Extra: optionals
+Requires-Dist: coloredlogs; extra == "optionals"
+Requires-Dist: colorama; extra == "optionals"
 
 # WeatherDB - module
 

weatherdb-1.2.1/weatherdb/_version.py

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