From 1c6a1ff86ffa53cf2294f57451a4780079e915f6 Mon Sep 17 00:00:00 2001 From: Simon Zhao Date: Tue, 12 Sep 2023 15:02:33 +0800 Subject: [PATCH] Revert dependency versions Signed-off-by: Simon Zhao --- .github/workflows/azureml-cpu-nightly.yml | 2 +- .github/workflows/azureml-gpu-nightly.yml | 2 +- .github/workflows/azureml-spark-nightly.yml | 2 +- .github/workflows/azureml-unit-tests.yml | 2 +- setup.py | 65 +++++++++++---------- 5 files changed, 38 insertions(+), 35 deletions(-) diff --git a/.github/workflows/azureml-cpu-nightly.yml b/.github/workflows/azureml-cpu-nightly.yml index 4394a5161..e2142a231 100644 --- a/.github/workflows/azureml-cpu-nightly.yml +++ b/.github/workflows/azureml-cpu-nightly.yml @@ -67,7 +67,7 @@ jobs: strategy: max-parallel: 50 # Usage limits: https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration matrix: - python-version: ['"python=3.8"', '"python=3.9"'] #, '"python=3.10"'] + python-version: ['"python=3.8"', '"python=3.9"'] test-group: ${{ fromJSON(needs.get-test-groups.outputs.test_groups) }} steps: - name: Check out repository code diff --git a/.github/workflows/azureml-gpu-nightly.yml b/.github/workflows/azureml-gpu-nightly.yml index 6b61490af..dcf0bc102 100644 --- a/.github/workflows/azureml-gpu-nightly.yml +++ b/.github/workflows/azureml-gpu-nightly.yml @@ -67,7 +67,7 @@ jobs: strategy: max-parallel: 50 # Usage limits: https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration matrix: - python-version: ['"python=3.8"', '"python=3.9"'] #, '"python=3.10"'] + python-version: ['"python=3.8"', '"python=3.9"'] test-group: ${{ fromJSON(needs.get-test-groups.outputs.test_groups) }} steps: - name: Check out repository code diff --git a/.github/workflows/azureml-spark-nightly.yml b/.github/workflows/azureml-spark-nightly.yml index a32ef80a2..434929c2e 100644 --- a/.github/workflows/azureml-spark-nightly.yml +++ b/.github/workflows/azureml-spark-nightly.yml @@ -66,7 +66,7 @@ jobs: strategy: max-parallel: 50 # Usage limits: https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration matrix: - python-version: ['"python=3.8"', '"python=3.9"'] #, '"python=3.10"'] + python-version: ['"python=3.8"', '"python=3.9"'] test-group: ${{ fromJSON(needs.get-test-groups.outputs.test_groups) }} steps: - name: Check out repository code diff --git a/.github/workflows/azureml-unit-tests.yml b/.github/workflows/azureml-unit-tests.yml index abd7f447d..458f68616 100644 --- a/.github/workflows/azureml-unit-tests.yml +++ b/.github/workflows/azureml-unit-tests.yml @@ -54,7 +54,7 @@ jobs: strategy: max-parallel: 50 # Usage limits: https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration matrix: - python-version: ['"python=3.8"', '"python=3.9"'] #, '"python=3.10"'] + python-version: ['"python=3.8"', '"python=3.9"'] test-group: ${{ fromJSON(needs.get-test-groups.outputs.test_groups) }} steps: - name: Check out repository code diff --git a/setup.py b/setup.py index b6f5987ea..ccdcc2028 100644 --- a/setup.py +++ b/setup.py @@ -27,46 +27,50 @@ version += ".post" + str(int(time.time())) install_requires = [ - "pandas>1.5.2,<1.6", # requires numpy - "scikit-learn>=1.1.3,<2", # requires scipy - "numba>=0.57.0,<1", - "lightfm>=1.17,<2", - "lightgbm>=3.3.2,<5", - "memory-profiler>=0.61.0,<1", - "nltk>=3.8.1,<4", # requires tqdm - "seaborn>=0.12.0,<1", # requires matplotlib - "transformers>=4.27.0,<5", # requires pyyaml, tqdm - "category-encoders>=2.6.0,<3", - "jinja2>=3.1.0,<3.2", - "cornac>=1.15.2,<2", # requires tqdm - "retrying>=1.3.4", - "pandera[strategies]>=0.15.0", # For generating fake datasets - "scikit-surprise>=1.1.3", + "numpy>=1.19", # 1.19 required by tensorflow 2.6 + "pandas>1.0.3,<2", # requires numpy + "scipy>=1.0.0,<1.11.0", # FIXME: We limit <1.11.0 until #1954 is fixed + "scikit-learn>=0.22.1,<1.0.3", # requires scipy + "numba>=0.38.1,<1", + "lightfm>=1.15,<2", + "lightgbm>=2.2.1", + "memory-profiler>=0.54.0,<1", + "nltk>=3.4,<4", # requires tqdm + "seaborn>=0.8.1,<1", # requires matplotlib + "transformers>=2.5.0,<5", # requires pyyaml, tqdm + "category-encoders>=2.5.0,<2", + "jinja2>=2,<3.1", + "cornac>=1.1.2,<1.15.2;python_version<='3.7'", # requires tqdm + "cornac>=1.15.2,<2;python_version>='3.8'", # After 1.15.2, Cornac requires python 3.8 + "retrying>=1.3.3", + "pandera[strategies]>=0.6.5", # For generating fake datasets + "scikit-surprise>=1.0.6", "scrapbook>=0.5.0,<1.0.0", # requires tqdm, papermill - "hyperopt>=0.2.7,<1", - "notebook>=7.0.0,<8", # requires jupyter, ipykernel - "locust>=2.12.2,<3", + "hyperopt>=0.1.2,<1", + "notebook>=5.0.0,<8", # requires jupyter, ipykernel + "locust>=1,<2", ] # shared dependencies extras_require = { "gpu": [ - "nvidia-ml-py>=11.510.69", - # TensorFlow compiled with CUDA 11.8, cudnn 8.6 - "tensorflow>=2.12.0", + "nvidia-ml-py>=7.352.0", + # TensorFlow compiled with CUDA 11.2, cudnn 8.1 + "tensorflow~=2.6.1;python_version=='3.6'", + "tensorflow~=2.7.0;python_version>='3.7'", "tf-slim>=1.1.0", - "torch>=2.0.1", - "fastai>=2.7.11,<3", + "torch>=1.8", # for CUDA 11 support + "fastai>=1.0.46,<2", ], "spark": [ - "pyarrow>=10.0.1", - "pyspark>=3.4.0", + "pyarrow>=0.12.1,<7.0.0", + "pyspark>=2.4.5,<3.3.0", ], "dev": [ - "black>=23.3.0,<24", - "pytest>=7.2.1", - "pytest-cov>=4.1.0", - "pytest-mock>=3.10.0", # for access to mock fixtures in pytest + "black>=18.6b4,<21", + "pytest>=3.6.4", + "pytest-cov>=2.12.1", + "pytest-mock>=3.6.1", # for access to mock fixtures in pytest ], } # For the brave of heart @@ -109,7 +113,6 @@ "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", - # "Programming Language :: Python :: 3.10", "Operating System :: POSIX :: Linux", ], extras_require=extras_require, @@ -117,7 +120,7 @@ "machine learning python spark gpu", install_requires=install_requires, package_dir={"recommenders": "recommenders"}, - python_requires=">=3.8, <=3.9", + python_requires=">=3.6, <=3.9", packages=find_packages( where=".", exclude=["contrib", "docs", "examples", "scenarios", "tests", "tools"],