Release 0.2.1 (#23)

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
         os: [ubuntu-22.04, windows-2022, macos-11]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up QEMU
         if: runner.os == 'Linux'
@@ -55,25 +55,25 @@ jobs:
           bash scripts/build_lib.sh
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.15.0
+        uses: pypa/cibuildwheel@v2.16.2
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: pypestutils
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build sdist
         run: pipx run build --sdist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: pypestutils
+          name: cibw-sdist
           path: dist/*.tar.gz
 
   upload_pypi:
@@ -86,13 +86,12 @@ jobs:
     # or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this)
     # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          # unpacks default artifact into dist/
-          name: pypestutils
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
           path: dist
+          merge-multiple: true
 
-      - uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          # To test: repository_url: https://test.pypi.org/legacy/
-          repository_url: https://test.pypi.org/legacy/
+      - name: Publish package to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/tests.yml

@@ -17,10 +17,10 @@ jobs:
         python-version: ["3.8", "3.11"]  # run lower and upper versions
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

CHANGELOG.md

@@ -1,10 +1,16 @@
 # ChangeLog
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.2.1] - 2024-01-23
+### Fixed
+- Fix AttributeError: 'DataFrame' object has no attribute 'site' (#21)
+- Fix finder.load() for conda and LD path search
+
+### Changed
+- Aniso default to 1 in non hyperpar pp interp (#19)
 
 ## [0.2.0] - 2023-10-27
 ### Added
@@ -19,6 +25,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial pre-alpha release
 
-[Unreleased]: https://github.com/pypest/pypestutils/compare/v0.2.0...develop
+[0.2.1]: https://github.com/pypest/pypestutils/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/pypest/pypestutils/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/pypest/pypestutils/releases/tag/v0.1.0

docs/pestutilslib/fortran_library_documentation.md

@@ -1005,7 +1005,7 @@ Function *uninstall_structured_grid()* returns a value of zero unless an error c
 
 ### Description
 
-The task performed by function *calc_kriging_factors_2d()* resembles that performed by a PLPROC function of the same name. As the name suggests, this function calculates kriging factors. More accurately, it calls modified functions of the SGLIB library (Deutsch and Journel, 1998) to calcite kriging factors. These factors will often be used to implement spatial interpolation from pilot points to a model grid. However function *calc_kriging_factors_2d()* makes no mention of either pilot points nor a model grid. The set of points to which spatial interpolation takes place are specified only by their coordinates. These can be the centres of cells of a structured or unstructured model grid. Alternatively, they may have no relationship to a model grid whatsoever.
+The task performed by function *calc_kriging_factors_2d()* resembles that performed by a PLPROC function of the same name. As the name suggests, this function calculates kriging factors. More accurately, it calls modified functions of the GSLIB library (Deutsch and Journel, 1998) to calculate kriging factors. These factors will often be used to implement spatial interpolation from pilot points to a model grid. However function *calc_kriging_factors_2d()* makes no mention of either pilot points nor a model grid. The set of points to which spatial interpolation takes place are specified only by their coordinates. These can be the centres of cells of a structured or unstructured model grid. Alternatively, they may have no relationship to a model grid whatsoever.
 
 Other features of *calc_kriging_factors_2d* include the following:
 

examples/exploring_lowlevel_pypestutils_functions.ipynb

@@ -260,6 +260,17 @@
     "hdsdf"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "4ae6b876-8232-4dea-92cf-91aaf6448a74",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "mtop = m.dis.top.array\n",
+    "mtop[mtop<-100] = np.nan"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -272,7 +283,7 @@
     "    ax.set_aspect(\"equal\")\n",
     "    kdf = hdsdf.loc[hdsdf.layer==lay,:]\n",
     "    assert kdf.shape[0] > 0\n",
-    "    ax.pcolormesh(Easting,Northing,m.dis.top.array)\n",
+    "    ax.pcolormesh(Easting,Northing,mtop)\n",
     "    ax.scatter(kdf.x,kdf.y,marker=\"^\",c=\"k\",label=\"gw level loc\")\n",
     "    ax.legend(loc=\"upper left\")\n",
     "    ax.set_title(\"gw level locations in layer {0}\".format(lay),loc=\"left\")\n"
@@ -806,6 +817,14 @@
     "ax.pcolormesh(Easting,Northing,id_mask)\n",
     "ax.scatter(ppeasting,ppnorthing,marker=\".\",s=50,c=ppval)\n"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "25bbd45c-bbcb-425b-bf84-7f518acb7a78",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

examples/exploring_pypestutils_helpers.ipynb

@@ -191,7 +191,7 @@
     "    iidf = idf.loc[idf.site==site,:]\n",
     "    iidf.loc[iidf.simulated>1e29,\"simulated\"] = np.nan\n",
     "    fig,ax = plt.subplots(1,1,figsize=(8,5))\n",
-    "    ax.plot(aadf.index,aadf.values,\"0.5\",lw=0.5,label=\"all sim times\")\n",
+    "    ax.plot(aadf.index,aadf.values,\"0.5\",lw=0.5,marker=\"o\",mfc='none',label=\"all sim times\")\n",
     "    ax.scatter(iidf.datetime,iidf.obsval,marker=\"^\",c=\"r\",label=\"observed\")\n",
     "    ax.scatter(iidf.datetime,iidf.simulated,marker=\"^\",c=\"0.5\",label=\"interp to obs\")\n",
     "    ax.set_title(site,loc=\"left\")\n",