Skip to content

Commit

Permalink
Merge pull request #930 from PMEAL/dev
Browse files Browse the repository at this point in the history
Release of v2.4.1 #patch
  • Loading branch information
ma-sadeghi authored Mar 12, 2024
2 parents c98b69d + 36d1a2c commit 5bdb010
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</p>

[![image](https://img.shields.io/pypi/v/porespy.svg)](https://pypi.python.org/pypi/porespy/)
[![Pyversions](https://img.shields.io/pypi/pyversions/porespy.svg?style=flat-square&label=Python%20Versions)](https://pypi.python.org/pypi/porespy)
[![image](https://codecov.io/gh/PMEAL/PoreSpy/branch/dev/graph/badge.svg)](https://codecov.io/gh/PMEAL/PoreSpy)

# What is PoreSpy?

Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ dependencies = [
"scipy",
"tqdm",
"pywavelets",
"nanomesh",
"setuptools",
]
readme = "README.md"
Expand All @@ -58,6 +57,7 @@ test = [
]
extras = [
"imageio",
"nanomesh",
"numpy-stl",
"pyevtk",
"scikit-fmm",
Expand Down Expand Up @@ -137,8 +137,6 @@ python_classes = "*Test"
python_functions = "test_*"
testpaths = ["test", "examples"]
norecursedirs = [".git", ".github", ".ipynb_checkpoints", "build", "dist"]
# filterwarnings = ["error", "ignore::UserWarning", "ignore::DeprecationWarning"]
# -p no:warnings

[tool.coverage.run]
source = ["src/porespy"]
Expand Down
2 changes: 1 addition & 1 deletion src/porespy/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2.4.0'
__version__ = '2.4.0.dev0'
7 changes: 6 additions & 1 deletion src/porespy/generators/_micromodels.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import numpy as np
import scipy.ndimage as spim
import scipy.stats as spst
from nanomesh import Mesher2D

from porespy.generators import borders, lattice_spheres, spheres_from_coords
from porespy.tools import _insert_disks_at_points_parallel, extend_slice
Expand Down Expand Up @@ -286,6 +285,12 @@ def cylindrical_pillars_mesh(
to view online example.
"""
try:
from nanomesh import Mesher2D
except ModuleNotFoundError:
msg = "The nanomesh package can be installed with `pip install nanomesh`"
raise ModuleNotFoundError(msg)

if len(shape) != 2:
raise Exception('shape must be 2D for this function')
if n is None:
Expand Down

0 comments on commit 5bdb010

Please sign in to comment.