-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #15 from Techtonique/install-ms
remove dust
- Loading branch information
Showing
8 changed files
with
33 additions
and
142 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,13 @@ | ||
| absl-py==0.11.0 | ||
| cycler==0.10.0 | ||
| numpy>=1.12 | ||
| Cython==0.29.21 | ||
| flatbuffers==1.12 | ||
| jax==0.2.9 | ||
| jaxlib==0.1.60 | ||
| joblib==1.0.0 | ||
| kiwisolver==1.3.1 | ||
| matplotlib==3.3.4 | ||
| numpy>=1.12 | ||
| opt-einsum==3.3.0 | ||
| pandas==1.2.1 | ||
| Pillow==9.0.1 | ||
| pymongo==3.11.3 | ||
| pyparsing==2.4.7 | ||
| python-dateutil==2.8.1 | ||
| pytz==2021.1 | ||
| querier==0.4.0 | ||
| scikit-learn==0.24.1 | ||
| scipy==1.6.0 | ||
| six==1.15.0 | ||
| sklearn==0.0 | ||
| SQLAlchemy==1.3.23 | ||
| threadpoolctl==2.1.0 | ||
| tqdm==4.56.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,12 +3,14 @@ | |
| # Copyright (C) 2020 T. Moudiki <[email protected]> | ||
| # License: 3-clause BSD | ||
|
|
||
| import subprocess | ||
| import sys | ||
| import os | ||
| import platform | ||
| import shutil | ||
| from distutils.command.clean import clean as Clean | ||
| from pkg_resources import parse_version | ||
| from setuptools import find_packages | ||
| import traceback | ||
| import importlib | ||
| try: | ||
|
|
@@ -17,12 +19,10 @@ | |
| # Python 2 compat: just to be able to declare that Python >=3.5 is needed. | ||
| import __builtin__ as builtins | ||
|
|
||
| # This is a bit (!) hackish: we are setting a global variable so that the | ||
| # main mlsauce __init__ can detect if it is being loaded by the setup | ||
| # routine, to avoid attempting to load components that aren't built yet: | ||
| # the numpy distutils extensions that are used by mlsauce to | ||
| # recursively build the compiled extensions in sub-packages is based on the | ||
| # Python import machinery. | ||
| subprocess.run(['pip', 'install', 'numpy>= 1.13.0']) | ||
| subprocess.run(['pip', 'install', 'scipy>= 0.19.0']) | ||
| subprocess.run(['pip', 'install', 'Cython==0.29.21']) | ||
|
|
||
| builtins.__MLSAUCE_SETUP__ = True | ||
|
|
||
|
|
||
|
|
@@ -37,7 +37,7 @@ | |
| # does not need the compiled code | ||
| import mlsauce | ||
|
|
||
| __version__ = '0.8.8' | ||
| __version__ = '0.8.9' | ||
|
|
||
| VERSION = __version__ | ||
|
|
||
|
|
@@ -230,17 +230,20 @@ def setup_package(): | |
| 'scipy>={}'.format(SCIPY_MIN_VERSION), | ||
| 'joblib>={}'.format(JOBLIB_MIN_VERSION), | ||
| 'scikit-learn>={}'.format(SKLEARN_MIN_VERSION), | ||
| 'threadpoolctl>={}'.format(THREADPOOLCTL_MIN_VERSION), | ||
| #'threadpoolctl>={}'.format(THREADPOOLCTL_MIN_VERSION), | ||
| 'pandas>={}'.format(PANDAS_MIN_VERSION), | ||
| 'querier>={}'.format(QUERIER_MIN_VERSION) | ||
| #'querier>={}'.format(QUERIER_MIN_VERSION) | ||
| ] | ||
|
|
||
| install_jax_requires = [ | ||
| 'jax>={}'.format(JAX_MIN_VERSION), | ||
| 'jaxlib>={}'.format(JAXLIB_MIN_VERSION) | ||
| ] if platform.system() in ('Linux', 'Darwin') else [] | ||
|
|
||
| other_requirements = ["tqdm==4.48.1", "pymongo >= 3.10.1", "SQLAlchemy >= 1.3.18"] | ||
| other_requirements = ["tqdm==4.48.1", | ||
| #"pymongo >= 3.10.1", | ||
| #"SQLAlchemy >= 1.3.18" | ||
| ] | ||
|
|
||
| install_requires = [item for sublist in [install_jax_requires, install_all_requires, other_requirements] for item in sublist] | ||
|
|
||
|
|
@@ -264,7 +267,9 @@ def setup_package(): | |
| cmdclass=cmdclass, | ||
| python_requires=">=3.5", | ||
| install_requires=install_requires, | ||
| setup_requires=["numpy>= 1.13.0"], | ||
| package_data={'': ['*.pxd']}, | ||
| packages=find_packages(), | ||
| **extra_setuptools_args) | ||
|
|
||
| if len(sys.argv) == 1 or ( | ||
|
|
||