Skip to content

Commit 2786d16

Browse files
authored
Bump croaring to v2.1.2 (#102)
* Bump CRoaring amalgamation to v2.1.2 * Rework setup.py to build correctly on all platforms CRoaring now requires atomic support (at least C11) which is a little bit finicky across all platforms to get the right flags through setuptools for both CRoaring and Cython generated C++. This commit splits out the CRoaring library into it's own section separate to the Python extension to enable this. Originally this was done for Windows as well, but that lead to linker errors on Windows ARM wheel builds... * Add extra step needed to the extension build instructions * Bump Python test versions and CIBW version 3.12 is now officially released. Also change the strategy for the CIBW job to not fail-fast, so all platforms continue wheel building even if one of them fails.
1 parent d4dac1f commit 2786d16

File tree

7 files changed

+1171
-416
lines changed

7 files changed

+1171
-416
lines changed

.github/workflows/buildwheels.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
name: Build wheels on ${{ matrix.os }}
3333
runs-on: ${{ matrix.os }}
3434
strategy:
35+
fail-fast: false
3536
matrix:
3637
include:
3738
- os: ubuntu-20.04
@@ -51,7 +52,7 @@ jobs:
5152
with:
5253
platforms: arm64
5354
- name: Build wheels
54-
uses: pypa/cibuildwheel@v2.15.0
55+
uses: pypa/cibuildwheel@v2.16.2
5556
env:
5657
CIBW_TEST_REQUIRES: hypothesis
5758
CIBW_TEST_COMMAND: "python {project}/test.py -v && python {project}/cydoctest.py -v"

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
os: [ubuntu-latest, macos-latest, windows-latest]
12-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12.0-rc.1"]
12+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
1313
steps:
1414
- name: Set up the repository
1515
uses: actions/checkout@v3

README.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,15 @@ To install from Cython via source, for example during development run the follow
9292
This will automatically install Cython if it not present for the build, cythonise the source files and compile everything for you.
9393

9494
If you just want to recompile the package in place for quick testing you can
95-
try:
95+
try the following:
9696

9797
.. code:: bash
9898
99+
python setup.py build_clib
99100
python setup.py build_ext -i
100101
102+
Note that the build_clib compiles croaring only, and only needs to be run once.
103+
101104
Then you can test the new code using tox - this will install all the other
102105
dependencies needed for testing and test in an isolated environment:
103106

pyroaring/croaring_version.pxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__croaring_version__ = "v1.1.0"
1+
__croaring_version__ = "v2.1.2"

0 commit comments

Comments
 (0)