Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI update: provide Python 3.9 wheels #107

Merged
merged 5 commits into from
Nov 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,19 @@ before_install:
fi

script:
- python3 -m pip install cibuildwheel==1.3.0
- python3 -m pip install cibuildwheel==1.6.4
- python3 -m cibuildwheel --output-dir dist

after_success:
- |
if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then
if [[ $TRAVIS_PULL_REQUEST == "false" && ( $TRAVIS_BRANCH == "master" || $TRAVIS_BRANCH == "develop" ) ]]; 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
- |
if [[ $TRAVIS_TAG ]]; then
python3 -m pip install twine
python3 -m twine upload --verbose --skip-existing dist/*
fi

notifications:
Expand Down Expand Up @@ -68,6 +72,9 @@ jobs:
- name: "Linux py38"
services: docker
env: CIBW_BUILD="cp38-*"
- name: "Linux py39"
services: docker
env: CIBW_BUILD="cp39-*"

- name: "MacOS py35"
os: osx
Expand All @@ -85,6 +92,10 @@ jobs:
os: osx
language: shell
env: CIBW_BUILD="cp38-*"
- name: "MacOS py39"
os: osx
language: shell
env: CIBW_BUILD="cp39-*"

- name: "Win py35"
os: windows
Expand All @@ -102,3 +113,7 @@ jobs:
os: windows
language: shell
env: CIBW_BUILD="cp38-*"
- name: "Win py39"
os: windows
language: shell
env: CIBW_BUILD="cp39-*"
4 changes: 1 addition & 3 deletions gstools/covmodel/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1219,9 +1219,7 @@ def name(self):
@property
def do_rotation(self):
""":any:`bool`: State if a rotation is performed."""
return (
not np.all(np.isclose(self.angles, 0.0))
)
return not np.all(np.isclose(self.angles, 0.0))

@property
def is_isotropic(self):
Expand Down
8 changes: 5 additions & 3 deletions gstools/krige/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -511,13 +511,13 @@ def cond_val(self):
@property
def cond_err(self):
""":class:`list`: The measurement errors at the condition points."""
if self._cond_err == "nugget":
if isinstance(self._cond_err, str) and self._cond_err == "nugget":
return self.model.nugget
return self._cond_err

@cond_err.setter
def cond_err(self, value):
if value == "nugget":
if isinstance(value, str) and value == "nugget":
self._cond_err = value
else:
if self.exact:
Expand Down Expand Up @@ -634,7 +634,9 @@ def __repr__(self):
"""Return String representation."""
return (
"{0}(model={1}, cond_no={2}".format(
self.name, self.model.name, self.cond_no,
self.name,
self.model.name,
self.cond_no,
)
+ ")"
)
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ class MPDistribution(Distribution):
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3 :: Only",
"Topic :: Scientific/Engineering",
"Topic :: Utilities",
Expand Down