Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/topic/bbannier/pyproject-dynamic'
Browse files Browse the repository at this point in the history
  • Loading branch information
bbannier committed Dec 1, 2023
2 parents ed16219 + 6128a28 commit f3fd339
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
21 changes: 21 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.7
1.2.8
4 changes: 0 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[project]
name = "zeekscript"
dynamic = ["version"]

[build-system]
requires = [ "setuptools", "wheel" ]
build-backend = "setuptools.build_meta"
2 changes: 1 addition & 1 deletion zeekscript/__init__.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand Down

0 comments on commit f3fd339

Please sign in to comment.