geone 1.2.10__tar.gz → 1.2.11__tar.gz

{geone-1.2.10 → geone-1.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geone
-Version: 1.2.10
+Version: 1.2.11
 Summary: Geostatistics tools and Multiple Point Statistics
 Author-email: Julien Straubhaar <julien.straubhaar@unine.ch>, Philippe Renard <philippe.renard@unine.ch>
 License: 
@@ -64,7 +64,7 @@ License:
         
 Project-URL: Repository, https://github.com/randlab/geone
 Project-URL: Issues, https://github.com/randlab/geone/issues
-Keywords: Geostatistics,Multiple Point Statistics,deesse,two point statistics,simulation,kriging
+Keywords: Geostatistics,Multiple Point Statistics,deesse,two point statistics,covariance,variogram,simulation,kriging
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown

{geone-1.2.10 → geone-1.2.11}/geone.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geone
-Version: 1.2.10
+Version: 1.2.11
 Summary: Geostatistics tools and Multiple Point Statistics
 Author-email: Julien Straubhaar <julien.straubhaar@unine.ch>, Philippe Renard <philippe.renard@unine.ch>
 License: 
@@ -64,7 +64,7 @@ License:
         
 Project-URL: Repository, https://github.com/randlab/geone
 Project-URL: Issues, https://github.com/randlab/geone/issues
-Keywords: Geostatistics,Multiple Point Statistics,deesse,two point statistics,simulation,kriging
+Keywords: Geostatistics,Multiple Point Statistics,deesse,two point statistics,covariance,variogram,simulation,kriging
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown

geone-1.2.11/geone.egg-info/SOURCES.txt

@@ -0,0 +1,137 @@
+LICENSE
+README.md
+pyproject.toml
+setup.py
+geone.egg-info/PKG-INFO
+geone.egg-info/SOURCES.txt
+geone.egg-info/dependency_links.txt
+geone.egg-info/requires.txt
+geone.egg-info/top_level.txt
+src/geone/__init__.py
+src/geone/_version.py
+src/geone/blockdata.py
+src/geone/covModel.py
+src/geone/customcolors.py
+src/geone/deesseinterface.py
+src/geone/geosclassicinterface.py
+src/geone/grf.py
+src/geone/img.py
+src/geone/imgplot.py
+src/geone/imgplot3d.py
+src/geone/multiGaussian.py
+src/geone/pgs.py
+src/geone/randProcess.py
+src/geone/tools.py
+src/geone/lib_deesse_core/linux_py310/__init__.py
+src/geone/lib_deesse_core/linux_py310/_deesse.so
+src/geone/lib_deesse_core/linux_py310/deesse.py
+src/geone/lib_deesse_core/linux_py311/__init__.py
+src/geone/lib_deesse_core/linux_py311/_deesse.so
+src/geone/lib_deesse_core/linux_py311/deesse.py
+src/geone/lib_deesse_core/linux_py312/__init__.py
+src/geone/lib_deesse_core/linux_py312/_deesse.so
+src/geone/lib_deesse_core/linux_py312/deesse.py
+src/geone/lib_deesse_core/linux_py39/__init__.py
+src/geone/lib_deesse_core/linux_py39/_deesse.so
+src/geone/lib_deesse_core/linux_py39/deesse.py
+src/geone/lib_deesse_core/mac_arm64_py310/__init__.py
+src/geone/lib_deesse_core/mac_arm64_py310/_deesse.so
+src/geone/lib_deesse_core/mac_arm64_py310/deesse.py
+src/geone/lib_deesse_core/mac_arm64_py311/__init__.py
+src/geone/lib_deesse_core/mac_arm64_py311/_deesse.so
+src/geone/lib_deesse_core/mac_arm64_py311/deesse.py
+src/geone/lib_deesse_core/mac_arm64_py312/__init__.py
+src/geone/lib_deesse_core/mac_arm64_py312/_deesse.so
+src/geone/lib_deesse_core/mac_arm64_py312/deesse.py
+src/geone/lib_deesse_core/mac_arm64_py39/__init__.py
+src/geone/lib_deesse_core/mac_arm64_py39/_deesse.so
+src/geone/lib_deesse_core/mac_arm64_py39/deesse.py
+src/geone/lib_deesse_core/mac_x86_64_py310/__init__.py
+src/geone/lib_deesse_core/mac_x86_64_py310/_deesse.so
+src/geone/lib_deesse_core/mac_x86_64_py310/deesse.py
+src/geone/lib_deesse_core/mac_x86_64_py311/__init__.py
+src/geone/lib_deesse_core/mac_x86_64_py311/_deesse.so
+src/geone/lib_deesse_core/mac_x86_64_py311/deesse.py
+src/geone/lib_deesse_core/mac_x86_64_py312/__init__.py
+src/geone/lib_deesse_core/mac_x86_64_py312/_deesse.so
+src/geone/lib_deesse_core/mac_x86_64_py312/deesse.py
+src/geone/lib_deesse_core/mac_x86_64_py39/__init__.py
+src/geone/lib_deesse_core/mac_x86_64_py39/_deesse.so
+src/geone/lib_deesse_core/mac_x86_64_py39/deesse.py
+src/geone/lib_deesse_core/win_py310/__init__.py
+src/geone/lib_deesse_core/win_py310/_deesse.pyd
+src/geone/lib_deesse_core/win_py310/deesse.py
+src/geone/lib_deesse_core/win_py310/vcruntime140.dll
+src/geone/lib_deesse_core/win_py310/vcruntime140_1.dll
+src/geone/lib_deesse_core/win_py311/__init__.py
+src/geone/lib_deesse_core/win_py311/_deesse.pyd
+src/geone/lib_deesse_core/win_py311/deesse.py
+src/geone/lib_deesse_core/win_py311/vcruntime140.dll
+src/geone/lib_deesse_core/win_py311/vcruntime140_1.dll
+src/geone/lib_deesse_core/win_py312/__init__.py
+src/geone/lib_deesse_core/win_py312/_deesse.pyd
+src/geone/lib_deesse_core/win_py312/deesse.py
+src/geone/lib_deesse_core/win_py312/vcruntime140.dll
+src/geone/lib_deesse_core/win_py312/vcruntime140_1.dll
+src/geone/lib_deesse_core/win_py39/__init__.py
+src/geone/lib_deesse_core/win_py39/_deesse.pyd
+src/geone/lib_deesse_core/win_py39/deesse.py
+src/geone/lib_deesse_core/win_py39/vcruntime140.dll
+src/geone/lib_deesse_core/win_py39/vcruntime140_1.dll
+src/geone/lib_geosclassic_core/linux_py310/__init__.py
+src/geone/lib_geosclassic_core/linux_py310/_geosclassic.so
+src/geone/lib_geosclassic_core/linux_py310/geosclassic.py
+src/geone/lib_geosclassic_core/linux_py311/__init__.py
+src/geone/lib_geosclassic_core/linux_py311/_geosclassic.so
+src/geone/lib_geosclassic_core/linux_py311/geosclassic.py
+src/geone/lib_geosclassic_core/linux_py312/__init__.py
+src/geone/lib_geosclassic_core/linux_py312/_geosclassic.so
+src/geone/lib_geosclassic_core/linux_py312/geosclassic.py
+src/geone/lib_geosclassic_core/linux_py39/__init__.py
+src/geone/lib_geosclassic_core/linux_py39/_geosclassic.so
+src/geone/lib_geosclassic_core/linux_py39/geosclassic.py
+src/geone/lib_geosclassic_core/mac_arm64_py310/__init__.py
+src/geone/lib_geosclassic_core/mac_arm64_py310/_geosclassic.so
+src/geone/lib_geosclassic_core/mac_arm64_py310/geosclassic.py
+src/geone/lib_geosclassic_core/mac_arm64_py311/__init__.py
+src/geone/lib_geosclassic_core/mac_arm64_py311/_geosclassic.so
+src/geone/lib_geosclassic_core/mac_arm64_py311/geosclassic.py
+src/geone/lib_geosclassic_core/mac_arm64_py312/__init__.py
+src/geone/lib_geosclassic_core/mac_arm64_py312/_geosclassic.so
+src/geone/lib_geosclassic_core/mac_arm64_py312/geosclassic.py
+src/geone/lib_geosclassic_core/mac_arm64_py39/__init__.py
+src/geone/lib_geosclassic_core/mac_arm64_py39/_geosclassic.so
+src/geone/lib_geosclassic_core/mac_arm64_py39/geosclassic.py
+src/geone/lib_geosclassic_core/mac_x86_64_py310/__init__.py
+src/geone/lib_geosclassic_core/mac_x86_64_py310/_geosclassic.so
+src/geone/lib_geosclassic_core/mac_x86_64_py310/geosclassic.py
+src/geone/lib_geosclassic_core/mac_x86_64_py311/__init__.py
+src/geone/lib_geosclassic_core/mac_x86_64_py311/_geosclassic.so
+src/geone/lib_geosclassic_core/mac_x86_64_py311/geosclassic.py
+src/geone/lib_geosclassic_core/mac_x86_64_py312/__init__.py
+src/geone/lib_geosclassic_core/mac_x86_64_py312/_geosclassic.so
+src/geone/lib_geosclassic_core/mac_x86_64_py312/geosclassic.py
+src/geone/lib_geosclassic_core/mac_x86_64_py39/__init__.py
+src/geone/lib_geosclassic_core/mac_x86_64_py39/_geosclassic.so
+src/geone/lib_geosclassic_core/mac_x86_64_py39/geosclassic.py
+src/geone/lib_geosclassic_core/win_py310/__init__.py
+src/geone/lib_geosclassic_core/win_py310/_geosclassic.pyd
+src/geone/lib_geosclassic_core/win_py310/geosclassic.py
+src/geone/lib_geosclassic_core/win_py310/vcruntime140.dll
+src/geone/lib_geosclassic_core/win_py310/vcruntime140_1.dll
+src/geone/lib_geosclassic_core/win_py311/__init__.py
+src/geone/lib_geosclassic_core/win_py311/_geosclassic.pyd
+src/geone/lib_geosclassic_core/win_py311/geosclassic.py
+src/geone/lib_geosclassic_core/win_py311/vcruntime140.dll
+src/geone/lib_geosclassic_core/win_py311/vcruntime140_1.dll
+src/geone/lib_geosclassic_core/win_py312/__init__.py
+src/geone/lib_geosclassic_core/win_py312/_geosclassic.pyd
+src/geone/lib_geosclassic_core/win_py312/geosclassic.py
+src/geone/lib_geosclassic_core/win_py312/vcruntime140.dll
+src/geone/lib_geosclassic_core/win_py312/vcruntime140_1.dll
+src/geone/lib_geosclassic_core/win_py39/__init__.py
+src/geone/lib_geosclassic_core/win_py39/_geosclassic.pyd
+src/geone/lib_geosclassic_core/win_py39/geosclassic.py
+src/geone/lib_geosclassic_core/win_py39/vcruntime140.dll
+src/geone/lib_geosclassic_core/win_py39/vcruntime140_1.dll
+tests/test_estimator.py

{geone-1.2.10 → geone-1.2.11}/pyproject.toml

@@ -20,7 +20,7 @@ authors = [
 
 
 readme = "README.md"
-keywords = ["Geostatistics", "Multiple Point Statistics", "deesse", "two point statistics", "simulation", "kriging"]
+keywords = ["Geostatistics", "Multiple Point Statistics", "deesse", "two point statistics", "covariance", "variogram", "simulation", "kriging"]
 classifiers = [
     "Programming Language :: Python :: 3",
 #     "License :: OSI Approved :: MIT License",

{geone-1.2.10 → geone-1.2.11}/setup.py

@@ -3,11 +3,9 @@
 # or
 #    pip install . -v
 
-import sys, os, platform
+import sys, os, platform, glob
 import setuptools
 
-src_dir = 'src'
-
 COL_CONFIG = '\033[1;36m\033[40m' # bold cyan on black
 COL_ERR = '\033[1;91m'            # high-intensity bold red
 COL_RESET = '\033[0m'
@@ -38,9 +36,9 @@ except:
 
 print(f'{COL_CONFIG}Your configuration: platform_system={platform_system}, python_version={python_version}, glibc_version={glibc_version}{COL_RESET}')
 
-# Set subdir_name: name of the subdirectory containing the C libraries,
+# Set subdir_selected: name of the subdirectory containing the C libraries to be installed,
 # according to the platform system, the version of python and the version of glibc
-# [subdir_name = <prefix>_<suffix>]
+# [subdir_selected = <prefix>_<suffix>]
 
 # Set prefix
 if platform_system == 'Windows':
@@ -83,19 +81,33 @@ elif python_version == (3, 12):
 else:
     suffix = None
 
-# Set subdir_name
+# Set subdir_selected
 if prefix is None or suffix is None:
-    subdir_name = None
+    subdir_selected = None
 else:
-    subdir_name = f'{prefix}_{suffix}'
+    subdir_selected = f'{prefix}_{suffix}'
+
+# Set directories containing the libraries and data files to be kept in source when building package
+supported_py_version = ['39', '310', '311', '312']
+supported_lib = ['linux', 'mac_x86_64', 'mac_arm64', 'win']
+lib_subdir_list = ['_py'.join([li, py]) for li in supported_lib for py in supported_py_version]
 
-if subdir_name is None:
+if subdir_selected is None or subdir_selected not in lib_subdir_list:
+# if subdir_selected is None or not os.path.isdir(f'src/geone/lib_deesse_core/{subdir_selected}'):
     print(f'{COL_ERR}ERROR: package geone not available for your configuration [platform_system={platform_system}, python_version={python_version}, glibc_version={glibc_version}]{COL_RESET}')
-    exit()
+    # exit()
+
+# Set directories containing the libraries of the right version
+deesse_core_dir_selected = f'src/geone/lib_deesse_core/{subdir_selected}'
+geosclassic_core_dir_selected = f'src/geone/lib_geosclassic_core/{subdir_selected}'
 
-# Set directories containing the libraries
-deesse_core_dir = f'{src_dir}/geone/deesse_core/{subdir_name}'
-geosclassic_core_dir = f'{src_dir}/geone/geosclassic_core/{subdir_name}'
+lib_deesse_target_dir_list = [f'src.geone.lib_deesse_core.{d}' for d in lib_subdir_list]
+lib_deesse_files_list = [glob.glob(f'src/geone/lib_deesse_core/{d}/*', root_dir=None) for d in lib_subdir_list]
+
+lib_geosclassic_target_dir_list = [f'src.geone.lib_geosclassic_core.{d}' for d in lib_subdir_list]
+lib_geosclassic_files_list = [glob.glob(f'src/geone/lib_geosclassic_core/{d}/*', root_dir=None) for d in lib_subdir_list]
+
+data_files = list(zip(lib_deesse_target_dir_list, lib_deesse_files_list)) + list(zip(lib_geosclassic_target_dir_list, lib_geosclassic_files_list))
 
 # Set long_description
 with open("README.md", "r") as file_handle:
@@ -103,22 +115,31 @@ with open("README.md", "r") as file_handle:
 
 # Load version
 __version__ = '0.0.0' # default
-with open(f'{src_dir}/geone/_version.py', 'r') as f:
+with open(f'src/geone/_version.py', 'r') as f:
     exec(f.read())
 
 setuptools.setup(
     name='geone',
     version=__version__,
-    # author="Julien Straubhaar",
-    # author_email="julien.straubhaar@unine.ch",
-    # description="Geostatistics tools and Multiple Point Statistics",
     long_description=long_description,
     long_description_content_type='text/markdown',
-    # url='https://github.com/randlab/geone',
-    # install_requires=['matplotlib', 'numpy>=1,<2', 'pandas', 'pyvista', 'scipy'],
     packages=['geone', 'geone.deesse_core', 'geone.geosclassic_core'],
-    package_dir={'geone':f'{src_dir}/geone', 'geone.deesse_core':deesse_core_dir, 'geone.geosclassic_core':geosclassic_core_dir},
-    package_data={'geone.deesse_core':['*'], 'geone.geosclassic_core':['*']},
+    package_dir={
+        'geone':'src/geone',
+        'geone.deesse_core':deesse_core_dir_selected,
+        'geone.geosclassic_core':geosclassic_core_dir_selected
+        },
+    package_data={
+        'geone.deesse_core':['*'],
+        'geone.geosclassic_core':['*']
+        },
     include_package_data=True,
+    data_files=data_files, # sources (lib) for all platforms
     license=open('LICENSE', encoding='utf-8').read()
+    # # already defined in pyproject.toml...
+    # author="Julien Straubhaar",
+    # author_email="julien.straubhaar@unine.ch",
+    # description="Geostatistics tools and Multiple Point Statistics",
+    # url='https://github.com/randlab/geone',
+    # install_requires=['matplotlib', 'numpy>=1,<2', 'pandas', 'pyvista', 'scipy'],
 )

{geone-1.2.10 → geone-1.2.11}/src/geone/_version.py

@@ -1,6 +1,6 @@
 # Version
 
 # major, minor, micro
-version_info = (1, 2, 10)
+version_info = (1, 2, 11)
 
 __version__ = '.'.join(map(str, version_info))

geone-1.2.11/src/geone/lib_deesse_core/linux_py311/__init__.py

@@ -0,0 +1,5 @@
+# import all modules...
+try:
+    import geone.deesse_core.deesse
+except ImportError:
+    pass