weatherdb 1.2.1__py3-none-any.whl → 1.2.3__py3-none-any.whl

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/_version.py

@@ -1 +1 @@
-__version__ = "1.2.1"
+__version__ = "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/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/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/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/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/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.dist-info → weatherdb-1.2.3.dist-info}/METADATA

@@ -1,9 +1,9 @@
-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
+License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
         
          Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
@@ -706,11 +706,11 @@ 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
-Requires-Dist: keyrings.alt; sys_platform == "linux"
+Requires-Dist: setuptools_scm
 Provides-Extra: optionals
 Requires-Dist: coloredlogs; extra == "optionals"
 Requires-Dist: colorama; extra == "optionals"

{weatherdb-1.2.1.dist-info → weatherdb-1.2.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 docker/Dockerfile,sha256=AmSjZsQHA3-XANZz8RiH0B5skIlF7MXCNiy8yIzZXr4,1051
-docker/docker-compose.yaml,sha256=ezHqCUib83b5cbfbSy0fsrg0xl2iufp6diItsctJbRM,1719
+docker/docker-compose.yaml,sha256=tnQoCLZk1VryR4i1x7TfV8B4nODGoD1Qaf6CWoj6hOs,1815
 docker/docker-compose_test.yaml,sha256=LTCehPG6Oid-ri7kcPBMzXzeJBqYC-zXTs_i6XOkSyQ,931
 docker/start-docker-test.sh,sha256=8ue4LfoUrZU8inEZhNjsSDqucoN73Kn1cC3--lUPqTo,222
 docs/requirements.txt,sha256=gVqMWeiE0PAEz41NGrLwgzx1WUGuEIE7sfPLkFV4vU4,141
@@ -44,9 +44,9 @@ tests/test-data/regionalisation/DWD-grid_ma_1991_2020_DGM25_clipped.tif,sha256=8
 tests/test-data/regionalisation/HYRAS_ma_1991_2020_DGM25_clipped.tif,sha256=HiSmi715dUpryQ1WSLSXR7GmGPHzK0rl6WOOrwjRwXw,2116377
 tests/test-data/regionalisation/README.md,sha256=equFOPJVaESGKIK1ZPVEJHY4TEqkW3NpJOFQzjsBy7M,151
 weatherdb/__init__.py,sha256=2BzziScTYzA65WS6nhtCRZOWSLfwHTCwvZdeyuHw79U,846
-weatherdb/_version.py,sha256=aFv1WGaOhOg9bRuL25OuA7ozD3PSckRRpjaC84FZ7uo,21
+weatherdb/_version.py,sha256=U41WxbUOaQODXvEF16YxLPUtPZSDo9xzI0NA0DgmjLs,21
 weatherdb/broker.py,sha256=qJaKVwo1zcTLKmP-sF_DMod6_7jVsdHEoiKEMvsPx9A,24842
-weatherdb/cli.py,sha256=oZFQVteBjxI1tEK37CEO-8mJd9PQ7I-rHEI-kIl4T_A,11295
+weatherdb/cli.py,sha256=b5p9SRP5aqQ3w89MLErAjFj37aZMy9OsF23nCDC8NJY,11358
 weatherdb/alembic/README.md,sha256=6hq24TPr8z3nqJCaqrmj6__kLikVG66kLGqfC_aFPWQ,440
 weatherdb/alembic/alembic.ini,sha256=Mc3-qkQfA42ApX9douZT77g1pWE9gn4oMVJEDoebmdQ,3087
 weatherdb/alembic/config.py,sha256=Q4aolMUUT7f6VmbY0uz_dWBtKkj3KgTUs_xOY_Gbzjw,264
@@ -56,7 +56,7 @@ weatherdb/alembic/versions/V1.0.0_initial_database_creation.py,sha256=Ztj21xNdJc
 weatherdb/alembic/versions/V1.0.2_more_charachters_for_settings+term_station_ma_raster.py,sha256=jrnBpgUxjaBt1oUFJb0PeTZ4L5hEDh9K8ncF33cLdQE,3738
 weatherdb/alembic/versions/V1.0.5_fix-ma-raster-values.py,sha256=EvJ_JLLJKUN5YXwWZdS1FHK2oHjhIlayvjtJuoK3eCI,6957
 weatherdb/alembic/versions/V1.0.6_update-views.py,sha256=ZA7cK5yeAqivFG2V8O7mvyKSkGRlphVOs0qKpBYgYKE,420
-weatherdb/config/ConfigParser.py,sha256=UEJlpeZSggG93C3MjpaNGpqKe_Ks6Jg6g5CjnhKCrpY,27978
+weatherdb/config/ConfigParser.py,sha256=-ubnKwzUR9ryrPI_6aYULmyyaNzz4-TylPgHs3yoq4I,28403
 weatherdb/config/__init__.py,sha256=JBNlYPT43JnO8XMI8HTtg2hyA7C_JnMdtWmJ2vAtNZ8,85
 weatherdb/config/config_default.ini,sha256=5DQzOqOJ9EVRAu9IA_EO4c8aqnuUvTmocwidOhLLXbY,7884
 weatherdb/db/__init__.py,sha256=g6F66XR6UPz41kPtSRc1qvDoOEZ5OawYxYtYXCgZ06s,76
@@ -65,15 +65,15 @@ weatherdb/db/models.py,sha256=6Oor07T1sAD6qEtoxwEcpmY1SkLVVONChXIIcTjbUk4,15242
 weatherdb/db/views.py,sha256=DxY_IIonmiiRM-IhQrUMLwj12gIg6Q30rQAmR3wP3BE,6359
 weatherdb/db/fixtures/RichterParameters.json,sha256=CKxrB5FBX_BRKqxegXNyNtn9DUKmgibUtdvHoE8E5JI,836
 weatherdb/db/queries/get_quotient.py,sha256=9wVFmXE8tk8igGj-Xk5uSI0eiF_PQ9d-yRq7RJpvMAA,6787
-weatherdb/station/GroupStation.py,sha256=XAovs-zK5mZmJuvNJ3iCgpWH-1yWHL0axtygYu1mVi0,30292
-weatherdb/station/StationBases.py,sha256=1XylC_k2ZCSJf3-xs4SBE-JSfwrlZWzn1N154S0KzgU,130330
+weatherdb/station/GroupStation.py,sha256=mLDZIQ2fAxSQs_zQl1cFJgOHizVlTyUG1uoEzm6uYqo,30292
+weatherdb/station/StationBases.py,sha256=0OwEl85220DI6MIffjf4KpS4UA5zCR4yE2DNzydOlKE,130329
 weatherdb/station/StationET.py,sha256=hM6K8fCLC6mOLaE4cN92LHOyPGP01ifO6l2qO77I_bA,3621
-weatherdb/station/StationP.py,sha256=ENmWqEFwKR1WFsWmZ8-webEGTmrxODan8QO0gwIDDIU,32719
+weatherdb/station/StationP.py,sha256=w_0l5cw8zTACIbmVFV4cdPwxuyP2Cnv97dnNrMElBDE,32691
 weatherdb/station/StationPD.py,sha256=Bcg_uQTgIQPffsMGhNEwKAXhYs1Ii4VeB75afdFG-Kk,3367
 weatherdb/station/StationT.py,sha256=-T1GKfUsvulm5c_-JufJ34H048fGlG21UF0_2z1dd9A,6012
 weatherdb/station/__init__.py,sha256=v1sPfmhhLRMOr5DJ2c5BLIFY7GWkP5iMLA5vtZm-osg,591
 weatherdb/station/constants.py,sha256=vtdhgcK8A2cJaknT6qI8w5tAh_Hb5i2SvxxtHZOPyVc,511
-weatherdb/stations/GroupStations.py,sha256=442gPqx0lKcOaqThffNIhJqrmDMI37DX1d_EHsfJzvM,21569
+weatherdb/stations/GroupStations.py,sha256=5Xc5lW_crJdzMwldpbyalIFYbyQm2BPiGbl-VrXZZh8,21569
 weatherdb/stations/StationsBase.py,sha256=M7VyWJgUmIygJ2rByQy0Zz6RKsaDVT8-iaXzhPTa_b4,42991
 weatherdb/stations/StationsBaseTET.py,sha256=CuE5gXAF4eS4bHorI-sUqksm0jdj9SzAiOHtc4vv7aA,1032
 weatherdb/stations/StationsET.py,sha256=OjyEaEK0nPJ9txRfUbHfW9bEEx5HAISWmnk5F4GBs7I,433
@@ -87,9 +87,9 @@ weatherdb/utils/dwd.py,sha256=amEVVPLzXTSScBP5VAK35dBxuiy-Ua4hHyKnDGxD_4Q,12394
 weatherdb/utils/geometry.py,sha256=Od-RDAW1MASVAsGBXpHti9osbVJDqUbumSKBSJPbQqc,1823
 weatherdb/utils/get_data.py,sha256=62wV37fuzGhC2fLSCL7JyyMd3BAiRiimIhV95-mEROU,17294
 weatherdb/utils/logging.py,sha256=iaWnzCdBYxFmzWgLq9a6VAeBMdwy-rnt2d9PSAQq4lA,4242
-weatherdb-1.2.1.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-weatherdb-1.2.1.dist-info/METADATA,sha256=5auMHq9HFkOsckfAF-JKxImQ3v-a93_lm023SiGsTMk,44266
-weatherdb-1.2.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-weatherdb-1.2.1.dist-info/entry_points.txt,sha256=kJemTd9Cm_QWPZt03KUWhpn1aB0-l_5ce6Ms3EoS_NM,55
-weatherdb-1.2.1.dist-info/top_level.txt,sha256=kLlRbXLn0GHvMWmciWRyvm0-FYEy56F6d0fGwfle9-g,28
-weatherdb-1.2.1.dist-info/RECORD,,
+weatherdb-1.2.3.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+weatherdb-1.2.3.dist-info/METADATA,sha256=Jza3CvJAIPtiQvlVeBM_NyRmw5XbjxUgFIZucFwaDIo,44286
+weatherdb-1.2.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+weatherdb-1.2.3.dist-info/entry_points.txt,sha256=kJemTd9Cm_QWPZt03KUWhpn1aB0-l_5ce6Ms3EoS_NM,55
+weatherdb-1.2.3.dist-info/top_level.txt,sha256=kLlRbXLn0GHvMWmciWRyvm0-FYEy56F6d0fGwfle9-g,28
+weatherdb-1.2.3.dist-info/RECORD,,

{weatherdb-1.2.1.dist-info → weatherdb-1.2.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.1)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any