Merge branch 'main' into fix_grid3d_average_map

.github/workflows/test_scripts.yml

@@ -10,7 +10,7 @@ jobs:
   testing:
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ["3.8", "3.9", "3.10"]
         os: [ubuntu-latest]
         include:
           - os: macos-latest
@@ -19,9 +19,13 @@ jobs:
             python-version: 3.8
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
       - uses: "./.github/actions/test_setup"
         with:
           python-version: ${{ matrix.python-version }}
+
       - name: Run test
         run: python -m pytest tests/test_scripts --disable-warnings -x

pyproject.toml

@@ -1,8 +1,19 @@
-# NOTE: you have to use single-quoted strings in TOML for regular expressions.
+[build-system]
+requires = [
+  "pip>=19.1.1",
+  "setuptools>=43",
+  "wheel",
+  "setuptools_scm",
+  "Sphinx",
+  "sphinx-rtd-theme",
+]
+
+[tool.setuptools_scm]
+write_to = "src/xtgeoapp_grd3dmaps/_theversion.py"
 
 [tool.black]
 line-length = 88
-target-version = ['py36', 'py37', 'py38']
+target-version = ["py38", "py39", "py310"]
 include = '\.pyi?$'
 exclude = '''
 /(
@@ -23,13 +34,3 @@ exclude = '''
   | profiling
 )/
 '''
-
-[build-system]
-requires = [
-  "pip>=19.1.1",
-  "setuptools>=43",
-  "wheel",
-  "setuptools_scm",
-  "Sphinx",
-  "sphinx-rtd-theme",
-]

setup.py

@@ -27,12 +27,8 @@
 REQUIREMENTS_DOCS = setupx.parse_requirements("requirements/requirements_docs.txt")
 REQUIREMENTS_EXTRAS = {"tests": REQUIREMENTS_TESTS, "docs": REQUIREMENTS_DOCS}
 
-HC_FUNCTION = (
-    "grid3d_hc_thickness=xtgeoapp_grd3dmaps.avghc.grid3d_hc_thickness:main"
-)
-AVG_FUNCTION = (
-    "grid3d_average_map=xtgeoapp_grd3dmaps.avghc.grid3d_average_map:main"
-)
+HC_FUNCTION = "grid3d_hc_thickness=xtgeoapp_grd3dmaps.avghc.grid3d_hc_thickness:main"
+AVG_FUNCTION = "grid3d_average_map=xtgeoapp_grd3dmaps.avghc.grid3d_average_map:main"
 AGG_FUNCTION = (
     "grid3d_aggregate_map=xtgeoapp_grd3dmaps.aggregate.grid3d_aggregate_map:main"
 )
@@ -41,18 +37,8 @@
 )
 
 
-def src(anypath):
-    """Find src folders."""
-    return Path(__file__).parent / anypath
-
-
 setup(
     name="xtgeoapp_grd3dmaps",
-    use_scm_version={
-        # "root": src(""),
-        # "write_to": src("src/xtgeoapp_grd3dmaps/_theversion.py"),
-        "write_to": "src/xtgeoapp_grd3dmaps/_theversion.py",
-    },
     description="Make HC thickness, avg maps, etc directly from 3D props",
     long_description=readme + "\n\n" + history,
     author="Equinor R&T",

src/xtgeoapp_grd3dmaps/aggregate/grid3d_aggregate_map.py

@@ -32,7 +32,7 @@
 EXAMPLES = """
 .. code-block:: console
 
-  FORWARD_MODEL GRID3D_AGGREGATE_MAP(<CONFIG_AGGMAP>=conf.yml, <ECLROOT>=<ECLBASE>)
+  FORWARD_MODEL GRID3D_AGGREGATE_MAP(<CONFIG_AGGREGATE>=conf.yml, <ECLROOT>=<ECLBASE>)
 """