From ff8b4004d32db47c6b44a022e4e3cb7301825809 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Fri, 10 Nov 2023 09:37:14 -0800 Subject: [PATCH] 7.x prep updates for CI * align test matrix with planned 7.x Python support --- .github/workflows/ci.yaml | 37 ++-------------- .github/workflows/manual_artifact_build.yaml | 44 ++++---------------- .gitignore | 2 +- Makefile | 4 +- tox.ini | 8 ++-- 5 files changed, 18 insertions(+), 77 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0bede579..ed86921c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -120,22 +120,16 @@ jobs: strategy: matrix: include: - - { platform: manylinux1, arch: x86_64, spec: cp36 } -# - { platform: manylinux1, arch: x86_64, spec: cp37 } -# - { platform: manylinux1, arch: x86_64, spec: cp38 } + - { platform: manylinux1, arch: x86_64, spec: cp38 } # - { platform: manylinux1, arch: x86_64, spec: cp39 } # - { platform: manylinux2014, arch: x86_64, spec: cp310 } # - { platform: manylinux2014, arch: x86_64, spec: cp311 } - { platform: manylinux2014, arch: x86_64, spec: cp312 } -# - { platform: manylinux2014, arch: aarch64, spec: cp36 } -# - { platform: manylinux2014, arch: aarch64, spec: cp37 } # - { platform: manylinux2014, arch: aarch64, spec: cp38 } # - { platform: manylinux2014, arch: aarch64, spec: cp39 } # - { platform: manylinux2014, arch: aarch64, spec: cp310 } # - { platform: manylinux2014, arch: aarch64, spec: cp311 } # - { platform: manylinux2014, arch: aarch64, spec: cp312 } -# - { platform: manylinux2014, arch: s390x, spec: cp36 } -# - { platform: manylinux2014, arch: s390x, spec: cp37 } # - { platform: manylinux2014, arch: s390x, spec: cp38 } # - { platform: manylinux2014, arch: s390x, spec: cp39 } # - { platform: manylinux2014, arch: s390x, spec: cp310 } @@ -240,10 +234,6 @@ jobs: strategy: matrix: include: -# - spec: cp36-macosx_x86_64 -# cibw_version: cibuildwheel==2.11.1 -# - spec: cp37-macosx_x86_64 -# cibw_version: cibuildwheel==2.11.1 # - spec: cp38-macosx_x86_64 # cibw_version: cibuildwheel==2.11.1 # - spec: cp39-macosx_x86_64 @@ -364,17 +354,6 @@ jobs: strategy: matrix: include: -# - platform: windows-2019 -# build_arch: x64 -# python_arch: x64 -# spec: 3.6 -# - platform: windows-2019 -# build_arch: x64 -# python_arch: x64 -# spec: 3.7 -# - platform: windows-2019 -# build_arch: x64 -# python_arch: x64 # spec: 3.8 # - platform: windows-2019 # build_arch: x64 @@ -391,15 +370,7 @@ jobs: - platform: windows-2019 build_arch: x64 python_arch: x64 - spec: '3.12.0-rc.1' -# - platform: windows-2019 -# build_arch: win32 -# python_arch: x86 -# spec: 3.6 -# - platform: windows-2019 -# build_arch: win32 -# python_arch: x86 -# spec: 3.7 + spec: '3.12' # - platform: windows-2019 # build_arch: win32 # python_arch: x86 @@ -419,7 +390,7 @@ jobs: - platform: windows-2019 build_arch: win32 python_arch: x86 - spec: '3.12.0-rc.1' + spec: '3.12' steps: # autocrlf screws up tests under Windows - name: Set git to use LF @@ -463,7 +434,7 @@ jobs: # run tests on built wheel python -m pip install dist/*.whl pytest - python -m pytest + python -I -m pytest - name: Upload artifacts uses: actions/upload-artifact@v3 diff --git a/.github/workflows/manual_artifact_build.yaml b/.github/workflows/manual_artifact_build.yaml index 43525273..f1d9e0ab 100644 --- a/.github/workflows/manual_artifact_build.yaml +++ b/.github/workflows/manual_artifact_build.yaml @@ -1,12 +1,12 @@ --- # This is the actual artifact build/release workflow. This workflow exists temporarily # because GHA doesn't support a dynamic/conditional matrix. Ensure changes are synced with ci.yaml. -name: Manual Artifact Build +name: PyYAML CI on: -# push: -# pull_request: -# types: [opened, synchronize, reopened] + push: + pull_request: + types: [opened, synchronize, reopened] workflow_dispatch: env: @@ -76,7 +76,6 @@ jobs: - { platform: manylinux2014, arch: aarch64 } - { platform: manylinux2014, arch: s390x } - { platform: musllinux_1_1, arch: x86_64 } - env: DOCKER_IMAGE: quay.io/pypa/${{matrix.cfg.platform}}_${{matrix.cfg.arch}} steps: @@ -119,22 +118,16 @@ jobs: strategy: matrix: include: - - { platform: manylinux1, arch: x86_64, spec: cp36 } - - { platform: manylinux1, arch: x86_64, spec: cp37 } - { platform: manylinux1, arch: x86_64, spec: cp38 } - { platform: manylinux1, arch: x86_64, spec: cp39 } - { platform: manylinux2014, arch: x86_64, spec: cp310 } - { platform: manylinux2014, arch: x86_64, spec: cp311 } - { platform: manylinux2014, arch: x86_64, spec: cp312 } - - { platform: manylinux2014, arch: aarch64, spec: cp36 } - - { platform: manylinux2014, arch: aarch64, spec: cp37 } - { platform: manylinux2014, arch: aarch64, spec: cp38 } - { platform: manylinux2014, arch: aarch64, spec: cp39 } - { platform: manylinux2014, arch: aarch64, spec: cp310 } - { platform: manylinux2014, arch: aarch64, spec: cp311 } - { platform: manylinux2014, arch: aarch64, spec: cp312 } - - { platform: manylinux2014, arch: s390x, spec: cp36 } - - { platform: manylinux2014, arch: s390x, spec: cp37 } - { platform: manylinux2014, arch: s390x, spec: cp38 } - { platform: manylinux2014, arch: s390x, spec: cp39 } - { platform: manylinux2014, arch: s390x, spec: cp310 } @@ -239,10 +232,6 @@ jobs: strategy: matrix: include: - - spec: cp36-macosx_x86_64 - cibw_version: cibuildwheel==2.11.1 - - spec: cp37-macosx_x86_64 - cibw_version: cibuildwheel==2.11.1 - spec: cp38-macosx_x86_64 cibw_version: cibuildwheel==2.11.1 - spec: cp39-macosx_x86_64 @@ -363,17 +352,6 @@ jobs: strategy: matrix: include: - - platform: windows-2019 - build_arch: x64 - python_arch: x64 - spec: 3.6 - - platform: windows-2019 - build_arch: x64 - python_arch: x64 - spec: 3.7 - - platform: windows-2019 - build_arch: x64 - python_arch: x64 spec: 3.8 - platform: windows-2019 build_arch: x64 @@ -390,15 +368,7 @@ jobs: - platform: windows-2019 build_arch: x64 python_arch: x64 - spec: '3.12.0-rc.1' - - platform: windows-2019 - build_arch: win32 - python_arch: x86 - spec: 3.6 - - platform: windows-2019 - build_arch: win32 - python_arch: x86 - spec: 3.7 + spec: '3.12' - platform: windows-2019 build_arch: win32 python_arch: x86 @@ -418,7 +388,7 @@ jobs: - platform: windows-2019 build_arch: win32 python_arch: x86 - spec: '3.12.0-rc.1' + spec: '3.12' steps: # autocrlf screws up tests under Windows - name: Set git to use LF @@ -462,7 +432,7 @@ jobs: # run tests on built wheel python -m pip install dist/*.whl pytest - python -m pytest + python -I -m pytest - name: Upload artifacts uses: actions/upload-artifact@v3 diff --git a/.gitignore b/.gitignore index e531e481..194fb321 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,4 @@ _pycache_/* # local IDE state /.idea/* - +/.tox/* diff --git a/Makefile b/Makefile index 651e7d34..fc66e0a2 100644 --- a/Makefile +++ b/Makefile @@ -24,10 +24,10 @@ installext: ${PYTHON} setup.py --with-libyaml install ${PARAMETERS} test: build - PYYAML_FORCE_LIBYAML=0 ${PYTHON} -m pytest + PYYAML_FORCE_LIBYAML=0 ${PYTHON} -I -m pytest testext: buildext - PYYAML_FORCE_LIBYAML=1 ${PYTHON} -m pytest + PYYAML_FORCE_LIBYAML=1 ${PYTHON} -I -m pytest testall: ${PYTHON} -m pytest diff --git a/tox.ini b/tox.ini index 4335fa98..412d7dbc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ [tox] -envlist = pypy3,py36,py37,py38,py39,py310,py311 +envlist = py38,py39,py310,py311,py312 [testenv] deps = - Cython + pytest commands = - python setup.py test -passenv = PYYAML_TEST_GROUP + pytest +