Skip to content

Commit

Permalink
Merge pull request #73 from GeoStat-Framework/1.2.0_release
Browse files Browse the repository at this point in the history
1.2.0 release
  • Loading branch information
MuellerSeb authored Mar 20, 2020
2 parents 3ae55d2 + 6d9ba59 commit a01da8e
Show file tree
Hide file tree
Showing 139 changed files with 4,221 additions and 4,026 deletions.
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ instance/

# Sphinx documentation
docs/_build/
docs/output.txt

# PyBuilder
target/
Expand Down Expand Up @@ -108,3 +109,17 @@ info/

# Cython generated C code
*.c
*.cpp


# generated docs
docs/source/examples/
docs/source/generated/


*.DS_Store

*.zip

*.vtu
*.vtr
199 changes: 81 additions & 118 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,137 +1,100 @@
language: python
python: 3.8

matrix:
include:
- name: "Linux py27"
sudo: required
language: python
python: 2.7
services: docker
env:
- PIP=pip
- CIBW_BUILD="cp27-*"
- COVER="off"
# setuptools-scm needs all tags in order to obtain a proper version
git:
depth: false

env:
global:
- TWINE_USERNAME=geostatframework
- CIBW_BEFORE_BUILD="pip install numpy==1.17.3 cython==0.29.14 setuptools"
- CIBW_TEST_REQUIRES=pytest
- CIBW_TEST_COMMAND="pytest -v {project}/tests"

- name: "Linux py34"
sudo: required
language: python
python: 3.4
before_install:
- |
if [[ "$TRAVIS_OS_NAME" = windows ]]; then
choco install python --version 3.8.0
export PATH="/c/Python38:/c/Python38/Scripts:$PATH"
# make sure it's on PATH as 'python3'
ln -s /c/Python38/python.exe /c/Python38/python3.exe
fi
script:
- python3 -m pip install cibuildwheel==1.3.0
- python3 -m cibuildwheel --output-dir dist

