ringspy 0.3.2__tar.gz → 0.3.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: RingsPy
3
- Version: 0.3.2
3
+ Version: 0.3.4
4
4
  Summary: A geometric generation tool for prismatic cellular solids
5
5
  Home-page: https://github.com/kingyin3613/RingsPy/
6
6
  Author: Hao Yin
@@ -9,6 +9,7 @@ License: GPL-3.0
9
9
  Description: # RingsPy
10
10
  [![Python 3](https://img.shields.io/static/v1?label=Python&logo=Python&color=3776AB&message=3)](https://www.python.org/)
11
11
  [![PyPI version](https://badge.fury.io/py/RingsPy.svg)](https://badge.fury.io/py/RingsPy)
12
+ [![Anaconda-Server Badge](https://anaconda.org/conda-forge/ringspy/badges/version.svg)](https://anaconda.org/conda-forge/ringspy)
12
13
  [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
13
14
  [![Tests](https://github.com/kingyin3613/RingsPy/actions/workflows/tests.yml/badge.svg)](https://github.com/kingyin3613/RingsPy/actions/workflows/tests.yml)
14
15
  [![codecov](https://codecov.io/gh/kingyin3613/RingsPy/branch/main/graph/badge.svg?token=4AZN3HGGET)](https://codecov.io/gh/kingyin3613/RingsPy)
@@ -17,9 +18,9 @@ Description: # RingsPy
17
18
  RingsPy is a Voronoi diagrams-based geometric generation tool that generates 3D meshes and models of prismatic cellular solids with radial growth rules.
18
19
 
19
20
  ## Dependencies and Installation
20
-
21
+ RingsPy depends on mainstream Python libraries ``numpy`` and ``scipy``, and optionally depends on library ``hexalattice``, if the regular hexagonal lattice (e.g. honeycomb) is wanted; also ``vtk``, if the 3D STL files are also wanted.
21
22
  ### 1. pip install
22
- To install RingsPy, one may use:
23
+ To install RingsPy, one may use `pip`:
23
24
  ```bash
24
25
  pip install RingsPy
25
26
  ```
@@ -29,9 +30,13 @@ Description: # RingsPy
29
30
  ```
30
31
  to get updates beyond the latest release.
31
32
 
32
- RingsPy depends on mainstream Python libraries ``numpy`` and ``scipy``, and optionally depends on library ``hexalattice``, if the regular hexagonal lattice (e.g. honeycomb) is wanted; also ``vtk``, if the 3D STL files are also wanted.
33
+ ### 2. conda install
34
+ If you are on Linux or Mac, you can also use `conda-forge` channel:
35
+ ```bash
36
+ conda install -c conda-forge ringspy
37
+ ```
33
38
 
34
- ### 2. Installation Check
39
+ ### 3. Installation Check
35
40
 
36
41
  There are some unit tests in [tests](https://github.com/kingyin3613/RingsPy/tree/main/tests/). One can use ``pytest`` to check whether the installation is successful by running this command:
37
42
 
@@ -1,6 +1,7 @@
1
1
  # RingsPy
2
2
  [![Python 3](https://img.shields.io/static/v1?label=Python&logo=Python&color=3776AB&message=3)](https://www.python.org/)
3
3
  [![PyPI version](https://badge.fury.io/py/RingsPy.svg)](https://badge.fury.io/py/RingsPy)
4
+ [![Anaconda-Server Badge](https://anaconda.org/conda-forge/ringspy/badges/version.svg)](https://anaconda.org/conda-forge/ringspy)
4
5
  [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
5
6
  [![Tests](https://github.com/kingyin3613/RingsPy/actions/workflows/tests.yml/badge.svg)](https://github.com/kingyin3613/RingsPy/actions/workflows/tests.yml)
6
7
  [![codecov](https://codecov.io/gh/kingyin3613/RingsPy/branch/main/graph/badge.svg?token=4AZN3HGGET)](https://codecov.io/gh/kingyin3613/RingsPy)
@@ -9,9 +10,9 @@
9
10
  RingsPy is a Voronoi diagrams-based geometric generation tool that generates 3D meshes and models of prismatic cellular solids with radial growth rules.
10
11
 
11
12
  ## Dependencies and Installation
12
-
13
+ RingsPy depends on mainstream Python libraries ``numpy`` and ``scipy``, and optionally depends on library ``hexalattice``, if the regular hexagonal lattice (e.g. honeycomb) is wanted; also ``vtk``, if the 3D STL files are also wanted.
13
14
  ### 1. pip install
14
- To install RingsPy, one may use:
15
+ To install RingsPy, one may use `pip`:
15
16
  ```bash
16
17
  pip install RingsPy
17
18
  ```
@@ -21,9 +22,13 @@ pip install git+https://github.com/kingyin3613/RingsPy.git
21
22
  ```
22
23
  to get updates beyond the latest release.
23
24
 
24
- RingsPy depends on mainstream Python libraries ``numpy`` and ``scipy``, and optionally depends on library ``hexalattice``, if the regular hexagonal lattice (e.g. honeycomb) is wanted; also ``vtk``, if the 3D STL files are also wanted.
25
+ ### 2. conda install
26
+ If you are on Linux or Mac, you can also use `conda-forge` channel:
27
+ ```bash
28
+ conda install -c conda-forge ringspy
29
+ ```
25
30
 
26
- ### 2. Installation Check
31
+ ### 3. Installation Check
27
32
 
28
33
  There are some unit tests in [tests](https://github.com/kingyin3613/RingsPy/tree/main/tests/). One can use ``pytest`` to check whether the installation is successful by running this command:
29
34
 
@@ -327,7 +327,7 @@ def CellPlacement_Honeycomb(log_center,r_max,r_min,nrings,box_center,box_size,\
327
327
  iter_max,print_interval):
328
328
  from hexalattice.hexalattice import create_hex_grid
329
329
  """
330
- packing cells in annual rings
330
+ packing cells in hexagonal grids
331
331
  """
332
332
  # Annual ring width distribution
333
333
  width = np.concatenate(([width_heart],np.tile([width_early,width_late],nrings)))
@@ -654,8 +654,8 @@ def RebuildVoronoi(vor,circles,boundaries,log_center,x_min,x_max,y_min,y_max,box
654
654
  boundary_ridges_new,nvertex,nvertices_in,nfinite_ridge,nboundary_ridge,\
655
655
  nboundary_pts,nboundary_pts_featured,voronoi_ridges,nridge
656
656
 
657
- def RebuildVoronoi_new(vor,circles,boundaries,log_center,x_min,x_max,y_min,y_max,box_center,box_shape,merge_tol,boundaryFlag):
658
- '''Clip Voronoi mesh by the boundaries, rebuild the new Voronoi mesh'''
657
+ def RebuildVoronoi_merge(vor,circles,boundaries,log_center,x_min,x_max,y_min,y_max,box_center,box_shape,merge_tol,boundaryFlag):
658
+ '''Clip Voronoi mesh by the boundaries, merge short Voronoi ridges, and rebuild the new Voronoi mesh'''
659
659
  # Store indices of Voronoi vertices for each finite ridge
660
660
  finite_ridges = []
661
661
  finite_ridges_pointid = []
@@ -3936,7 +3936,7 @@ def ReadSavedSites(radial_growth_rule):
3936
3936
  sitefile = radial_growth_rule
3937
3937
  radiusfile = radial_growth_rule.strip().replace("_sites", '_radius')
3938
3938
 
3939
- d = Path.cwd()
3939
+ d = Path(__file__).parent #Path.cwd()
3940
3940
  root = Path(d.root)
3941
3941
 
3942
3942
  while d != root:
@@ -3946,7 +3946,11 @@ def ReadSavedSites(radial_growth_rule):
3946
3946
  print('Sites info from file: {:s} has been loaded.'.format(str(site_attempt)))
3947
3947
  return np.load(site_attempt), np.load(radius_attempt)
3948
3948
  d = d.parent
3949
-
3949
+
3950
+ print('Could not find file: {:s}, please check if the existing site file is under the same directory with the input script.'.format(radial_growth_rule))
3951
+ print('Now exitting...')
3952
+ exit()
3953
+
3950
3954
  return None
3951
3955
 
3952
3956
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: RingsPy
3
- Version: 0.3.2
3
+ Version: 0.3.4
4
4
  Summary: A geometric generation tool for prismatic cellular solids
5
5
  Home-page: https://github.com/kingyin3613/RingsPy/
6
6
  Author: Hao Yin
@@ -9,6 +9,7 @@ License: GPL-3.0
9
9
  Description: # RingsPy
10
10
  [![Python 3](https://img.shields.io/static/v1?label=Python&logo=Python&color=3776AB&message=3)](https://www.python.org/)
11
11
  [![PyPI version](https://badge.fury.io/py/RingsPy.svg)](https://badge.fury.io/py/RingsPy)
12
+ [![Anaconda-Server Badge](https://anaconda.org/conda-forge/ringspy/badges/version.svg)](https://anaconda.org/conda-forge/ringspy)
12
13
  [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
13
14
  [![Tests](https://github.com/kingyin3613/RingsPy/actions/workflows/tests.yml/badge.svg)](https://github.com/kingyin3613/RingsPy/actions/workflows/tests.yml)
14
15
  [![codecov](https://codecov.io/gh/kingyin3613/RingsPy/branch/main/graph/badge.svg?token=4AZN3HGGET)](https://codecov.io/gh/kingyin3613/RingsPy)
@@ -17,9 +18,9 @@ Description: # RingsPy
17
18
  RingsPy is a Voronoi diagrams-based geometric generation tool that generates 3D meshes and models of prismatic cellular solids with radial growth rules.
18
19
 
19
20
  ## Dependencies and Installation
20
-
21
+ RingsPy depends on mainstream Python libraries ``numpy`` and ``scipy``, and optionally depends on library ``hexalattice``, if the regular hexagonal lattice (e.g. honeycomb) is wanted; also ``vtk``, if the 3D STL files are also wanted.
21
22
  ### 1. pip install
22
- To install RingsPy, one may use:
23
+ To install RingsPy, one may use `pip`:
23
24
  ```bash
24
25
  pip install RingsPy
25
26
  ```
@@ -29,9 +30,13 @@ Description: # RingsPy
29
30
  ```
30
31
  to get updates beyond the latest release.
31
32
 
32
- RingsPy depends on mainstream Python libraries ``numpy`` and ``scipy``, and optionally depends on library ``hexalattice``, if the regular hexagonal lattice (e.g. honeycomb) is wanted; also ``vtk``, if the 3D STL files are also wanted.
33
+ ### 2. conda install
34
+ If you are on Linux or Mac, you can also use `conda-forge` channel:
35
+ ```bash
36
+ conda install -c conda-forge ringspy
37
+ ```
33
38
 
34
- ### 2. Installation Check
39
+ ### 3. Installation Check
35
40
 
36
41
  There are some unit tests in [tests](https://github.com/kingyin3613/RingsPy/tree/main/tests/). One can use ``pytest`` to check whether the installation is successful by running this command:
37
42
 
@@ -1,6 +1,6 @@
1
1
  [metadata]
2
2
  name = RingsPy
3
- version = 0.3.2
3
+ version = 0.3.4
4
4
  author = Hao Yin
5
5
  author_email = haoyin2022@u.northwestern.edu
6
6
  description = A geometric generation tool for prismatic cellular solids
@@ -35,14 +35,14 @@ install_requires =
35
35
  requests>=2
36
36
  numpy
37
37
  scipy
38
- matplotlib >= 3.2.2
38
+ matplotlib>=3.2.2
39
39
  hexalattice
40
40
  vtk
41
41
  setup_requires =
42
42
  requests>=2
43
43
  numpy
44
44
  scipy
45
- matplotlib >= 3.2.2
45
+ matplotlib>=3.2.2
46
46
  hexalattice
47
47
  vtk
48
48
  python_requires = >=3.6
File without changes
File without changes
File without changes
File without changes
File without changes