Skip to content

Commit ac3de52

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # README.md
2 parents d68c797 + 78b6111 commit ac3de52

Some content is hidden

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

55 files changed

+13597
-3317
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ assignees: ''
88
---
99

1010
**Describe the bug**
11-
A clear and concise description of what the bug is.
11+
A clear and concise description of what the bug is. Include error messages /
12+
tracebacks. If useful include screenshots.
1213

1314
**To Reproduce**
14-
Steps to reproduce the behavior:
15-
1. Go to '...'
16-
2. Click on '....'
17-
3. Scroll down to '....'
18-
4. See error
15+
Provide detailed steps to reproduce the behavior:
16+
17+
1.
18+
2.
19+
3.
20+
...
1921

2022
**Expected behavior**
2123
A clear and concise description of what you expected to happen.
@@ -24,15 +26,11 @@ A clear and concise description of what you expected to happen.
2426
If applicable, add screenshots to help explain your problem.
2527

2628
**Desktop (please complete the following information):**
27-
- OS: [e.g. iOS]
28-
- Browser [e.g. chrome, safari]
29-
- Version [e.g. 22]
30-
31-
**Smartphone (please complete the following information):**
32-
- Device: [e.g. iPhone6]
33-
- OS: [e.g. iOS8.1]
34-
- Browser [e.g. stock browser, safari]
35-
- Version [e.g. 22]
29+
* OS: (e.g. iOS)
30+
* GemPy Version
31+
* if installed via pip: provide GemPy version (e.g. 2.0.1)
32+
* if cloned from GitHub: provide Git commit id (e.g. 839bf85f)
33+
* Jupyter Version (if applicable)
3634