after_success:
- |
if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then
python3 -m pip install twine
python3 -m twine upload --verbose --skip-existing --repository-url https://test.pypi.org/legacy/ dist/*
if [[ $TRAVIS_TAG ]]; then python3 -m twine upload --verbose --skip-existing dist/*; fi
fi
notifications:
email:
recipients:
- [email protected]

jobs:
include:
- name: "sdist and coverage"
services: docker
env:
- PIP=pip
- CIBW_BUILD="cp34-*"
- COVER="off"
env: OMP_NUM_THREADS=4
script:
- python3 -m pip install -U setuptools pytest-cov coveralls
- python3 -m pip install -U numpy==1.17.3 cython==0.29.14
- python3 -m pip install -r requirements.txt
- python3 setup.py sdist -d dist
- python3 setup.py --openmp build_ext --inplace
- python3 -m pytest --cov gstools --cov-report term-missing -v tests/
- python3 -m coveralls

- name: "Linux py35"
sudo: required
language: python
python: 3.5
services: docker
env:
- PIP=pip
- CIBW_BUILD="cp35-*"
- COVER="off"

# py36 for coverage and sdist
env: CIBW_BUILD="cp35-*"
- name: "Linux py36"
sudo: required
language: python
python: 3.6
services: docker
env:
- PIP=pip
- CIBW_BUILD="cp36-*"
- COVER="on"

# https://github.com/travis-ci/travis-ci/issues/9815
env: CIBW_BUILD="cp36-*"
- name: "Linux py37"
sudo: required
language: python
python: 3.7
dist: xenial
services: docker
env:
- PIP=pip
- CIBW_BUILD="cp37-*"
- COVER="off"

- name: "MacOS py27"
os: osx
language: generic
env:
- PIP=pip2
- CIBW_BUILD="cp27-*"
- COVER="off"

- name: "MacOS py34"
os: osx
language: generic
env:
- PIP=pip2
- CIBW_BUILD="cp34-*"
- COVER="off"
env: CIBW_BUILD="cp37-*"
- name: "Linux py38"
services: docker
env: CIBW_BUILD="cp38-*"

- name: "MacOS py35"
os: osx
language: generic
env:
- PIP=pip2
- CIBW_BUILD="cp35-*"
- COVER="off"

language: shell
env: CIBW_BUILD="cp35-*"
- name: "MacOS py36"
os: osx
language: generic
env:
- PIP=pip2
- CIBW_BUILD="cp36-*"
- COVER="off"

language: shell
env: CIBW_BUILD="cp36-*"
- name: "MacOS py37"
os: osx
language: generic
env:
- PIP=pip2
- CIBW_BUILD="cp37-*"
- COVER="off"

env:
global:
- TWINE_USERNAME=geostatframework
- CIBW_BEFORE_BUILD="pip install numpy==1.14.5 cython==0.28.3"
- CIBW_TEST_REQUIRES=pytest-cov
# inplace cython build and test run
- CIBW_TEST_COMMAND="cd {project} && python setup.py build_ext --inplace && py.test --cov gstools --cov-report term-missing -v {project}/tests"

script:
# create wheels
- $PIP install cibuildwheel==0.11.1
- cibuildwheel --output-dir wheelhouse
# create source dist for pypi and create coverage (only once for linux py3.6)
- |
if [[ $COVER == "on" ]]; then
rm -rf dist
python -m pip install -U numpy==1.14.5 cython==0.28.3 setuptools
python -m pip install pytest-cov coveralls
python -m pip install -r docs/requirements.txt
python setup.py sdist
python setup.py build_ext --inplace
python -m pytest --cov gstools --cov-report term-missing -v tests/
python -m coveralls
fi
after_success:
# pypi upload ("test" allways and "official" on TAG)
- python -m pip install twine
- python -m twine upload --verbose --skip-existing --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
- python -m twine upload --verbose --skip-existing --repository-url https://test.pypi.org/legacy/ dist/*.tar.gz
- |
if [[ $TRAVIS_TAG ]]; then
python -m twine upload --verbose --skip-existing wheelhouse/*.whl
python -m twine upload --verbose --skip-existing dist/*.tar.gz
fi
language: shell
env: CIBW_BUILD="cp37-*"
- name: "MacOS py38"
os: osx
language: shell
env: CIBW_BUILD="cp38-*"

notifications:
email:
recipients:
- [email protected]
- name: "Win py35"
os: windows
language: shell
env: CIBW_BUILD="cp35-*"
- name: "Win py36"
os: windows
language: shell
env: CIBW_BUILD="cp36-*"
- name: "Win py37"
os: windows
language: shell
env: CIBW_BUILD="cp37-*"
- name: "Win py38"
os: windows
language: shell
env: CIBW_BUILD="cp38-*"
49 changes: 49 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"license": "LGPL-3.0+",
"contributors": [
{
"type": "Other",
"name": "Bane Sullivan"
},
{
"orcid": "0000-0002-2547-8102",
"affiliation": "Helmholtz Centre for Environmental Research - UFZ",
"type": "ResearchGroup",
"name": "Falk He\u00dfe"
},
{
"orcid": "0000-0002-8783-6198",
"affiliation": "Hydrogeology Group, Department of Earth Science, Utrecht University, Netherlands",
"type": "ResearchGroup",
"name": "Alraune Zech"
},
{
"orcid": "0000-0002-7798-7080",
"affiliation": "Helmholtz Centre for Environmental Research - UFZ",
"type": "Supervisor",
"name": "Sabine Attinger"
}
],
"language": "eng",
"keywords": [
"geostatistics",
"kriging",
"random fields",
"covariance models",
"variogram",
"Python",
"GeoStat-Framework"
],
"creators": [
{
"orcid": "0000-0001-9060-4008",
"affiliation": "Helmholtz Centre for Environmental Research - UFZ",
"name": "Sebastian M\u00fcller"
},
{
"orcid": "0000-0001-9362-1372",
"affiliation": "Helmholtz Centre for Environmental Research - UFZ",
"name": "Lennart Sch\u00fcler"
}
]
}
22 changes: 20 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,30 @@
All notable changes to **GSTools** will be documented in this file.


## [Unreleased]
## [1.2.0] - Volatile Violet - 2020-03-20

### Enhancements
- different variogram estimator functions can now be used #51
- the TPLGaussian and TPLExponential now have analytical spectra #67
- added property ``is_isotropic`` to CovModel #67
- reworked the whole krige sub-module to provide multiple kriging methods #67
- Simple
- Ordinary
- Universal
- External Drift Kriging
- Detrended Kriging
- a new transformation function for discrete fields has been added #70
- reworked tutorial section in the documentation #63
- pyvista interface #29

### Changes
- Python versions 2.7 and 3.4 are no longer supported #40 #43
- CovModel: in 3D the input of anisotropy is now treated slightly different: #67
- single given anisotropy value [e] is converted to [1, e] (it was [e, e] before)
- two given length-scales [l_1, l_2] are converted to [l_1, l_2, l_2] (it was [l_1, l_2, l_1] before)

### Bugfixes
- a race condition in the structured variogram estimation has been fixed #51


## [1.1.1] - Reverberating Red - 2019-11-08
Expand Down Expand Up @@ -97,7 +114,8 @@ All notable changes to **GSTools** will be documented in this file.
First release of GSTools.


[Unreleased]: https://github.com/GeoStat-Framework/gstools/compare/v1.1.1...HEAD
[Unreleased]: https://github.com/GeoStat-Framework/gstools/compare/v1.2.0...HEAD
[1.2.0]: https://github.com/GeoStat-Framework/gstools/compare/v1.1.1...v1.2.0
[1.1.1]: https://github.com/GeoStat-Framework/gstools/compare/v1.1.0...v1.1.1
[1.1.0]: https://github.com/GeoStat-Framework/gstools/compare/v1.0.1...v1.1.0
[1.0.1]: https://github.com/GeoStat-Framework/gstools/compare/v1.0.0...v1.0.1
Expand Down
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@ print(gstools.__version__)

Open a [new issue](https://github.com/GeoStat-Framework/GSTools/issues)
with your idea or suggestion and we'd love to discuss about it.


## Do you want to enhance GSTools or fix something?

- Fork the repo on [GitHub](https://github.com/GeoStat-Framework/GSTools) from the [develop branch](https://github.com/GeoStat-Framework/GSTools/tree/develop).
- Add yourself to AUTHORS.md (if you want to).
- We use the black code format, please use the script `black --line-length 79 gstools/` after you have written your code.
- Add some tests if possible.
- Add an example showing your new feature in one of the examples sub-folders if possible.
Follow this [Sphinx-Gallary guide](https://sphinx-gallery.github.io/stable/syntax.html#embed-rst-in-your-example-python-files)
- Push to your fork and submit a pull request.
Loading

0 comments on commit a01da8e

Please sign in to comment.