Skip to content

Commit fcd0fbf

Browse files
MuellerSebMuellerSeb
authored
Merge pull request #5 from GeoStat-Framework/develop
1.1.0 release
2 parents 15cbaa2 + c29244a commit fcd0fbf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+192
-290
lines changed

‎.travis.yml

+58-32
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,68 @@
11
language: python
2+
python: 3.7
23

3-
matrix:
4-
include:
5-
# separate sdist and coverage with py36 on linux
6-
- name: "sdist and coverage"
7-
sudo: required
8-
language: python
9-
python: 3.6
10-
services: docker
11-
script:
12-
- python -m pip install -U setuptools pytest-cov coveralls
13-
- python setup.py sdist -d dist
14-
- python -m pip install -r requirements.txt
15-
- python -m pytest --cov ogs5py --cov-report term-missing -v tests/
16-
- python -m coveralls
17-
# universal wheel on 64bit Linux with py36
18-
- name: "py2.py3 wheel"
19-
sudo: required
20-
language: python
21-
python: 3.6
22-
services: docker
4+
# setuptools-scm needs all tags in order to obtain a proper version
5+
git:
6+
depth: false
237

248
env:
259
global:
10+
# Note: TWINE_PASSWORD is set in Travis settings
2611
- TWINE_USERNAME=geostatframework
27-
- CIBW_BEFORE_BUILD="pip install setuptools"
28-
29-
script:
30-
# create wheels
31-
- python -m pip install cibuildwheel==1.0.0
32-
- python -m cibuildwheel --output-dir dist
33-
34-
after_success:
35-
- python -m pip install twine
36-
- python -m twine upload --verbose --skip-existing --repository-url https://test.pypi.org/legacy/ dist/*
37-
- if [[ $TRAVIS_TAG ]]; then python -m twine upload --verbose --skip-existing dist/*; fi
3812

3913
notifications:
4014
email:
4115
recipients:
42-
- info@geostat-framework.org
16+
- info@geostat-framework.org
17+
18+
# before_install:
19+
# - |
20+
# if [[ "$TRAVIS_OS_NAME" = windows ]]; then
21+
# choco install python --version 3.7.7
22+
# export PATH="/c/Python37:/c/Python37/Scripts:$PATH"
23+
# # make sure it's on PATH as 'python3'
24+
# ln -s /c/Python37/python.exe /c/Python37/python3.exe
25+
# fi
26+
27+
install:
28+
- python3 -m pip install .[test] coveralls
29+
30+
script:
31+
- python3 -m pytest --cov ogs5py --cov-report term-missing -v tests/
32+
33+
stages:
34+
- test
35+
- name: deploy
36+
if: (NOT type IN (pull_request)) AND (repo = GeoStat-Framework/ogs5py)
37+
38+
jobs:
39+
include:
40+
- stage: test
41+
name: Test on Linux
42+
services: docker
43+
after_success: python3 -m coveralls
44+
- stage: test
45+
name: Test on MacOS
46+
os: osx
47+
language: generic
48+
# skip windows due to a VTK BUG
49+
# - stage: test
50+
# name: Test on Windows
51+
# os: windows
52+
# language: shell
53+
54+
# Test Deploy source distribution
55+
- stage: deploy
56+
name: Test Deploy
57+
install: python3 -m pip install -U setuptools wheel twine
58+
script: python3 setup.py sdist --formats=gztar bdist_wheel
59+
after_success:
60+
- python3 -m twine upload --verbose --skip-existing --repository-url https://test.pypi.org/legacy/ dist/*
61+
62+
# Deploy source distribution
63+
- stage: deploy
64+
name: Deploy to PyPI
65+
if: tag IS present
66+
install: python3 -m pip install -U setuptools wheel twine
67+
script: python3 setup.py sdist --formats=gztar bdist_wheel
68+
after_success: python3 -m twine upload --verbose --skip-existing dist/*

‎.zenodo.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"contributors": [
3+
{
4+
"orcid": "0000-0002-2547-8102",
5+
"affiliation": "Helmholtz Centre for Environmental Research - UFZ",
6+
"type": "Supervisor",
7+
"name": "Falk He\u00dfe"
8+
}
9+
],
10+
"license": "MIT",
11+
"creators": [
12+
{
13+
"orcid": "0000-0001-9060-4008",
14+
"affiliation": "Helmholtz Centre for Environmental Research - UFZ",
15+
"name": "Sebastian M\u00fcller"
16+
}
17+
]
18+
}

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to **ogs5py** will be documented in this file.
44

55

6+
## [1.1.0] - 2020-03-22
7+
8+
### Bugfixes
9+
* meshio 4 was not compatible
10+
* fixed integer type in exporting meshes with element/material IDs
11+
* better check for OGS5 success on Windows
12+
13+
### Changes
14+
* drop py2.7 support
15+
16+
617
## [1.0.5] - 2019-11-18
718

819
### Bugfixes

‎MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include MANIFEST.in
22
include setup.py
33
recursive-include ogs5py *.py
4+
recursive-include tests *.py
45
recursive-include docs/source *
56
include docs/Makefile docs/requirements.txt
67
include LICENSE

‎README.md

+11-12
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2546767.svg)](https://doi.org/10.5281/zenodo.2546767)
44
[![PyPI version](https://badge.fury.io/py/ogs5py.svg)](https://badge.fury.io/py/ogs5py)
5-
[![Build Status](https://travis-ci.org/GeoStat-Framework/ogs5py.svg?branch=master)](https://travis-ci.org/GeoStat-Framework/ogs5py)
5+
[![Build Status](https://travis-ci.com/GeoStat-Framework/ogs5py.svg?branch=master)](https://travis-ci.org/GeoStat-Framework/ogs5py)
66
[![Coverage Status](https://coveralls.io/repos/github/GeoStat-Framework/ogs5py/badge.svg?branch=master)](https://coveralls.io/github/GeoStat-Framework/ogs5py?branch=master)
7-
[![Documentation Status](https://readthedocs.org/projects/ogs5py/badge/?version=latest)](https://geostat-framework.readthedocs.io/projects/ogs5py/en/latest/?badge=latest)
7+
[![Documentation Status](https://readthedocs.org/projects/ogs5py/badge/?version=stable)](https://geostat-framework.readthedocs.io/projects/ogs5py/en/stable/?badge=stable)
88
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
99

1010
<p align="center">
@@ -147,13 +147,12 @@ model.run_model(ogs_exe="path/to/ogs")
147147

148148
## Requirements:
149149

150-
- [NumPy >= 1.13.0](https://www.numpy.org)
151-
- [Pandas >= 0.23.0](https://pandas.pydata.org/)
152-
- [whichcraft](https://github.com/pydanny/whichcraft)
153-
- [meshio](https://github.com/nschloe/meshio)
154-
- [lxml](https://github.com/lxml/lxml)
155-
- [vtk](https://vtk.org/)
156-
- [pexpect](https://github.com/pexpect/pexpect)
150+
- [NumPy >= 1.14.5](https://www.numpy.org)
151+
- [Pandas >= 0.23.2](https://pandas.pydata.org/)
152+
- [meshio >= 4.0.3; <5.0](https://github.com/nschloe/meshio)
153+
- [lxml >= 4.0; <5.0](https://github.com/lxml/lxml)
154+
- [pexpect >= 4.0; <5.0](https://github.com/pexpect/pexpect)
155+
- [vtk >= 8.1](https://vtk.org/)
157156

158157
## Contact
159158

@@ -162,12 +161,12 @@ You can contact us via <info@geostat-framework.org>.
162161

163162
## License
164163

165-
[MIT][gpl_link] © 2018-2019 (inspired by Falk Hesse and Miao Jing)
164+
[MIT][gpl_link] © 2018-2020 (inspired by Falk Hesse and Miao Jing)
166165

167166
This project is based on [OGSPY][ogspy_link].
168167

169168
[ogspy_link]: https://github.com/fhesze/OGSPY
170169
[gpl_link]: https://github.com/GeoStat-Framework/ogs5py/blob/master/LICENSE
171170
[ogs5_link]: https://www.opengeosys.org/ogs-5/
172-
[doc_link]: https://geostat-framework.readthedocs.io/projects/ogs5py/en/latest/
173-
[tut1_link]: https://geostat-framework.readthedocs.io/projects/ogs5py/en/latest/tutorial_01_pump.html
171+
[doc_link]: https://ogs5py.readthedocs.io/
172+
[tut1_link]: https://geostat-framework.readthedocs.io/projects/ogs5py/en/stable/tutorial_01_pump.html

‎docs/requirements.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# required for readthedocs.org
2-
numpydoc
3-
# https://stackoverflow.com/a/11704396/6696397
4-
-r ../requirements.txt
1+
-r requirements_doc.txt
2+
-r ../requirements_setup.txt
3+
-r ../requirements.txt

‎docs/requirements_doc.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
numpydoc

‎docs/source/conf.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
# NOTE:
2121
# pip install sphinx_rtd_theme
2222
# is needed in order to build the documentation
23+
import datetime
2324
import os
2425
import sys
2526

@@ -95,8 +96,9 @@ def setup(app):
9596
master_doc = "contents"
9697

9798
# General information about the project.
99+
curr_year = datetime.datetime.now().year
98100
project = "ogs5py"
99-
copyright = "2019, Sebastian Mueller"
101+
copyright = "2019 - {}, Sebastian Mueller".format(curr_year)
100102
author = "Sebastian Mueller"
101103

102104
# The version info for the project you're documenting, acts as replacement for

‎docs/source/index.rst

+7-8
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,15 @@ Otherwise you need to specify the path to the executable within the run command:
143143
Requirements
144144
============
145145

146-
- `NumPy >= 1.13.0 <https://www.numpy.org>`_
147-
- `Pandas >= 0.23.0 <https://pandas.pydata.org/>`_
148-
- `whichcraft <https://github.com/pydanny/whichcraft>`_
149-
- `meshio <https://github.com/nschloe/meshio>`_
150-
- `lxml <https://github.com/lxml/lxml>`_
151-
- `vtk <https://vtk.org/>`_
152-
- `pexpect <https://github.com/pexpect/pexpect>`_
146+
- `NumPy >= 1.14.5 <https://www.numpy.org>`_
147+
- `Pandas >= 0.23.2 <https://pandas.pydata.org/>`_
148+
- `meshio >= 4.0.3; <5.0 <https://github.com/nschloe/meshio>`_
149+
- `lxml >= 4.0; <5.0 <https://github.com/lxml/lxml>`_
150+
- `pexpect >= 4.0; <5.0 <https://github.com/pexpect/pexpect>`_
151+
- `vtk >= 8.1 <https://vtk.org/>`_
153152

154153

155154
License
156155
=======
157156

158-
`MIT <https://github.com/GeoStat-Framework/ogs5py/blob/master/LICENSE>`_ © 2019
157+
`MIT <https://github.com/GeoStat-Framework/ogs5py/blob/master/LICENSE>`_

‎ogs5py/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@
125125
PCS_TYP
126126
PRIM_VAR_BY_PCS
127127
"""
128-
from __future__ import absolute_import
129-
130128
from ogs5py._version import __version__
131129
from ogs5py.ogs import OGS
132130
from ogs5py.fileclasses import (

‎ogs5py/_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# -*- coding: utf-8 -*-
22
"""Provide a central version."""
3-
__version__ = "1.0.5"
3+
__version__ = "1.0.6.dev0"

‎ogs5py/fileclasses/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
4949
----
5050
"""
51-
from __future__ import absolute_import
52-
5351
from ogs5py.fileclasses.asc import ASC
5452
from ogs5py.fileclasses.bc import BC
5553
from ogs5py.fileclasses.cct import CCT

‎ogs5py/fileclasses/asc/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
1313
----
1414
"""
15-
from __future__ import absolute_import
16-
1715
from ogs5py.fileclasses.asc.core import ASC
1816

1917
__all__ = ["ASC"]

‎ogs5py/fileclasses/asc/core.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# -*- coding: utf-8 -*-
22
"""Class for the ogs ASC file."""
3-
4-
from __future__ import absolute_import, division, print_function
53
from ogs5py.fileclasses.base import LineFile
64

75

‎ogs5py/fileclasses/base.py

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
1616
----
1717
"""
18-
from __future__ import print_function, division, absolute_import
1918
import os
2019
import shutil
2120
import time

‎ogs5py/fileclasses/bc/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
1313
----
1414
"""
15-
from __future__ import absolute_import
16-
1715
from ogs5py.fileclasses.bc.core import BC
1816

1917
__all__ = ["BC"]

‎ogs5py/fileclasses/bc/core.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# -*- coding: utf-8 -*-
22
"""Class for the ogs BOUNDARY CONDITION file."""
3-
4-
from __future__ import absolute_import, division, print_function
53
from ogs5py.fileclasses.base import BlockFile
64

75

‎ogs5py/fileclasses/cct/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
1313
----
1414
"""
15-
from __future__ import absolute_import
16-
1715
from ogs5py.fileclasses.cct.core import CCT
1816

1917
__all__ = ["CCT"]

‎ogs5py/fileclasses/cct/core.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# -*- coding: utf-8 -*-
22
"""Class for the ogs COMMUNICATION TABLE file."""
3-
4-
from __future__ import absolute_import, division, print_function
53
from ogs5py.fileclasses.base import BlockFile
64

75

‎ogs5py/fileclasses/ddc/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
1313
----
1414
"""
15-
from __future__ import absolute_import
16-
1715
from ogs5py.fileclasses.ddc.core import DDC
1816

1917
__all__ = ["DDC"]

‎ogs5py/fileclasses/ddc/core.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# -*- coding: utf-8 -*-
22
"""Class for the ogs DOMAIN DECOMPOSITION file."""
3-
4-
from __future__ import absolute_import, division, print_function
53
from ogs5py.fileclasses.base import BlockFile
64

75

‎ogs5py/fileclasses/fct/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
1313
----
1414
"""
15-
from __future__ import absolute_import
16-
1715
from ogs5py.fileclasses.fct.core import FCT
1816

1917
__all__ = ["FCT"]

‎ogs5py/fileclasses/fct/core.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# -*- coding: utf-8 -*-
22
"""Class for the ogs FUNCTION file."""
3-
4-
from __future__ import absolute_import, division, print_function
53
from ogs5py.fileclasses.base import BlockFile
64

75

‎ogs5py/fileclasses/gem/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
1414
----
1515
"""
16-
from __future__ import absolute_import
17-
1816
from ogs5py.fileclasses.gem.core import GEM, GEMinit
1917

2018
__all__ = ["GEM", "GEMinit"]

‎ogs5py/fileclasses/gem/core.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# -*- coding: utf-8 -*-
22
"""Class for the ogs GEOCHEMICAL THERMODYNAMIC MODELING COUPLING file."""
3-
4-
from __future__ import absolute_import, division, print_function
53
import os
64
from ogs5py.fileclasses.base import BlockFile, LineFile
75

‎ogs5py/fileclasses/gli/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
2121
----
2222
"""
23-
from __future__ import absolute_import
24-
2523
from ogs5py.fileclasses.gli.core import GLI, GLIext
2624

2725
__all__ = ["GLI", "GLIext"]

‎ogs5py/fileclasses/gli/checker.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# -*- coding: utf-8 -*-
22
"""Checking routines for the ogs5py-GLI package."""
3-
from __future__ import division, print_function, absolute_import
43
import numpy as np
54
from ogs5py.tools.types import STRTYPE, GLI_KEYS, PLY_KEYS, SRF_KEYS, VOL_KEYS
65

0 commit comments

Comments
 (0)