From d4233e7f297d72ebf8dd926bfec9d8f0c940e797 Mon Sep 17 00:00:00 2001 From: Ludwig Lierhammer Date: Thu, 20 Jun 2024 12:17:12 +0200 Subject: [PATCH 1/4] adding security policy skeleton --- SECURITY.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100755 index 00000000..fd95931c --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,11 @@ +# Security Policy + +## Supported Versions + +In the event of a security-related bug discovery soon after the release of an `cdm_reader_mapper` version, the last supported version will receive a patch release. + +## Reporting a Vulnerability + +If you believe you have found a security vulnerability in `cdm_reader_mapper`, we encourage you to let us know right away. We take all security vulnerabilities seriously and appreciate your efforts to responsibly disclose them. + +??? From 2cbe454df2005d15a96a589f2fd3ba4d746b126f Mon Sep 17 00:00:00 2001 From: Ludwig Lierhammer Date: Thu, 20 Jun 2024 12:17:32 +0200 Subject: [PATCH 2/4] add security policy to documentation --- docs/index.rst | 3 ++- docs/security.rst | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100755 docs/security.rst diff --git a/docs/index.rst b/docs/index.rst index 19cfe6f3..43f0d9b1 100755 --- a/docs/index.rst +++ b/docs/index.rst @@ -55,10 +55,11 @@ Several data models have been added to the tool including the IMMA schema: cdm-tables-mapping-files-and-descriptors.rst example_notebooks/CLIWOC_datamodel.ipynb example_notebooks/CDM_mapper_example_deck704.ipynb + api contributing authors - api changes + security About diff --git a/docs/security.rst b/docs/security.rst new file mode 100755 index 00000000..f9a52196 --- /dev/null +++ b/docs/security.rst @@ -0,0 +1 @@ +.. mdinclude:: ../SECURITY.md From dfafdb977adbad7eb0a7402a56b4e04bd37b7804 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 10:18:56 +0000 Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 0506ee17..4059b67f 100755 --- a/README.rst +++ b/README.rst @@ -113,7 +113,7 @@ If you would like to contribute code or documentation (which is greatly apprecia Credits ------- -``cdm_reader_mapper`` development is funded through Copernicus Climate Change Service (C3S_). +``cdm_reader_mapper`` development is funded through Copernicus Climate Change Service (C3S_). Furthermore, acknowledgments go to National Oceanography Centre (NOC_) nad UK Marine and Climate Advisory Service (UKMCAS_). From 2c154cf8b317719b03ff1f36c390f46a092a432d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 08:31:02 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- cdm_reader_mapper/__init__.py | 1 + cdm_reader_mapper/cdm_mapper/__init__.py | 1 + cdm_reader_mapper/cdm_mapper/codes/codes_hdlr.py | 1 + cdm_reader_mapper/cdm_mapper/mapper.py | 1 + cdm_reader_mapper/cdm_mapper/mappings.py | 1 + cdm_reader_mapper/common/getting_files.py | 1 + cdm_reader_mapper/mdf_reader/schema/schemas.py | 6 +++--- cdm_reader_mapper/mdf_reader/utils/__init__.py | 1 + cdm_reader_mapper/metmetpy/__init__.py | 1 + cdm_reader_mapper/metmetpy/datetime/validate.py | 1 + cdm_reader_mapper/metmetpy/platform_type/correct.py | 1 + cdm_reader_mapper/metmetpy/platform_type/gdac_r0000.py | 1 - cdm_reader_mapper/metmetpy/properties.py | 1 + cdm_reader_mapper/operations/__init__.py | 1 + cdm_reader_mapper/operations/corrections.py | 1 + cdm_reader_mapper/operations/replace.py | 1 - tests/_data.py | 1 + tests/_results.py | 1 + 18 files changed, 18 insertions(+), 5 deletions(-) diff --git a/cdm_reader_mapper/__init__.py b/cdm_reader_mapper/__init__.py index b63a623f..25aeade5 100755 --- a/cdm_reader_mapper/__init__.py +++ b/cdm_reader_mapper/__init__.py @@ -1,4 +1,5 @@ """Common Data Model (CDM) reader and mapper package.""" + from __future__ import annotations from . import cdm_mapper # noqa diff --git a/cdm_reader_mapper/cdm_mapper/__init__.py b/cdm_reader_mapper/cdm_mapper/__init__.py index b9bc36ca..41c351ed 100755 --- a/cdm_reader_mapper/cdm_mapper/__init__.py +++ b/cdm_reader_mapper/cdm_mapper/__init__.py @@ -1,4 +1,5 @@ """Cliamte Data Model (CDM) mapper package.""" + from __future__ import annotations from .mapper import map_model # noqa diff --git a/cdm_reader_mapper/cdm_mapper/codes/codes_hdlr.py b/cdm_reader_mapper/cdm_mapper/codes/codes_hdlr.py index 11e6a230..453dc0f3 100755 --- a/cdm_reader_mapper/cdm_mapper/codes/codes_hdlr.py +++ b/cdm_reader_mapper/cdm_mapper/codes/codes_hdlr.py @@ -6,6 +6,7 @@ @author: iregon """ + from __future__ import annotations import datetime diff --git a/cdm_reader_mapper/cdm_mapper/mapper.py b/cdm_reader_mapper/cdm_mapper/mapper.py index 6da1a174..2fec7aeb 100755 --- a/cdm_reader_mapper/cdm_mapper/mapper.py +++ b/cdm_reader_mapper/cdm_mapper/mapper.py @@ -10,6 +10,7 @@ @author: iregon """ + from __future__ import annotations from io import StringIO diff --git a/cdm_reader_mapper/cdm_mapper/mappings.py b/cdm_reader_mapper/cdm_mapper/mappings.py index 2bddcffb..fc3dfbca 100755 --- a/cdm_reader_mapper/cdm_mapper/mappings.py +++ b/cdm_reader_mapper/cdm_mapper/mappings.py @@ -21,6 +21,7 @@ @author: iregon """ + from __future__ import annotations import datetime diff --git a/cdm_reader_mapper/common/getting_files.py b/cdm_reader_mapper/common/getting_files.py index 38c8dd5f..bde71483 100755 --- a/cdm_reader_mapper/common/getting_files.py +++ b/cdm_reader_mapper/common/getting_files.py @@ -1,4 +1,5 @@ """pandas local file operator.""" + from __future__ import annotations import hashlib diff --git a/cdm_reader_mapper/mdf_reader/schema/schemas.py b/cdm_reader_mapper/mdf_reader/schema/schemas.py index 01c1d186..5e301608 100755 --- a/cdm_reader_mapper/mdf_reader/schema/schemas.py +++ b/cdm_reader_mapper/mdf_reader/schema/schemas.py @@ -48,9 +48,9 @@ def _read_schema(schema, schema_file=""): "header" ].get("delimiter") schema["header"].pop("delimiter", None) - schema["sections"][properties.dummy_level]["header"][ - "field_layout" - ] = schema["header"].get("field_layout") + schema["sections"][properties.dummy_level]["header"]["field_layout"] = ( + schema["header"].get("field_layout") + ) schema["header"].pop("field_layout", None) schema["sections"][properties.dummy_level]["header"]["format"] = schema[ "header" diff --git a/cdm_reader_mapper/mdf_reader/utils/__init__.py b/cdm_reader_mapper/mdf_reader/utils/__init__.py index 3f42c703..015b78b8 100755 --- a/cdm_reader_mapper/mdf_reader/utils/__init__.py +++ b/cdm_reader_mapper/mdf_reader/utils/__init__.py @@ -1,4 +1,5 @@ """Common Data Model (CDM) reader utilities.""" + from __future__ import annotations from .converters import converters # noqa diff --git a/cdm_reader_mapper/metmetpy/__init__.py b/cdm_reader_mapper/metmetpy/__init__.py index 7413d296..6e32be1b 100755 --- a/cdm_reader_mapper/metmetpy/__init__.py +++ b/cdm_reader_mapper/metmetpy/__init__.py @@ -1,4 +1,5 @@ """metmetpy information package.""" + from __future__ import annotations from . import properties # noqa diff --git a/cdm_reader_mapper/metmetpy/datetime/validate.py b/cdm_reader_mapper/metmetpy/datetime/validate.py index 7f9c10d5..e32aabcc 100755 --- a/cdm_reader_mapper/metmetpy/datetime/validate.py +++ b/cdm_reader_mapper/metmetpy/datetime/validate.py @@ -29,6 +29,7 @@ @author: iregon """ + from __future__ import annotations import pandas as pd diff --git a/cdm_reader_mapper/metmetpy/platform_type/correct.py b/cdm_reader_mapper/metmetpy/platform_type/correct.py index b2438745..2e66df7b 100755 --- a/cdm_reader_mapper/metmetpy/platform_type/correct.py +++ b/cdm_reader_mapper/metmetpy/platform_type/correct.py @@ -36,6 +36,7 @@ @author: iregon """ + from __future__ import annotations import json diff --git a/cdm_reader_mapper/metmetpy/platform_type/gdac_r0000.py b/cdm_reader_mapper/metmetpy/platform_type/gdac_r0000.py index 6a946a07..9c55f67e 100755 --- a/cdm_reader_mapper/metmetpy/platform_type/gdac_r0000.py +++ b/cdm_reader_mapper/metmetpy/platform_type/gdac_r0000.py @@ -6,7 +6,6 @@ @author: sbiri """ - from __future__ import annotations import numpy as np diff --git a/cdm_reader_mapper/metmetpy/properties.py b/cdm_reader_mapper/metmetpy/properties.py index 09110221..4e2f2699 100755 --- a/cdm_reader_mapper/metmetpy/properties.py +++ b/cdm_reader_mapper/metmetpy/properties.py @@ -5,6 +5,7 @@ @author: iregon """ + _base = "cdm_reader_mapper.metmetpy" metadata_datamodels = {} diff --git a/cdm_reader_mapper/operations/__init__.py b/cdm_reader_mapper/operations/__init__.py index 7b378224..a06d4606 100755 --- a/cdm_reader_mapper/operations/__init__.py +++ b/cdm_reader_mapper/operations/__init__.py @@ -1,4 +1,5 @@ """Common Data Model (CDM) pandas operators.""" + from __future__ import annotations from . import corrections # noqa diff --git a/cdm_reader_mapper/operations/corrections.py b/cdm_reader_mapper/operations/corrections.py index 88f2c547..0cf05494 100755 --- a/cdm_reader_mapper/operations/corrections.py +++ b/cdm_reader_mapper/operations/corrections.py @@ -5,6 +5,7 @@ @author: sbiri """ + from __future__ import annotations import logging diff --git a/cdm_reader_mapper/operations/replace.py b/cdm_reader_mapper/operations/replace.py index 221b5360..fffec9e9 100755 --- a/cdm_reader_mapper/operations/replace.py +++ b/cdm_reader_mapper/operations/replace.py @@ -17,7 +17,6 @@ @author: iregon """ - from __future__ import annotations import pandas as pd diff --git a/tests/_data.py b/tests/_data.py index 6eb1cb3a..a603ddb9 100755 --- a/tests/_data.py +++ b/tests/_data.py @@ -1,4 +1,5 @@ """cdm_reader_mapper testing suite result files.""" + from __future__ import annotations import pytest # noqa diff --git a/tests/_results.py b/tests/_results.py index f16e4f5c..8876d8f8 100755 --- a/tests/_results.py +++ b/tests/_results.py @@ -1,4 +1,5 @@ """cdm_reader_mapper testing suite result files.""" + from __future__ import annotations import os