diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 1263715..43a6d2d 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -31,18 +31,18 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-2019, macos-11, macos-12] + os: [ubuntu-20.04, windows-2019, macos-12, macos-13] steps: - uses: actions/checkout@v3 with: submodules: recursive - name: Build and test wheels - uses: pypa/cibuildwheel@v2.9.0 + uses: pypa/cibuildwheel@v2.16 env: - # We currently skip all PyPy builds on Windows and MacOS due to hard - # exits and segfaults of the Python interpreter with some input trees. - CIBW_SKIP: pp*-win* pp*-macosx* + # We currently skip all PyPy builds due to hard exits and + # segfaults of the Python interpreter with some input trees. + CIBW_SKIP: pp* CIBW_TEST_REQUIRES: pytest CIBW_TEST_COMMAND: python -mpytest {project} CIBW_TEST_COMMAND_WINDOWS: python.exe -mpytest {project} diff --git a/CHANGES b/CHANGES index 0c5c98c..a986545 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +1.2.8 | 2023-12-01 11:28:07 +0100 + + * Skip building pypy wheels on Linux as well (Benjamin Bannier, Corelight) + + This also shows segfaults now, so extend the skipped platforms. + + * Bump pypa/cibuildwheel GH action (Benjamin Bannier, Corelight) + + * Add macos-13, drop macos-11 for CI (Benjamin Bannier, Corelight) + + * Remove `pyproject.toml` `[project]` section (Benjamin Bannier, Corelight) + + It seems newer versions of the installation toolchain require either the + majority of keywords from `setup.py` declared in `pyproject.toml`, or + none at all (in that case there should be no `[project]` section at + all). As written the project configuration is rejected and it is + impossible to install this package. + + Since we use a build controlled by `setup.py` remove the `[project]` + section in `pyproject.toml`. + 1.2.7 | 2023-11-07 08:50:02 +0100 * GH-51: Format intervals without space between value and unit (Benjamin Bannier, Corelight) diff --git a/VERSION b/VERSION index c04c650..db6fb4a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.7 +1.2.8 diff --git a/pyproject.toml b/pyproject.toml index 9a4633e..b768650 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,3 @@ -[project] -name = "zeekscript" -dynamic = ["version"] - [build-system] requires = [ "setuptools", "wheel" ] build-backend = "setuptools.build_meta" diff --git a/zeekscript/__init__.py b/zeekscript/__init__.py index f8d2f23..aea391f 100644 --- a/zeekscript/__init__.py +++ b/zeekscript/__init__.py @@ -1,5 +1,5 @@ """Wrapper around more low-level tests.""" -__version__ = "1.2.7" +__version__ = "1.2.8" __all__ = ["cli", "error", "formatter", "node", "output", "parser", "script"] from .cli import *