re-enable windows tests (except for py3.10) (#2210)

facebookresearch · May 13, 2022 · 4065429 · 4065429
1 parent 36707bb
commit 4065429
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git 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,8 @@ jobs:
           name: Testing Hydra
           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"
             conda activate hydra
             nox -s lint test_tools test_core test_jupyter_notebooks -ts
@@ -238,7 +239,8 @@ 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 >>"
               conda activate hydra
@@ -287,7 +289,8 @@ workflows:
       - test_win:
           matrix:
             parameters:
-              py_version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+              # 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:
             parameters:
@@ -310,9 +313,10 @@ workflows:
       - test_plugin_win:
           matrix:
             parameters:
-              py_version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+              # 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 >>]
 
 
 orbs:
-  win: circleci/windows@1.0.0
+  win: circleci/windows@2.2.0
diff --git 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):