3735
**Additional context**
3836
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/question.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: Question
3+
about: Ask a question about GemPy
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**What is your question?**

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Description
2+
Please include a summary of the changes.
3+
4+
Relates to <issue>
5+
6+
# Checklist
7+
- [ ] My code follows the [PEP 8 style guidelines](https://www.python.org/dev/peps/pep-0008/).
8+
- [ ] My code uses type hinting for function and method arguments and return values.
9+
- [ ] My code contains descriptive and helpful docstrings
10+
which are formatted per the [Google Python Style Guidelines](http://google.github.io/styleguide/pyguide.html).
11+
- [ ] I have created tests which entirely cover my code.
12+
- [ ] The test code either 1. demonstrates at least one valuable use case (e.g. integration tests)
13+
or 2. verifies that outputs are as expected for given inputs (e.g. unit tests).
14+
- [ ] New and existing tests pass locally with my changes.
15+

.gitignore

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,7 @@ GeMpy/__pycache__/__init__.cpython-36.pyc
88
GeMpy/__pycache__/geomodeller_xml_obj.cpython-36.pyc
99
GeMpy/geomodeller_xml_obj.py.bak
1010
GeMpy/qgrid/__pycache__/
11-
notebooks/prototype notebooks/Example_4_faults_network.ipynb
12-
notebooks/prototype notebooks/Example_Peter_Model.ipynb
13-
notebooks/prototype notebooks/Fabian.vtp
14-
notebooks/prototype notebooks/Fabian1.vtp
15-
notebooks/prototype notebooks/Fabian2.vtp
16-
notebooks/prototype notebooks/Fabian3.vtp
17-
notebooks/prototype notebooks/Fabian4.vtp
18-
notebooks/prototype notebooks/FabianModelBigPoints.vtk
19-
notebooks/prototype notebooks/FabianModelSmallPoints.vtk
20-
notebooks/prototype notebooks/FabianModel_point.vti
21-
notebooks/prototype notebooks/FabianModel_point_good_res.vti
22-
notebooks/prototype notebooks/Fabian_f.vtp
23-
notebooks/prototype notebooks/Fault.vtk
24-
notebooks/prototype notebooks/Intrusions.ipynb
25-
notebooks/prototype notebooks/Layer1.vtk
26-
notebooks/prototype notebooks/Layer2.vtk
27-
notebooks/prototype notebooks/Layer3.vtk
28-
notebooks/prototype notebooks/Layer4.vtk
29-
notebooks/prototype notebooks/More cave/
30-
notebooks/prototype notebooks/PF_over_TKC/
31-
notebooks/prototype notebooks/PerthBasin.vti
32-
notebooks/prototype notebooks/PerthBasin.vtk
33-
notebooks/prototype notebooks/PerthBasinOtherColors.vtk
34-
notebooks/prototype notebooks/Physics.ipynb
35-
notebooks/prototype notebooks/SandstoneSol.npy
36-
notebooks/prototype notebooks/TriangleColoredPoints.vtp
37-
notebooks/prototype notebooks/TriangleSolidColor.vtp
38-
notebooks/prototype notebooks/Visualization3_vtkBasics.ipynb
39-
notebooks/prototype notebooks/files fab/
40-
notebooks/prototype notebooks/geomodels.sqlite
41-
notebooks/prototype notebooks/legacy/.ipynb_checkpoints/
42-
notebooks/prototype notebooks/models.npy
43-
notebooks/prototype notebooks/olaqases.vox
44-
notebooks/prototype notebooks/preth.npy
45-
notebooks/prototype notebooks/sandstone.vtk
46-
notebooks/prototype notebooks/sandstone.vtr
47-
notebooks/prototype notebooks/simplices.npy
48-
notebooks/prototype notebooks/vertices.npy
49-
notebooks/prototype notebooks/voxet_sub.vox
50-
notebooks/prototype notebooks/withfault.npy
11+
gempy/addons/RexCloud_Api_key.txt
5112
docs/source/Notebooks/Erosion.rst
5213
docs/source/Notebooks/Example_1_Sandstone_files/Example_1_Sandstone_39_0.png
5314
docs/source/Notebooks/Example_1_Sandstone_files/Example_1_Sandstone_41_0.png

.travis.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ dist: xenial
55
python:
66
- '3.7'
77

8+
env: TRAVIS=true
9+
810
install:
911
- pip install --upgrade setuptools pip
1012
- pip install cython
@@ -16,18 +18,12 @@ install:
1618
- pip install pyevtk
1719
- pip install dataclasses emg3d pyvista panel discretize
1820

19-
2021
script:
2122

2223
- pytest -v notebooks/integrations/ --nbval-lax --ignore-glob='*discret*'
23-
- pytest -v notebooks/examples/ --nbval-lax --current-env --ignore-glob='*pography*' --ignore-glob='*lesmodel*' --ignore-glob=*Course*
24-
- pytest -v notebooks/tutorials/ --nbval-lax --current-env --ignore-glob='ch1-6*' --ignore-glob='ch1-7*'
24+
- pytest -v notebooks/examples/ --nbval-lax --current-env --ignore-glob='*pography*' --ignore-glob='*lesmodel*' --ignore-glob='*Course*'
25+
- pytest -v notebooks/tutorials/ --nbval-lax --current-env --ignore-glob='*ch1-6*' --ignore-glob='ch1-7*' --ignore-glob='*ch1-10*' --ignore-glob='*MaskedMarchinCube_Onlap_relations*'
2526
- pytest
2627

27-
sudo: required
2828
cache: pip
2929

30-
#before_script: # configure a headless display to test plot generation
31-
# - "export DISPLAY=:99.0"
32-
# - "sh -e /etc/init.d/xvfb start"
33-
# - sleep 3 # give xvfb some time to start

CONTRIBUTING.md

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
# Contributing
2+
3+
We welcome and encoruage everyone to contribute to GemPy!
4+
Contributions can be questions, bug reports, feature requests and new code.
5+
Here is how to get started.
6+
7+
## Issues
8+
9+
### Questions
10+
11+
For questions about GemPy (e.g. its applications, functionality, and usage),
12+
please [search the existing issues for related questions](https://github.com/cgre-aachen/gempy/issues).
13+
If your question has not already been asked, then [make a new issue](https://github.com/cgre-aachen/gempy/issues/new/choose).
14+
15+
### Reporting Bugs
16+
17+
Please report bugs on the [issue page using the bug report template](https://github.com/cgre-aachen/gempy/issues/new?assignees=&labels=&template=bug_report.md&title=) and label the issue as a bug.
18+
The template asks essential questions for you to answer so that we can to understand, reproduce, and fix the bug.
19+
Be verbose!
20+
Whenever possible, provide tracebacks and/or error messages, screenshots, and sample code or other files.
21+
22+
### Feature Requests
23+
24+
We encourage users to submit ideas for improvements to the GemPy project. For
25+
this please create an issue on the
26+
[issue page](https://github.com/cgre-aachen/gempy/issues) with the *Feature
27+
Request* template and label. Please make sure to use a descriptive title and to
28+
provide ample background information to help us implement that functionality
29+
in the future.
30+
31+
## Contributing New Code
32+
33+
Any code contributions are welcome,
34+
whether fixing a typo or bug,
35+
adding new post-processing/plotting functionality,
36+
improve core functionality,
37+
or anything that you think should be in the repository.
38+
39+
Contributions should address an open issue (either a bug or a feature request).
40+
If you have found a new bug
41+
or have an idea or a new feature,
42+
then please [open the issue](https://github.com/cgre-aachen/gempy/issues/new/choose)
43+
for discussion and link to that issue in your pull request.
44+
45+
### Python code guidelines
46+
We aim to follow particular Python coding guidelines to improve the sustainability and positive impact of this community project:
47+
48+
- Follow [The Zen of Python](https://www.python.org/dev/peps/pep-0020/), most importantly "readability counts" when writing Python code.
49+
- Adhere to the [Style Guide for Python Code (PEP8)](https://www.python.org/dev/peps/pep-0008/).
50+
- Write thorough and effective documentation:
51+
Make a docstring for each module, function, class, and method,
52+
all following [PEP 257](https://www.python.org/dev/peps/pep-0257/) for high-level guidelines
53+
and [Google Python Style Guidelines](http://google.github.io/styleguide/pyguide.html) for Syntax.
54+
**Example function documentation:**
55+
```python
56+
def func(arg1: int, arg2: float) -> int:
57+
"""A concise one line summary of the function.
58+
59+
Additional information and description of the function, if necessary. This
60+
can be as long and verbose as you think is necessary for other users and
61+
developers to understand your functionality.
62+
63+
Args:
64+
arg1 (int): Description of the first argument.
65+
arg2 (float): Description of the second argument. Please use hanging
66+
indentation for multi-line argument descriptions.
67+
68+
Returns:
69+
(int) Description of the return value(s)
70+
"""
71+
return 42
72+
```
73+
- The code should explain the *what* and *how*. Add inline comments to explain the *why*.
74+
If an inline comment seems to be needed, consider first making the code more readable.
75+
For all comments, follow [PEP 8](https://www.python.org/dev/peps/pep-0008/).
76+
- Test every line of code. Untested code is dead code.
77+
78+
### Licensing
79+
80+
All contributed code will be licensed under
81+
[a LGPL-3 license](https://github.com/cgre-aachen/gempy/blob/master/LICENSE).
82+
If you did not write the code yourself,
83+
it is your responsibility to ensure that the existing license is compatible
84+
and included in the contributed files.
85+
In general we discourage contributing third party code.
86+
87+
### Testing
88+
89+
Our test suite uses [`pytest`](https://docs.pytest.org/).
90+
You should be familiar with `pytest` before contributing.
91+
Please run all tests locally before creating a pull request.
92+
You can do this by running `pytest` via your terminal in your GemPy folder:
93+
```bash
94+
cd ./path/to/gempy
95+
pytest
96+
```
97+
All tests are located in the `test` folder and its subfolders.
98+
All contributed code must include test code in the pull request.
99+
100+
### Pull Requests
101+
102+
All contributions are made via pull requests (PR's) to the master branch.
103+
You must complete the checklist in the [PR template](https://github.com/cgre-aachen/gempy/blob/master/.github/PULL_REQUEST_TEMPLATE.md) before we will review the PR and consider merging your contribution.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Check out the documentation either in [gempy.org](https://www.gempy.org/) (bette
3535

3636
<a name="feat"></a>
3737

38+
3839
## Features
3940

4041
The core algorithm of *GemPy* is based on a universal cokriging interpolation method devised by

gempy/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
1515

1616
from .core.gempy_api import *
17+
import gempy.plot.plot_api as _plot
1718
import gempy.plot.plot as plot
1819

1920
assert sys.version_info[0] >= 3, "GemPy requires Python 3.X" # sys.version_info[1] for minor e.g. 6

0 commit comments

Comments
 (0)