From 416393885429240ea599411bd7386c3dc04e275c Mon Sep 17 00:00:00 2001 From: nulano Date: Wed, 20 Nov 2019 17:48:58 +0000 Subject: [PATCH 1/2] Test Python 3.8 on Windows with GitHub Actions --- .github/workflows/test-windows.yml | 2 +- winbuild/config.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 075707bf6bd..e5356b79fb1 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.5", "3.6", "3.7"] + python-version: ["3.5", "3.6", "3.7", "3.8"] architecture: ["x86", "x64"] include: - architecture: "x86" diff --git a/winbuild/config.py b/winbuild/config.py index 826c6183c59..999e7e5b85e 100644 --- a/winbuild/config.py +++ b/winbuild/config.py @@ -13,6 +13,7 @@ "3.5": {"compiler": 7.1, "vc": 2015}, "3.6": {"compiler": 7.1, "vc": 2015}, "3.7": {"compiler": 7.1, "vc": 2015}, + "3.8": {"compiler": 7.1, "vc": 2015}, } VIRT_BASE = "c:/vp/" From 14f65284224d7c7a72d5bd0c35b7b85114d6817b Mon Sep 17 00:00:00 2001 From: nulano Date: Wed, 20 Nov 2019 21:11:51 +0000 Subject: [PATCH 2/2] add pypy to gha win --- .github/workflows/test-windows.yml | 3 ++- winbuild/config.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index e5356b79fb1..08d1573d748 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.5", "3.6", "3.7", "3.8"] + python-version: ["3.5", "3.6", "3.7", "3.8", "pypy3.6"] architecture: ["x86", "x64"] include: - architecture: "x86" @@ -324,6 +324,7 @@ jobs: set LIB=%INCLIB%;%PYTHON%\tcl set INCLUDE=%INCLIB%;%GITHUB_WORKSPACE%\depends\tcl86\include;%INCLUDE% call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.platform-vcvars }} + set MSSdk=1 set DISTUTILS_USE_SDK=1 set py_vcruntime_redist=true %PYTHON%\python.exe setup.py build_ext install diff --git a/winbuild/config.py b/winbuild/config.py index 999e7e5b85e..7f7fc74309b 100644 --- a/winbuild/config.py +++ b/winbuild/config.py @@ -3,10 +3,10 @@ SF_MIRROR = "https://iweb.dl.sourceforge.net" pythons = { + "pypy3": {"compiler": 7.1, "vc": 2015}, # for AppVeyor "35": {"compiler": 7.1, "vc": 2015}, "36": {"compiler": 7.1, "vc": 2015}, - "pypy3": {"compiler": 7.1, "vc": 2015}, "37": {"compiler": 7.1, "vc": 2015}, "38": {"compiler": 7.1, "vc": 2015}, # for GitHub Actions