Skip to content

Commit c6e54f6

Browse files
authored
Include base requirements by referencing requirements.txt and add pytest explicitly for testing purposes. This ensures the development environment has all necessary dependencies. (#3)
2 parents 91d8634 + a879466 commit c6e54f6

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
[![PyPI](https://img.shields.io/badge/pypi-1.0-blue.svg)](https://pypi.org/project/gempy/)
66
[![license: LGPL v3](https://img.shields.io/badge/license-LGPL%20v3-blue.svg)](https://github.com/cgre-aachen/gempy/blob/master/LICENSE)
77
[![Documentation Status](https://assets.readthedocs.org/static/projects/badges/passing-flat.svg)](http://docs.gempy.org)
8-
[![Travis Build](https://travis-ci.org/cgre-aachen/gempy.svg?branch=master)](https://travis-ci.org/github/cgre-aachen/gempy/branches)
9-
[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/cgre-aachen/gempy/master)
108
[![DOI](https://zenodo.org/badge/96211155.svg)](https://zenodo.org/badge/latestdoi/96211155)
11-
[![DOCKER](https://img.shields.io/docker/cloud/automated/leguark/gempy.svg)](https://cloud.docker.com/repository/docker/leguark/gempy)
9+
[![Build Status](http://terranigma-solutions.teamcity.com/app/rest/builds/buildType:(id:Gempy_TestingViewer)/statusIcon)](http://terranigma-solutions.teamcity.com/viewType.html?buildTypeId=Gempy_TestingViewer&guest=1)
1210

1311
<p align="center"><img src="https://raw.githubusercontent.com/cgre-aachen/gempy/master/docs/source/images/model_examples.png" width="800"></p>
1412

gempy_viewer/modules/plot_2d/drawer_contours_2d.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ def plot_regular_grid_contacts(gempy_model: GeoModel, ax: matplotlib.axes.Axes,
1212
# contour_idx = list(self.model._faults.df[self.model._faults.df['isFault'] == True].index)
1313
# else:
1414
# contour_idx = list(self.model._surfaces.df.index)
15+
if kwargs is None:
16+
kwargs = {}
1517

1618
zorder = kwargs.get('zorder', 100)
1719

requirements/dev-requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
-r optional_requirements.txt
2+
13
pytest

requirements/optional_requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
-r requirements.txt
2+
13
pyvista
4+
scikit-image
25
# for topography
36
scipy
47
pooch

tests/test_installation.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import pytest
2+
3+
4+
@pytest.mark.skipif(condition=True, reason="Run explicitly to test installation")
15
def test_pyvista():
26
import pyvista
37

0 commit comments

Comments
 (0)