From 362f2dd1d2f009e4b92dd83316c67da011282deb Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Sat, 26 Oct 2024 17:46:25 -0400 Subject: [PATCH 1/2] remove msvc hack does not apply on latest setuptools --- setup.py | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/setup.py b/setup.py index b78fa05f..d877c2af 100644 --- a/setup.py +++ b/setup.py @@ -96,26 +96,7 @@ def customize_compiler(compiler): elif filename.endswith('.h'): headers.append(filename) - if sys.platform == 'win32': - from distutils.msvc9compiler import get_build_version - vscomntools_env = 'VS{}{}COMNTOOLS'.format( - int(get_build_version()), - int(get_build_version() * 10) % 10, - ) - try: - os.environ[vscomntools_env] = os.environ['VS140COMNTOOLS'] - except KeyError: - distutils.log.warn( - 'You probably need Visual Studio 2015 (14.0) ' - 'or higher', - ) - from distutils import msvccompiler, msvc9compiler - if msvccompiler.get_build_version() < 14.0: - msvccompiler.get_build_version = lambda: 14.0 - if get_build_version() < 14.0: - msvc9compiler.get_build_version = lambda: 14.0 - msvc9compiler.VERSION = 14.0 - elif platform.system() in {'Darwin', 'FreeBSD', 'OpenBSD'}: + if platform.system() in {'Darwin', 'FreeBSD', 'OpenBSD'}: # Dirty workaround to avoid link error... # Python distutils doesn't provide any way # to configure different flags for each cc and c++. From 84abba3c9b7b53ba741999adb7afde74ab1efeeb Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Sat, 26 Oct 2024 17:57:46 -0400 Subject: [PATCH 2/2] disable pypy for now --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d0d7752b..4757863f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,6 +32,6 @@ jobs: main-linux: uses: asottile/workflows/.github/workflows/tox.yml@v1.6.1 with: - env: '["pypy3", "py38", "py39", "py310", "py311"]' + env: '["py38", "py39", "py310", "py311"]' os: ubuntu-latest submodules: true