Skip to content

Commit e24d7d1

Browse files
authored
Merge pull request #10 from GeoStat-Framework/develop
v1.0.2 release
2 parents 1c8dc58 + 899b34f commit e24d7d1

File tree

4 files changed

+25
-6
lines changed

4 files changed

+25
-6
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# do not build pull request from base repo twice (only build PRs of forks)
2+
if: type != pull_request OR fork = true
3+
14
language: python
25
python: 3.8
36

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

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

5+
## [1.0.2] - 2020-09-03
6+
7+
### Bugfixes
8+
- `StdyHeadObs` and `StdyObs` weren't usable due to an unnecessary `time` check
9+
10+
11+
## [1.0.1] - 2020-04-09
12+
13+
### Bugfixes
14+
- Wrong URL in setup
15+
516

617
## [1.0.0] - 2020-04-09
718

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

6879
First alpha release of welltespy.
6980

81+
[1.0.2]: https://github.com/GeoStat-Framework/welltestpy/compare/v1.0.1...v1.0.2
82+
[1.0.1]: https://github.com/GeoStat-Framework/welltestpy/compare/v1.0.0...v1.0.1
7083
[1.0.0]: https://github.com/GeoStat-Framework/welltestpy/compare/v0.3.2...v1.0.0
7184
[0.3.2]: https://github.com/GeoStat-Framework/welltestpy/compare/v0.3.1...v0.3.2
7285
[0.3.1]: https://github.com/GeoStat-Framework/welltestpy/compare/v0.3.0...v0.3.1

docs/source/_templates/layout.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<p class="link caption"><span class="link caption-text">GeoStat Framework</span></p>
1212
<a href="https://geostat-framework.org">GeoStat Website</a>
1313
<a href="https://github.com/GeoStat-Framework">GeoStat Github</a>
14+
<a href="https://github.com/GeoStat-Examples">GeoStat Examples</a>
1415
<a href="https://geostat-framework.readthedocs.io">GeoStat ReadTheDocs</a>
1516
<a href="https://pypi.org/user/geostatframework/">GeoStat PyPI</a>
1617
<br />

welltestpy/data/varlib.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -556,9 +556,10 @@ def __init__(self, name, observation, description="Steady observation"):
556556

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

563564

564565
class TimeSeries(Observation):
@@ -637,9 +638,10 @@ def __init__(
637638

638639
def _settime(self, time):
639640
"""For steady observations, this raises a ``ValueError``."""
640-
raise ValueError(
641-
"Observation: " + "'time' not allowed in steady-state"
642-
)
641+
if time is not None:
642+
raise ValueError(
643+
"Observation: " + "'time' not allowed in steady-state"
644+
)
643645

644646

645647
class Well:

0 commit comments

Comments
 (0)