Skip to content

Commit

Permalink
REL: Prepare 1.4.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
florian-wagner committed Mar 31, 2023
1 parent aff9c9f commit cfdebd6
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

* `Florian Wagner <https://orcid.org/0000-0001-7407-9741>`_

*RWTH Aachen University, Institute for Applied Geophysics and Geothermal Energy, Aachen, Germany*
*RWTH Aachen University, Geophysical Imaging and Monitoring (GIM), Aachen, Germany*

[email protected]

Expand All @@ -28,4 +28,4 @@

* `Andrea Balza <https://www.andreabalza.com>`_

*RWTH Aachen University, Institute for Applied Geophysics and Geothermal Energy, Aachen, Germany*
*RWTH Aachen University, Geophysical Imaging and Monitoring (GIM), Aachen, Germany*
8 changes: 4 additions & 4 deletions INSTALLATION.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Open a terminal (Linux & Mac) or the Anaconda Prompt (Windows) and type:

.. code-block:: bash
conda create -n pg -c gimli -c conda-forge pygimli=1.3.1
conda create -n pg -c gimli -c conda-forge pygimli=1.4.0
If you are using Windows or Mac, a new environment named "pg" should be visible
in the Anaconda Navigator. If you want to use pyGIMLi from the command line, you
Expand Down Expand Up @@ -78,13 +78,13 @@ condacolab package by
condacolab.install()
After doing so, the kernel is automatically restarted, so import condacolab
again and install pygimli using mamba just as mentioned above.
again and install pygimli using conda just as mentioned above.

.. code:: Python
import condacolab
condacolab.check()
!mamba install -c gimli pygimli=1.3.1
!conda install -c gimli pygimli=1.4.0
Testing the installation
------------------------
Expand Down Expand Up @@ -139,4 +139,4 @@ Later you can just update the pygimli code by
Only if you need recent changes to the C++ core, you have to compile
pyGIMLi using your systems toolchain as described in
https://www.pygimli.org/compilation.html#sec-build
https://www.pygimli.org/compilation.html#sec-build
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ separate environment. Here we call this environment pg, but you can give it any
name. Note that this environment has to be created only once.

``` bash
conda create -n pg -c gimli -c conda-forge pygimli=1.3.1
conda create -n pg -c gimli -c conda-forge pygimli=1.4.0
```

If you are using Windows or Mac, a new environment named “pg” should be visible in the Anaconda Navigator. If you want to use pygimli from the command line, you have to activate the environment. You can put this line in your ~/.bashrc file so that it is activated automatically if you open a terminal.
Expand Down
1 change: 0 additions & 1 deletion doc/gimliuses.bib
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,6 @@ @Article{gruenenbaum2023JoH
volume = {617},
doi = {10.1016/j.jhydrol.2023.129074},
publisher = {Elsevier {BV}},
url = {https://doi.org/10.1016/j.jhydrol.2023.129074},
}
@Article{rochlitz2023GJI,
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- defaults
- gimli
dependencies:
- pgcore >= 1.3.0
- pgcore >= 1.4.0
- matplotlib
- jupyter
- sphinx >= 3.1
Expand Down
2 changes: 1 addition & 1 deletion pygimli/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ def __ModellingBase__createJacobian_mt__(self, model, resp):
if sys.platform == 'win32' or 'darwin':
# strange pickle problem: see python test_PhysicsManagers.py ves
from .logger import warn
warn('Multiprocess jacobian currently unavailable for win build')
warn('Multiprocess Jacobian currently unavailable for Win32 and Mac.')
nProcs = 1

if nProcs == 1:
Expand Down

0 comments on commit cfdebd6

Please sign in to comment.