Skip to content

Commit

Permalink
Merge pull request #1627 from microsoft/andreas/tests_python_37
Browse files Browse the repository at this point in the history
Upgrade Python from 3.6 to 3.7 in ADO tests pipeline
  • Loading branch information
anargyri authored Jan 31, 2022
2 parents 77fddff + 494accd commit 1fee90e
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Another alternative is to run all the recommender utilities directly from a loca
### Requirements

* A machine running Linux, MacOS or Windows
* An optional requirement is Anaconda with Python version >= 3.6
* An optional requirement is Anaconda with Python version >= 3.6, <= 3.9
* This is pre-installed on Azure DSVM such that one can run the following steps directly. To setup on your local machine, [Miniconda](https://docs.conda.io/en/latest/miniconda.html) is a quick way to get started.

Alternatively a [virtual environment](#using-a-virtual-environment) can be used instead of Anaconda.
Expand Down
2 changes: 1 addition & 1 deletion tests/ci/azure_pipeline_test/dsvm_nightly_linux_cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ extends:
task_name: "Test - Nightly Linux CPU"
timeout: 180
conda_env: "nightly_linux_cpu"
conda_opts: "python=3.6"
conda_opts: "python=3.7"
pip_opts: "[examples,dev,experimental] 'scikit-surprise@https://github.com/NicolasHug/Surprise/archive/refs/tags/v1.1.1.tar.gz' 'pymanopt@https://github.com/pymanopt/pymanopt/archive/fb36a272cdeecb21992cfd9271eb82baafeb316d.zip' --no-cache --no-binary scikit-surprise"
pytest_markers: "not spark and not gpu"
pytest_params: "-x"
2 changes: 1 addition & 1 deletion tests/ci/azure_pipeline_test/dsvm_nightly_linux_gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extends:
task_name: "Test - Nightly Linux GPU"
timeout: 420
conda_env: "nightly_linux_gpu"
conda_opts: "-c conda-forge python=3.6 cudatoolkit=11.2 cudnn=8.1"
conda_opts: "-c conda-forge python=3.7 cudatoolkit=11.2 cudnn=8.1"
pip_opts: "[gpu,examples,dev] -f https://download.pytorch.org/whl/cu111/torch_stable.html"
pytest_markers: "not spark and gpu"
pytest_params: "-x"
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ extends:
task_name: "Test - Nightly Linux Spark"
timeout: 180
conda_env: "nightly_linux_spark"
conda_opts: "python=3.6"
conda_opts: "python=3.7"
pip_opts: "[spark,examples,dev]"
pytest_markers: "spark and not gpu"
pytest_params: "-x"
2 changes: 1 addition & 1 deletion tests/ci/azure_pipeline_test/dsvm_notebook_linux_cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ extends:
- unit
task_name: "Test - Unit Notebook Linux CPU"
conda_env: "unit_notebook_linux_cpu"
conda_opts: "python=3.6"
conda_opts: "python=3.7"
pip_opts: "[examples,dev,experimental] 'scikit-surprise@https://github.com/NicolasHug/Surprise/archive/refs/tags/v1.1.1.tar.gz' 'pymanopt@https://github.com/pymanopt/pymanopt/archive/fb36a272cdeecb21992cfd9271eb82baafeb316d.zip' --no-cache --no-binary scikit-surprise"
pytest_markers: "notebooks and not spark and not gpu"
2 changes: 1 addition & 1 deletion tests/ci/azure_pipeline_test/dsvm_notebook_linux_gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ extends:
- unit
task_name: "Test - Unit Notebook Linux GPU"
conda_env: "unit_notebook_linux_gpu"
conda_opts: "-c conda-forge python=3.6 cudatoolkit=11.2 cudnn=8.1"
conda_opts: "-c conda-forge python=3.7 cudatoolkit=11.2 cudnn=8.1"
pip_opts: "[gpu,examples,dev] -f https://download.pytorch.org/whl/cu111/torch_stable.html"
pytest_markers: "notebooks and not spark and gpu"
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ extends:
- unit
task_name: "Test - Unit Notebook Linux Spark"
conda_env: "unit_notebook_linux_spark"
conda_opts: "python=3.6"
conda_opts: "python=3.7"
pip_opts: "[spark,examples,dev]"
pytest_markers: "notebooks and spark and not gpu"
2 changes: 1 addition & 1 deletion tests/ci/azure_pipeline_test/dsvm_unit_linux_cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ extends:
- unit
task_name: "Test - Unit Linux CPU"
conda_env: "unit_linux_cpu"
conda_opts: "python=3.6"
conda_opts: "python=3.7"
pip_opts: "[dev,experimental] 'scikit-surprise@https://github.com/NicolasHug/Surprise/archive/refs/tags/v1.1.1.tar.gz' 'pymanopt@https://github.com/pymanopt/pymanopt/archive/fb36a272cdeecb21992cfd9271eb82baafeb316d.zip' --no-cache --no-binary scikit-surprise"
pytest_markers: "not notebooks and not spark and not gpu"
2 changes: 1 addition & 1 deletion tests/ci/azure_pipeline_test/dsvm_unit_linux_gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ extends:
- unit
task_name: "Test - Unit Linux GPU"
conda_env: "unit_linux_gpu"
conda_opts: "-c conda-forge python=3.6 cudatoolkit=11.2 cudnn=8.1"
conda_opts: "-c conda-forge python=3.7 cudatoolkit=11.2 cudnn=8.1"
pip_opts: "[gpu,dev] -f https://download.pytorch.org/whl/cu111/torch_stable.html"
pytest_markers: "not notebooks and not spark and gpu"
2 changes: 1 addition & 1 deletion tests/ci/azure_pipeline_test/dsvm_unit_linux_pyspark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ extends:
- unit
task_name: "Test - Unit Linux Spark"
conda_env: "unit_linux_spark"
conda_opts: "python=3.6"
conda_opts: "python=3.7"
pip_opts: "[spark,dev]"
pytest_markers: "not notebooks and spark and not gpu"
18 changes: 9 additions & 9 deletions tests/ci/azure_pipeline_test/release_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- unit
task_name: "Test - Unit Linux CPU"
conda_env: "release_unit_linux_cpu"
conda_opts: "python=3.6"
conda_opts: "python=3.7"
pip_opts: "[experimental,dev] 'scikit-surprise@https://github.com/NicolasHug/Surprise/archive/refs/tags/v1.1.1.tar.gz' 'pymanopt@https://github.com/pymanopt/pymanopt/archive/fb36a272cdeecb21992cfd9271eb82baafeb316d.zip' --no-cache --no-binary scikit-surprise"
pytest_markers: "not notebooks and not spark and not gpu"
install: "release"
Expand All @@ -34,7 +34,7 @@ jobs:
- unit
task_name: "Test - Unit Notebook Linux CPU"
conda_env: "release_unit_notebook_linux_cpu"
conda_opts: "python=3.6"
conda_opts: "python=3.7"
pip_opts: "[experimental,examples,dev] 'scikit-surprise@https://github.com/NicolasHug/Surprise/archive/refs/tags/v1.1.1.tar.gz' 'pymanopt@https://github.com/pymanopt/pymanopt/archive/fb36a272cdeecb21992cfd9271eb82baafeb316d.zip' --no-cache --no-binary scikit-surprise"
pytest_markers: "notebooks and not spark and not gpu"
install: "release"
Expand All @@ -45,7 +45,7 @@ jobs:
- unit
task_name: "Test - Unit Linux GPU"
conda_env: "release_unit_linux_gpu"
conda_opts: "-c conda-forge python=3.6 cudatoolkit=11.2 cudnn=8.1"
conda_opts: "-c conda-forge python=3.7 cudatoolkit=11.2 cudnn=8.1"
pip_opts: "[gpu,dev] -f https://download.pytorch.org/whl/cu111/torch_stable.html"
pytest_markers: "not notebooks and not spark and gpu"
install: "release"
Expand All @@ -56,7 +56,7 @@ jobs:
- unit
task_name: "Test - Unit Notebook Linux GPU"
conda_env: "release_unit_notebook_linux_gpu"
conda_opts: "-c conda-forge python=3.6 cudatoolkit=11.2 cudnn=8.1"
conda_opts: "-c conda-forge python=3.7 cudatoolkit=11.2 cudnn=8.1"
pip_opts: "[gpu,examples,dev] -f https://download.pytorch.org/whl/cu111/torch_stable.html"
pytest_markers: "notebooks and not spark and gpu"
install: "release"
Expand All @@ -67,7 +67,7 @@ jobs:
- unit
task_name: "Test - Unit Linux Spark"
conda_env: "release_unit_linux_spark"
conda_opts: "python=3.6"
conda_opts: "python=3.7"
pip_opts: "[spark,dev]"
pytest_markers: "not notebooks and spark and not gpu"
install: "release"
Expand All @@ -78,7 +78,7 @@ jobs:
- unit
task_name: "Test - Unit Notebook Linux Spark"
conda_env: "release_unit_notebook_linux_spark"
conda_opts: "python=3.6"
conda_opts: "python=3.7"
pip_opts: "[spark,examples,dev]"
pytest_markers: "notebooks and spark and not gpu"
install: "release"
Expand All @@ -92,7 +92,7 @@ jobs:
task_name: "Test - Nightly Linux CPU"
timeout: 180
conda_env: "release_nightly_linux_cpu"
conda_opts: "python=3.6"
conda_opts: "python=3.7"
pip_opts: "[experimental,examples,dev] 'scikit-surprise@https://github.com/NicolasHug/Surprise/archive/refs/tags/v1.1.1.tar.gz' 'pymanopt@https://github.com/pymanopt/pymanopt/archive/fb36a272cdeecb21992cfd9271eb82baafeb316d.zip' --no-cache --no-binary scikit-surprise"
pytest_markers: "not spark and not gpu"
install: "release"
Expand All @@ -105,7 +105,7 @@ jobs:
task_name: "Test - Nightly Linux GPU"
timeout: 360
conda_env: "release_nightly_linux_gpu"
conda_opts: "-c conda-forge python=3.6 cudatoolkit=11.2 cudnn=8.1"
conda_opts: "-c conda-forge python=3.7 cudatoolkit=11.2 cudnn=8.1"
pip_opts: "[gpu,examples,dev] -f https://download.pytorch.org/whl/cu111/torch_stable.html"
pytest_markers: "not spark and gpu"
install: "release"
Expand All @@ -118,7 +118,7 @@ jobs:
task_name: "Test - Nightly Linux Spark"
timeout: 180
conda_env: "release_nightly_linux_spark"
conda_opts: "python=3.6"
conda_opts: "python=3.7"
pip_opts: "[spark,examples,dev]"
pytest_markers: "spark and not gpu"
install: "release"
Expand Down
4 changes: 2 additions & 2 deletions tests/ci/cpu_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ steps:

- task: UsePythonVersion@0
inputs:
versionSpec: '3.6'
versionSpec: '3.7'
architecture: 'x64'
displayName: 'Use Python 3.6'
displayName: 'Use Python 3.7'

- script: |
az login --service-principal -u $(ClientID) -p $(ClientSecret) --tenant $(TenantID)
Expand Down
4 changes: 2 additions & 2 deletions tests/ci/env-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ steps:

- task: UsePythonVersion@0
inputs:
versionSpec: '3.6'
versionSpec: '3.7'
architecture: 'x64'
displayName: 'Use Python 3.6'
displayName: 'Use Python 3.7'

- bash: |
echo "##vso[task.prependpath]/data/anaconda/bin"
Expand Down
4 changes: 2 additions & 2 deletions tests/ci/gpu_unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ steps:

- task: UsePythonVersion@0
inputs:
versionSpec: '3.6'
versionSpec: '3.7'
architecture: 'x64'
displayName: 'Use Python 3.6'
displayName: 'Use Python 3.7'

- script: |
az login --service-principal -u $(ClientID) -p $(ClientSecret) --tenant $(TenantID)
Expand Down
2 changes: 1 addition & 1 deletion tools/generate_conda_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
CHANNELS = ["defaults", "conda-forge", "pytorch", "fastai"]

CONDA_BASE = {
"python": "python>=3.6,<3.8",
"python": "python>=3.6,<3.10",
"bottleneck": "bottleneck==1.2.1",
"cornac": "cornac>=1.11.0",
"ipykernel": "ipykernel>=4.6.1",
Expand Down

0 comments on commit 1fee90e

Please sign in to comment.