Skip to content

Commit

Permalink
Merge pull request #10 from GeoStat-Framework/develop
Browse files Browse the repository at this point in the history
v1.0.2 release
  • Loading branch information
MuellerSeb committed Sep 2, 2020
2 parents 1c8dc58 + 899b34f commit e24d7d1
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
@@ -1,3 +1,6 @@
# do not build pull request from base repo twice (only build PRs of forks)
if: type != pull_request OR fork = true

language: python
python: 3.8

Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,17 @@

All notable changes to **welltestpy** will be documented in this file.

## [1.0.2] - 2020-09-03

### Bugfixes
- `StdyHeadObs` and `StdyObs` weren't usable due to an unnecessary `time` check


## [1.0.1] - 2020-04-09

### Bugfixes
- Wrong URL in setup


## [1.0.0] - 2020-04-09

Expand Down Expand Up @@ -67,6 +78,8 @@ All notable changes to **welltestpy** will be documented in this file.

First alpha release of welltespy.

[1.0.2]: https://github.com/GeoStat-Framework/welltestpy/compare/v1.0.1...v1.0.2
[1.0.1]: https://github.com/GeoStat-Framework/welltestpy/compare/v1.0.0...v1.0.1
[1.0.0]: https://github.com/GeoStat-Framework/welltestpy/compare/v0.3.2...v1.0.0
[0.3.2]: https://github.com/GeoStat-Framework/welltestpy/compare/v0.3.1...v0.3.2
[0.3.1]: https://github.com/GeoStat-Framework/welltestpy/compare/v0.3.0...v0.3.1
Expand Down
1 change: 1 addition & 0 deletions docs/source/_templates/layout.html
Expand Up @@ -11,6 +11,7 @@
<p class="link caption"><span class="link caption-text">GeoStat Framework</span></p>
<a href="https://geostat-framework.org">GeoStat Website</a>
<a href="https://github.com/GeoStat-Framework">GeoStat Github</a>
<a href="https://github.com/GeoStat-Examples">GeoStat Examples</a>
<a href="https://geostat-framework.readthedocs.io">GeoStat ReadTheDocs</a>
<a href="https://pypi.org/user/geostatframework/">GeoStat PyPI</a>
<br />
Expand Down
14 changes: 8 additions & 6 deletions welltestpy/data/varlib.py
Expand Up @@ -556,9 +556,10 @@ def __init__(self, name, observation, description="Steady observation"):

def _settime(self, time):
"""For steady observations, this raises a ``ValueError``."""
raise ValueError(
"Observation: " + "'time' not allowed in steady-state"
)
if time is not None:
raise ValueError(
"Observation: " + "'time' not allowed in steady-state"
)


class TimeSeries(Observation):
Expand Down Expand Up @@ -637,9 +638,10 @@ def __init__(

def _settime(self, time):
"""For steady observations, this raises a ``ValueError``."""
raise ValueError(
"Observation: " + "'time' not allowed in steady-state"
)
if time is not None:
raise ValueError(
"Observation: " + "'time' not allowed in steady-state"
)


class Well:
Expand Down

0 comments on commit e24d7d1

Please sign in to comment.