Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	gempy/__init__.py
#	gempy/core/data_modules/geometric_data.py
#	gempy/plot/plot_api.py
#	setup.py
#	test/test_core/test_data_mutation.py
  • Loading branch information
Leguark committed Oct 10, 2023
2 parents bc9cfcd + bae4401 commit aad6e4a
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
16 changes: 16 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
cff-version: 1.2.0
message: "If you use GemPy, please cite it as below."
authors:
- family-names: "de la Varga"
given-names: "Miguel"
orcid: https://orcid.org/0000-0001-6941-2685
- family-names: "Schaaf"
given-names: "Alexander"
- family-names: "Wellmann"
given-names: "Florian"
orcid: https://orcid.org/0000-0003-2552-1876
title: "GemPy 1.0: open-source stochastic geological modeling and inversion"
version: 1.0
doi: https://doi.org/10.5194/gmd-12-1-2019
date-released: 2019-01-02
url: "https://github.com/cgre-aachen/gempy"
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
[![PyPI](https://img.shields.io/badge/pypi-1.0-blue.svg)](https://pypi.org/project/gempy/)
[![license: LGPL v3](https://img.shields.io/badge/license-LGPL%20v3-blue.svg)](https://github.com/cgre-aachen/gempy/blob/master/LICENSE)
[![Documentation Status](https://assets.readthedocs.org/static/projects/badges/passing-flat.svg)](http://docs.gempy.org)
[![Travis Build](https://travis-ci.org/cgre-aachen/gempy.svg?branch=master)](https://travis-ci.org/github/cgre-aachen/gempy/branches)
[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/cgre-aachen/gempy/master)
[![DOI](https://zenodo.org/badge/96211155.svg)](https://zenodo.org/badge/latestdoi/96211155)
[![DOCKER](https://img.shields.io/docker/cloud/automated/leguark/gempy.svg)](https://cloud.docker.com/repository/docker/leguark/gempy)
Expand Down Expand Up @@ -38,8 +37,8 @@ For more information, refer to the [installation documentation](https://docs.gem
## Requirements

The following versions are required/strongly recommended for the main dependencies of GemPy (as of June 2023):
- python>=3.10
- pandas>=2.0
- python=3.10
- pandas=2.0.1
- matplotlib>=3.7
- pyvista>=0.39

Expand Down

0 comments on commit aad6e4a

Please sign in to comment.