Merge pull request #230 from WEgeophysics/develop

Develop

MANIFEST.in

@@ -16,6 +16,19 @@ include setup.cfg
 include watex/utils/epsg.npy
 include .coveragerc
 
+# Include specific files from the 'watex' package
+include watex/utils/_openmp_helpers.pxd
+include watex/utils/espg.npy
+recursive-include watex/etc *.*
+include watex/wlog.yml
+recursive-include watex/wlogfiles *.txt
+
+# Include .pxd files located in the watex root and subdirectories
+global-include watex/*.pxd
+
+# Include 'examples' directory Python scripts and text files
+recursive-include examples *.py *.txt
+
 # exclude from sdist
 recursive-exclude asv_benchmarks *
 recursive-exclude examples *.png 

docs/conf.py

@@ -17,7 +17,7 @@
 import re 
 import time 
 
-import sphinx_gallery
+import sphinx_gallery # noqa 
 from sphinx_gallery.sorting import ExampleTitleSortKey
 
 
@@ -46,8 +46,10 @@
 copyright = f"2022-{time.strftime('%Y')}"
 author = 'K. Laurent Kouadio'
 # The full version, including alpha/beta/rc tags
-try : version = release = watex._version.version
-except : version = release = watex.__version__
+try :
+    version = release = watex._version.version
+except :
+    version = release = watex.__version__
 
 # -- General configuration ---------------------------------------------------
 

pyproject.toml

@@ -1,29 +1,85 @@
 [build-system]
-requires = ["setuptools >= 61.0.0",
-             "wheel", 
-             "setuptools_scm>=6.2", 
-             "Cython>=0.29.33",
-        ]
+requires = ["setuptools>=61.0.0", "wheel", "setuptools_scm>=6.2", "Cython>=0.29.33"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "watex"
-version="0.3.0"
+version = "0.3.1"
+description = "Machine learning research in water exploration"
+readme = "README.md"
+authors = [{name = "Laurent Kouadio", email = "etanoyau@gmail.com"}]
+license = {file = "LICENSE"}
+keywords = ["exploration", "groundwater", "machine learning", "water", "hydro-geophysics"]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Science/Research",
+    "Intended Audience :: Developers",
+    "Topic :: Software Development",
+    "Topic :: Scientific/Engineering",
+    "Programming Language :: C",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Operating System :: OS Independent",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX",
+    "Operating System :: Unix",
+]
+dependencies = [
+    "seaborn>=0.12.0",
+    "pandas>=1.4.0",
+    "Cython>=0.29.33",
+    "PyYAML>=5.0.0",
+    "openpyxl>=3.0.3",
+    "pyproj>=3.3.0",
+    "pycsamt>=1.1.2",
+    "tqdm>=4.64.1",
+    "tables>=3.6.0",
+    "scikit-learn==1.2.1",
+    "joblib>=1.2.0",
+    "threadpoolctl>=3.1.0",
+    "matplotlib==3.5.3",
+    "statsmodels>=0.13.1",
+    "numpy>=1.23.0",
+    "scipy>=1.9.0",
+    "h5py>=3.2.0",
+    "pytest"
+]
+
+requires-python = ">=3.9"
 
 [project.optional-dependencies]
-dev  = ["click", 
-       "missingno>=0.4.2", 
-       "yellowbrick>=1.5.0", 
-       "pyjanitor>=0.1.7", 
-       "mlxtend>=0.21"
- ]
+dev = [
+    "click",
+    "missingno>=0.4.2",
+    "yellowbrick>=1.5.0",
+    "pyjanitor>=0.1.7",
+    "mlxtend>=0.21",
+    "xgboost>=1.7.0",
+]
+
+[project.urls]
+"Home" = "https://watex.readthedocs.io"
+"Documentation" = "https://watex.readthedocs.io/en/latest/api_references.html"
+"Bugs Tracker" = "https://github.com/WEgeophysics/watex/issues"
+"Installation Guide" = "https://watex.readthedocs.io/en/latest/installation.html"
+"User Guide" = "https://watex.readthedocs.io/en/latest/user_guide.html"
+"Source" = "https://github.com/WEgeophysics/watex"
+"Download" = "https://pypi.org/project/watex/#files"
 
-[tool.setuptools.dynamic]
-version = {attr = "watex._version.version"}
 
 [tool.setuptools_scm]
 write_to = "watex/_version.py"
 
+[project.scripts]
+wx = "watex.cli:cli"
+version = "watex.cli:version"
+
+[tool.setuptools.dynamic]
+version = {attr = "watex._version.version"}
+
 [tool.pytest.ini_options]
 minversion = "6.0"
 doctest_optionflags = "NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL"
@@ -40,4 +96,4 @@ exclude = '''
   | docs/_build
   | docs/glr_examples
 )/
-'''
+'''

setup.cfg

@@ -69,3 +69,7 @@ ignore =
 [codespell]
 skip = ./.git,./.mypy_cache,./docs/_build,./docs/glr_examples,./docs/modules/generated
 ignore-words = build_tools/codespell_ignore_words.txt
+
+[options.package_data]
+watex = utils/_openmp_helpers.pxd, utils/espg.npy, etc/*, wlog.yml, wlogfiles/*.txt
+* = *.pxd, data/*, examples/*.py, examples/*.txt

setup.py

@@ -16,7 +16,7 @@
 # We can actually import watex version from 
 # in editable mode :$ python -m pip install -e .
 try: 
-    import watex  # noqa
+    import watex  
     VERSION = watex.__version__
 except: VERSION ='0.3.1'
 # set global variables 

watex/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '0.3.0.dev1+g10707dc.d20230709'
-__version_tuple__ = version_tuple = (0, 3, 0, 'dev1', 'g10707dc.d20230709')
+__version__ = version = '0.3.1.dev1+g10707dc.d20230709'
+__version_tuple__ = version_tuple = (0, 3, 2, 'dev1', 'g10707dc.d20230709')

watex/cases/modeling.py

@@ -46,7 +46,6 @@
 
 # import  watex.exceptions as Wex 
 # import  watex.decorators as deco
-
 _logger =watexlog().get_watex_logger(__name__)
 
 __all__=["BaseModel"]