From 99a8438ca2b79b4c3bcf1a60ab5e0cb3a53f6610 Mon Sep 17 00:00:00 2001 From: Jieru Hu Date: Thu, 12 May 2022 12:27:57 -0700 Subject: [PATCH 1/5] windows test --- .circleci/config.yml | 8 ++++---- noxfile.py | 14 ++++---------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f6ba4d9ef2..d6e602d1f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -99,9 +99,9 @@ commands: - run: name: Preparing environment - system command: | - choco install -y --no-progress miniconda3 --params '"/AddToPath:1"' - C:\tools\miniconda3\Scripts\conda.exe init powershell + choco install -y --no-progress miniconda3 choco install -y --no-progress openssl javaruntime + C:\tools\miniconda3\Scripts\conda.exe init powershell - run: name: Preparing environment - Hydra command: | @@ -165,7 +165,7 @@ jobs: name: Testing Hydra no_output_timeout: 10m command: | - $env:NOX_PYTHON_VERSIONS=<< parameters.py_version >> + $env:NOX_PYTHON_VERSIONS="<< parameters.py_version >>" $env:PYTHONIOENCODING="utf_8" conda activate hydra nox -s lint test_tools test_core test_jupyter_notebooks -ts @@ -315,4 +315,4 @@ workflows: orbs: - win: circleci/windows@1.0.0 + win: circleci/windows@2.2.0 diff --git a/noxfile.py b/noxfile.py index c33bd5f64b..5400002cc5 100644 --- a/noxfile.py +++ b/noxfile.py @@ -37,6 +37,8 @@ VERBOSE = os.environ.get("VERBOSE", "0") SILENT = VERBOSE == "0" +nox.options.error_on_missing_interpreters = True + @dataclass class Plugin: @@ -65,16 +67,8 @@ def get_current_os() -> str: def _upgrade_basic(session): - session.run( - "python", - "-m", - "pip", - "install", - "--upgrade", - "setuptools", - "pip", - silent=SILENT, - ) + session.install("--upgrade", "pip", silent=SILENT) + session.install("--upgrade", "setuptools", silent=SILENT) def find_dirs(path: str): From 3720182baa0909eda8a4e24cc0d128c41480f1c4 Mon Sep 17 00:00:00 2001 From: Jieru Hu Date: Thu, 12 May 2022 17:22:46 -0700 Subject: [PATCH 2/5] commit --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d6e602d1f9..eef4d90fbf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -239,6 +239,7 @@ jobs: no_output_timeout: 10m command: | $env:NOX_PYTHON_VERSIONS=<< parameters.py_version >> + $env:ConEmuDefaultCp=65001 $env:PYTHONIOENCODING="utf_8" $env:PLUGINS="<< parameters.test_plugin >>" conda activate hydra From 5982b6de08b73bde9fb359a1ba69382fbf2e78ce Mon Sep 17 00:00:00 2001 From: Jieru Hu Date: Thu, 12 May 2022 19:47:58 -0700 Subject: [PATCH 3/5] commit --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eef4d90fbf..3438915c16 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -166,6 +166,7 @@ jobs: no_output_timeout: 10m command: | $env:NOX_PYTHON_VERSIONS="<< parameters.py_version >>" + $env:ConEmuDefaultCp=65001 $env:PYTHONIOENCODING="utf_8" conda activate hydra nox -s lint test_tools test_core test_jupyter_notebooks -ts @@ -238,7 +239,7 @@ jobs: name: << parameters.test_plugin >> no_output_timeout: 10m command: | - $env:NOX_PYTHON_VERSIONS=<< parameters.py_version >> + $env:NOX_PYTHON_VERSIONS="<< parameters.py_version >>" $env:ConEmuDefaultCp=65001 $env:PYTHONIOENCODING="utf_8" $env:PLUGINS="<< parameters.test_plugin >>" From 629df089e711ea8f5d1602806f0bf9a1d555cdf9 Mon Sep 17 00:00:00 2001 From: Jieru Hu Date: Fri, 13 May 2022 13:48:15 -0700 Subject: [PATCH 4/5] remove win+py3.10 fornow --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3438915c16..051dc8d8d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -289,7 +289,7 @@ workflows: - test_win: matrix: parameters: - py_version: ["3.6", "3.7", "3.8", "3.9", "3.10"] + py_version: ["3.6", "3.7", "3.8", "3.9"] - test_linux_omc_dev: matrix: parameters: @@ -312,7 +312,7 @@ workflows: - test_plugin_win: matrix: parameters: - py_version: ["3.6", "3.7", "3.8", "3.9", "3.10"] + py_version: ["3.6", "3.7", "3.8", "3.9"] test_plugin: [<< pipeline.parameters.test_plugins >>] From 659493c71460e63be06dc65197951513cbdb1756 Mon Sep 17 00:00:00 2001 From: Jieru Hu Date: Fri, 13 May 2022 14:16:04 -0700 Subject: [PATCH 5/5] add comments in circleci config --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 051dc8d8d1..616558dbf0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -289,6 +289,7 @@ workflows: - test_win: matrix: parameters: + # skipping py3.10 for windows https://github.com/facebookresearch/hydra/issues/2209 py_version: ["3.6", "3.7", "3.8", "3.9"] - test_linux_omc_dev: matrix: @@ -312,6 +313,7 @@ workflows: - test_plugin_win: matrix: parameters: + # skipping py3.10 for windows https://github.com/facebookresearch/hydra/issues/2209 py_version: ["3.6", "3.7", "3.8", "3.9"] test_plugin: [<< pipeline.parameters.test_plugins >>]