Fix pipeline issues.

davidmarble · Oct 14, 2021 · 97c72ae · 97c72ae
1 parent 8202282
commit 97c72ae
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -13,16 +13,16 @@ jobs:
     strategy:
       matrix:
 
-        # 2.7, 3.5-9  (current matrix)
-        # python-version: [ '2.7', '3.5', '3.6', '3.7', '3.8', '3.9']
+        # 2.7, 3.8-9  (current matrix)
+        python-version: [ '2.7', '3.8', '3.9']
 
-        # 2.7, 3.6-10 (next matrix)
-        # python-version: [ '2.7', '3.6', '3.7', '3.8', '3.9', '3.10' ]
+        # 2.7, 3.9-10 (next matrix)
+        # python-version: [ '2.7', '3.9', '3.10' ]
 
         # for debugging
-        python-version: [ '3.9' ]
+        # python-version: [ '3.9' ]
 
-        os: [windows-latest]
+        os: [windows-latest, windows-2022]
 
     steps:
       # setup environment
@@ -39,7 +39,7 @@ jobs:
       - name: Run tests
         shell: cmd
         run: |
-          cd tests && run_tests.bat -k test_workon_home_with_spaces.bat
+          cd tests && run_tests.bat
 
   cd:
     name: CD
@@ -56,6 +56,7 @@ jobs:
           python-version: '3.9'
 
       - name: Cleanup
+        shell: bash
         run: |
           rm -rf dist
           rm -rf build

diff --git a/tests/test_mkvirtualenv.bat b/tests/test_mkvirtualenv.bat
@@ -12,7 +12,7 @@ call _start_test mkvirtualenv_r
     echo requirements file: "%fname%.requirements"
     type %fname%.requirements
     pushd .
-        call mkvirtualenv venv_r -r %fname%.requirements --no-download --no-wheel --no-setuptools
+        call mkvirtualenv venv_r -r %fname%.requirements --no-download --no-wheel
     popd
     call %VIRTUAL_ENV%\Scripts\pip freeze > %fname%.pipfreeze
     echo fname [%fname%.pipfreeze] contents:
@@ -23,7 +23,7 @@ call _start_test mkvirtualenv_r
 call _start_test mkvirtualenv_i
     set fname=%config.output%\%config.current_test%.output
     pushd .
-        call mkvirtualenv venv_i -i virtualenv-clone -i virtualenv-api --no-download --no-wheel --no-setuptools
+        call mkvirtualenv venv_i -i virtualenv-clone -i virtualenv-api --no-download --no-wheel
     popd
     call %VIRTUAL_ENV%\Scripts\pip freeze > %fname%.pipfreeze
     echo fname [%fname%.pipfreeze] contents:

diff --git a/tests/test_workon_home_with_spaces.bat b/tests/test_workon_home_with_spaces.bat
@@ -25,8 +25,7 @@ call _start_test venv_with_space
         call cdvirtualenv
         set "CURDIR=%CD%"
     popd
-    echo.call assertEquals "%CURDIR%" "%WORKON_HOME%\venv with spaces"
-    call assertEquals "%CURDIR%" "%WORKON_HOME%\venv with spaces"
+    call assertSamePath "%CURDIR%" "%WORKON_HOME%\venv with spaces"
 
 
 :teardown_space_dir