Skip to content

Commit

Permalink
Fix build on gcc13; use newer manylinux image for x86_64.
Browse files Browse the repository at this point in the history
  • Loading branch information
jamadden committed Dec 11, 2023
1 parent 4a7a2c2 commit 88acc25
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
14 changes: 2 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['pypy-3.10', '3.12-dev', 3.8, 3.9, '3.10', '3.11']
python-version: ['pypy-3.10', '3.12', 3.8, 3.9, '3.10', '3.11']
os: [ubuntu-latest, macos-latest]
exclude:
# Can't build persistent on 3.12 with -UNDEBUG because it
# accesses fields of objects that aren't there in assert statements;
# we build linux with assertions enabled, and there is no 3.12
# persistent wheel yet, so we have to exclude that one.
- os: ubuntu-latest
python-version: "3.12-dev"
# The same for PyPy.
- os: ubuntu-latest
python-version: pypy-3.10

steps:
- name: checkout
Expand Down Expand Up @@ -240,7 +230,7 @@ jobs:
matrix:
python-version: [3.9]
image:
- manylinux2010_x86_64
- manylinux_2_28_x86_64
- manylinux2014_aarch64
- manylinux2014_ppc64le
- manylinux2014_s390x
Expand Down
9 changes: 6 additions & 3 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
Changes
=========

4.0.0a2 (unreleased)
====================
4.0.0 (unreleased)
==================

- Nothing changed yet.
- Packaging: Fix a build error with gcc 13.
- Support for Python 3.12 uses released dependencies.
- Packaging: x86_64 manylinux wheels are built using a newer
supported manylinux Docker image.


4.0.0a1 (2023-06-30)
Expand Down
7 changes: 7 additions & 0 deletions src/relstorage/_rs_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,13 @@ namespace relstorage {
this->destroy(other);
this->deallocate(other, 1);
}

// This member is deprecated in C++17 and removed in C++20,
// but gcc 13 requires it when compiling in C++11 mode.
template< class U >
struct rebind {
typedef PythonAllocator<U> other;
};
};
};

Expand Down

0 comments on commit 88acc25

Please sign in to comment.