Merge pull request #187 from GeoStat-Framework/develop

Release: v1.6

Author: MuellerSeb

.github/workflows/main.yml

@@ -0,0 +1,132 @@
+name: Continuous Integration
+
+on:
+  push:
+    branches:
+      - "master"
+      - "develop"
+    tags:
+      - "*"
+  pull_request:
+    branches:
+      - "develop"
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  format_check:
+    name: format check
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python 3.8
+        uses: actions\setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install black
+
+      - name: black check
+        run: |
+          python -m black --check pykrige/ examples/ tests/
+
+  build_sdist:
+    name: sdist and coveralls
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+
+      - name: Set up Python 3.8
+        uses: actions\setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements_setup.txt
+          pip install -r requirements.txt
+          pip install -r requirements_test.txt
+          pip install coveralls>=3.0.0
+
+      - name: Build sdist
+        run: |
+          python setup.py sdist -d dist
+          python setup.py build_ext --inplace
+
+      - name: Run tests
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          python -m pytest --cov pykrige --cov-report term-missing -v tests/
+          python -m coveralls --service=github
+
+      - uses: actions/upload-artifact@v2
+        with:
+          path: dist/*.tar.gz
+
+  build_wheels:
+    name: wheels on ${{matrix.os}}
+    runs-on: ${{matrix.os}}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+
+      - name: Build wheels
+        uses: joerick/cibuildwheel@v1.10.0
+        env:
+          CIBW_BUILD: cp36-* cp37-* cp38-* cp39-*
+          CIBW_BEFORE_BUILD: pip install numpy==1.19.* scipy==1.5.* cython==0.29.* setuptools
+          CIBW_TEST_REQUIRES: pytest scikit-learn
+          CIBW_TEST_COMMAND: pytest -v {project}/tests
+        with:
+          output-dir: dist
+
+      - uses: actions/upload-artifact@v2
+        with:
+          path: ./dist/*.whl
+
+  upload_to_pypi:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: artifact
+          path: dist
+
+      - name: Publish to Test PyPI
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop'
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.test_pypi_password }}
+          repository_url: https://test.pypi.org/legacy/
+          skip_existing: true
+
+      - name: Publish to PyPI
+        # only if tagged
+        if: startsWith(github.ref, 'refs/tags')
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.pypi_password }}

.travis.yml

@@ -28,6 +28,10 @@
         {
             "type": "Other",
             "name": "Daniel Mej\u00eda Raigosa"
+        },
+        {
+            "type": "Other",
+            "name": "Marcelo Albuquerque"
         }
     ],
     "language": "eng",
@@ -37,6 +41,7 @@
         "universal kriging",
         "external drift kriging",
         "regression kriging",
+        "classification kriging",
         "variogram",
         "geostatistics",
         "Python",

.zenodo.json

@@ -2,6 +2,23 @@ Changelog
 =========
 
 
+Version 1.6.0
+-------------
+*April 04, 2021*
+
+**New features**
+
+* added Classification Kriging ([#165](https://github.com/GeoStat-Framework/PyKrige/pull/165), [#184](https://github.com/GeoStat-Framework/PyKrige/pull/184))
+* added wheels for Python 3.9 ([#175](https://github.com/GeoStat-Framework/PyKrige/pull/175))
+
+**Changes**
+
+* moved scikit-learn compat-class `Krige` to `pykrige.compat` ([#165](https://github.com/GeoStat-Framework/PyKrige/pull/165))
+* dropped Python 3.5 support ([#183](https://github.com/GeoStat-Framework/PyKrige/pull/183))
+* moved CI to GitHub-Actions ([#175](https://github.com/GeoStat-Framework/PyKrige/pull/175), [#183](https://github.com/GeoStat-Framework/PyKrige/pull/183))
+* Fixed Typo in `02_kriging3D.py` example ([#182](https://github.com/GeoStat-Framework/PyKrige/pull/182))
+
+
 Version 1.5.1
 -------------
 *August 20, 2020*