v0.10.6

Techtonique · Mar 21, 2024 · f775337 · f775337
1 parent d2263f6
commit f775337
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 45 deletions.
diff --git a/dist/mlsauce-0.10.6-cp311-cp311-macosx_14_0_x86_64.whl b/dist/mlsauce-0.10.6-cp311-cp311-macosx_14_0_x86_64.whl
diff --git a/dist/mlsauce-0.10.6.tar.gz b/dist/mlsauce-0.10.6.tar.gz
diff --git a/mlsauce.egg-info/PKG-INFO b/mlsauce.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlsauce
-Version: 0.10.5
+Version: 0.10.6
 Summary: Miscellaneous Statistical/Machine Learning tools
 Maintainer: T. Moudiki
 Maintainer-email: [email protected]

diff --git a/mlsauce.egg-info/SOURCES.txt b/mlsauce.egg-info/SOURCES.txt
@@ -2,6 +2,8 @@ LICENSE
 README.md
 setup.cfg
 setup.py
+./mlsauce/adaopt/_adaoptc.c
+./mlsauce/booster/_boosterc.c
 mlsauce/__init__.py
 mlsauce/_config.py
 mlsauce/setup.py
@@ -13,28 +15,23 @@ mlsauce.egg-info/requires.txt
 mlsauce.egg-info/top_level.txt
 mlsauce/adaopt/__init__.py
 mlsauce/adaopt/_adaopt.py
-mlsauce/adaopt/_adaoptc.c
 mlsauce/adaopt/setup.py
 mlsauce/booster/__init__.py
 mlsauce/booster/_booster_classifier.py
 mlsauce/booster/_booster_regressor.py
-mlsauce/booster/_boosterc.c
 mlsauce/booster/setup.py
 mlsauce/datasets/__init__.py
 mlsauce/datasets/dowload.py
 mlsauce/encoders/__init__.py
 mlsauce/encoders/target_encoders.py
 mlsauce/lasso/__init__.py
 mlsauce/lasso/_lasso.py
-mlsauce/lasso/_lassoc.c
 mlsauce/lasso/setup.py
 mlsauce/ridge/__init__.py
 mlsauce/ridge/_ridge.py
-mlsauce/ridge/_ridgec.c
 mlsauce/ridge/setup.py
 mlsauce/stump/__init__.py
 mlsauce/stump/_stump_classifier.py
-mlsauce/stump/_stumpc.c
 mlsauce/stump/setup.py
 mlsauce/tests/__init__.py
 mlsauce/tests/test_adaopt.py

diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
 MAINTAINER_EMAIL = '[email protected]'
 LICENSE = 'BSD3 Clause Clear'
 
-__version__ = '0.10.5'
+__version__ = '0.10.6'
 
 VERSION = __version__
 
@@ -144,14 +144,14 @@ def run(self):
 ]
 
 # Get the absolute path to the directory containing the setup script
-script_dir = Path(__file__).resolve().parent
+script_dir = "./"
 print(f"\n Absolute path to the directory containing the setup script: \n {script_dir} \n")
 # Get absolute paths to Cython source files
-adaopt_cython_file = str(script_dir / 'mlsauce' / 'adaopt' / '_adaoptc.pyx')
-booster_cython_file = str(script_dir / 'mlsauce' / 'booster' / '_boosterc.pyx')
-lasso_cython_file = str(script_dir / 'mlsauce' / 'lasso' / '_lassoc.pyx')
-ridge_cython_file = str(script_dir / 'mlsauce' / 'ridge' / '_ridgec.pyx')
-stump_cython_file = str(script_dir / 'mlsauce' / 'stump' / '_stumpc.pyx')
+adaopt_cython_file = str(script_dir + 'mlsauce/adaopt/_adaoptc.pyx')
+booster_cython_file = str(script_dir + 'mlsauce/booster/_boosterc.pyx')
+lasso_cython_file = str(script_dir + 'mlsauce/lasso/_lassoc.pyx')
+ridge_cython_file = str(script_dir + 'mlsauce/ridge/_ridgec.pyx')
+stump_cython_file = str(script_dir + 'mlsauce/stump/_stumpc.pyx')
 # Update Extension definitions with absolute paths
 ext_modules2 = [
     Extension(name="mlsauce.adaopt._adaoptc", 
@@ -192,6 +192,10 @@ def setup_package():
 
     install_requires = [item for sublist in [install_all_requires, install_jax_requires] for item in sublist]
 
+    try: 
+        cythonize_ext_modules = cythonize(ext_modules2) 
+    except: 
+        cythonize_ext_modules = cythonize(ext_modules) 
     metadata = dict(name=DISTNAME,
                     maintainer=MAINTAINER,
                     maintainer_email=MAINTAINER_EMAIL,
@@ -216,39 +220,11 @@ def setup_package():
                     setup_requires=["numpy>= 1.13.0"],
                     package_data={'': ['*.pxd']},
                     packages=find_packages(),                    
-                    ext_modules=cythonize(ext_modules),
+                    ext_modules=cythonize_ext_modules,
                     **extra_setuptools_args)    
-
-    metadata2 = dict(name=DISTNAME,
-                    maintainer=MAINTAINER,
-                    maintainer_email=MAINTAINER_EMAIL,
-                    description=DESCRIPTION,
-                    license=LICENSE,
-                    version=VERSION,
-                    long_description=LONG_DESCRIPTION,
-                    classifiers=['Development Status :: 2 - Pre-Alpha',
-                                 'Intended Audience :: Developers',
-                                 'License :: OSI Approved :: BSD License',
-                                 'Natural Language :: English',
-                                 'Programming Language :: Python :: 3',
-                                  'Programming Language :: Python :: 3.5',
-                                 'Programming Language :: Python :: 3.6',
-                                 'Programming Language :: Python :: 3.7',
-                                 'Programming Language :: Python :: 3.8',
-                                 ],
-                    cmdclass=cmdclass,                    
-                    platforms=["linux", "macosx", "windows"],
-                    python_requires=">=3.5",
-                    install_requires=install_requires,
-                    setup_requires=["numpy>= 1.13.0"],
-                    package_data={'': ['*.pxd']},
-                    packages=find_packages(),                    
-                    ext_modules=cythonize(ext_modules2),
-                    **extra_setuptools_args)    
-    try: 
-        setup(**metadata2)
-    except:
-        setup(**metadata)
+
+
+    setup(**metadata)
 
 if __name__ == "__main__":
     setup_package()