Merge pull request #13318 from Kojoley/ghactions-windows

Move most of Windows test runners to GitHub Actions

.github/workflows/test.yml

@@ -1,59 +1,60
 name: Run tests
 
 on:
   push:
   pull_request:
   # Run weekly on Monday at 1:23 UTC
   schedule:
   - cron:  '23 1 * * 1'
   workflow_dispatch:
 
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, windows-latest]
         python-version: ["3.7", "3.8", "3.9", "3.10"]
         deps: [test_extra]
         # Test all on ubuntu, test ends on macos
         include:
           - os: macos-latest
             python-version: "3.7"
             deps: test_extra
           - os: macos-latest
             python-version: "3.10"
             deps: test_extra
           # Tests minimal dependencies set
           - os: ubuntu-latest
             python-version: "3.10"
             deps: test
           # Tests latest development Python version
           - os: ubuntu-latest
             python-version: "3.11-dev"
             deps: test
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install latex
       if: runner.os == 'Linux' && matrix.deps == 'test_extra'
       run: sudo apt-get -yq -o Acquire::Retries=3 --no-install-suggests --no-install-recommends install texlive dvipng
     - name: Install and update Python dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel
         python -m pip install --upgrade -e .[${{ matrix.deps }}]
         python -m pip install --upgrade check-manifest pytest-cov
     - name: Check manifest
+      if: runner.os != 'Windows'  # setup.py does not support sdist on Windows
       run: check-manifest
     - name: pytest
       env:
         COLUMNS: 120
       run: |
-        pytest --color=yes -v --cov --cov-report=xml
+        pytest --color=yes -ra -v --cov --cov-report=xml
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v2

IPython/extensions/tests/test_storemagic.py

@@ -1,65 +1,66
 import tempfile, os
+from pathlib import Path
 
 from traitlets.config.loader import Config
 
 
 def setup_module():
     ip.magic('load_ext storemagic')
 
 def test_store_restore():
     assert 'bar' not in ip.user_ns, "Error: some other test leaked `bar` in user_ns"
     assert 'foo' not in ip.user_ns, "Error: some other test leaked `foo` in user_ns"
     assert 'foobar' not in ip.user_ns, "Error: some other test leaked `foobar` in user_ns"
     assert 'foobaz' not in ip.user_ns, "Error: some other test leaked `foobaz` in user_ns"
     ip.user_ns['foo'] = 78
     ip.magic('alias bar echo "hello"')
     ip.user_ns['foobar'] = 79
     ip.user_ns['foobaz'] = '80'
     tmpd = tempfile.mkdtemp()
     ip.magic('cd ' + tmpd)
     ip.magic('store foo')
     ip.magic('store bar')
     ip.magic('store foobar foobaz')
 
     # Check storing
     assert ip.db["autorestore/foo"] == 78
     assert "bar" in ip.db["stored_aliases"]
     assert ip.db["autorestore/foobar"] == 79
     assert ip.db["autorestore/foobaz"] == "80"
 
     # Remove those items
     ip.user_ns.pop('foo', None)
     ip.user_ns.pop('foobar', None)
     ip.user_ns.pop('foobaz', None)
     ip.alias_manager.undefine_alias('bar')
     ip.magic('cd -')
     ip.user_ns['_dh'][:] = []
 
     # Check restoring
     ip.magic("store -r foo bar foobar foobaz")
     assert ip.user_ns["foo"] == 78
     assert ip.alias_manager.is_alias("bar")
     assert ip.user_ns["foobar"] == 79
     assert ip.user_ns["foobaz"] == "80"
 
     ip.magic("store -r")  # restores _dh too
-    assert os.path.realpath(tmpd) in ip.user_ns["_dh"]
+    assert any(Path(tmpd).samefile(p) for p in ip.user_ns["_dh"])
 
     os.rmdir(tmpd)
 
 def test_autorestore():
     ip.user_ns['foo'] = 95
     ip.magic('store foo')
     del ip.user_ns['foo']
     c = Config()
     c.StoreMagics.autorestore = False
     orig_config = ip.config
     try:
         ip.config = c
         ip.extension_manager.reload_extension("storemagic")
         assert "foo" not in ip.user_ns
         c.StoreMagics.autorestore = True
         ip.extension_manager.reload_extension("storemagic")
         assert ip.user_ns["foo"] == 95
     finally:
         ip.config = orig_config

IPython/utils/tests/test_tempdir.py

@@ -1,29 +1,29
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2012-  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 from pathlib import Path
 
 from IPython.utils.tempdir import NamedFileInTemporaryDirectory
 from IPython.utils.tempdir import TemporaryWorkingDirectory
 
 
 def test_named_file_in_temporary_directory():
     with NamedFileInTemporaryDirectory('filename') as file:
         name = file.name
         assert not file.closed
         assert Path(name).exists()
         file.write(b'test')
     assert file.closed
     assert not Path(name).exists()
 
 def test_temporary_working_directory():
     with TemporaryWorkingDirectory() as directory:
-        directory_path = Path(directory)
+        directory_path = Path(directory).resolve()
         assert directory_path.exists()
-        assert Path.cwd() == directory_path.resolve()
+        assert Path.cwd().resolve() == directory_path
     assert not directory_path.exists()
-    assert Path.cwd() != directory_path.resolve()
+    assert Path.cwd().resolve() != directory_path

appveyor.yml

@@ -1,40 +1,28
 build: false
 matrix:
   fast_finish: true     # immediately finish build once one of the jobs fails.
 
 environment:
   global:
     APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
     COLUMNS: 120  # Appveyor web viwer window width is 130 chars
 
   matrix:
 
-   - PYTHON: "C:\\Python310-x64"
-     PYTHON_VERSION: "3.10.x"
-     PYTHON_ARCH: "64"
-
-   - PYTHON: "C:\\Python37-x64"
-     PYTHON_VERSION: "3.7.x"
-     PYTHON_ARCH: "64"
-
    - PYTHON: "C:\\Python38"
      PYTHON_VERSION: "3.8.x"
      PYTHON_ARCH: "32"
 
-   - PYTHON: "C:\\Python38-x64"
-     PYTHON_VERSION: "3.8.x"
-     PYTHON_ARCH: "64"
-
 init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
 
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - python -m pip install --upgrade setuptools pip
   - pip install pytest-cov
   - pip install -e .[test_extra]
 test_script:
   - pytest --color=yes -ra --cov --cov-report=xml
 on_finish:
   - curl -Os https://uploader.codecov.io/latest/windows/codecov.exe
   - codecov -e PYTHON_VERSION,PYTHON_ARCH