Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-22 21:25:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sh_merge_master

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2024-08-26 10:25:25 -07:00
commit b0f715a02b
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pip.yml vendored
View File

@ -103,7 +103,7 @@ jobs:
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
- name: Generate artifact attestation for sdist and wheel - name: Generate artifact attestation for sdist and wheel
uses: actions/attest-build-provenance@310b0a4a3b0b78ef57ecda988ee04b132db73ef8 # v1.4.1 uses: actions/attest-build-provenance@6149ea5740be74af77f260b9db67e633f6b0a9a1 # v1.4.2
with: with:
subject-path: "*/pybind11*" subject-path: "*/pybind11*"

4
include/pybind11/typing.h
View File

@ -100,9 +100,7 @@ class Never : public none {
using none::none; using none::none;
}; };
#if defined(__cpp_nontype_template_parameter_class) \ #if defined(__cpp_nontype_template_args) && __cpp_nontype_template_args >= 201911L
&& (/* See #5201 */ !defined(__GNUC__) \
|| (__GNUC__ > 10 || (__GNUC__ == 10 && __GNUC_MINOR__ >= 3)))
# define PYBIND11_TYPING_H_HAS_STRING_LITERAL # define PYBIND11_TYPING_H_HAS_STRING_LITERAL
template <size_t N> template <size_t N>
struct StringLiteral { struct StringLiteral {

4
tests/test_pytypes.py
View File

@ -1026,7 +1026,7 @@ def test_optional_object_annotations(doc):
@pytest.mark.skipif( @pytest.mark.skipif(
not m.defined_PYBIND11_TYPING_H_HAS_STRING_LITERAL, not m.defined_PYBIND11_TYPING_H_HAS_STRING_LITERAL,
reason="C++20 feature not available.", reason="C++20 non-type template args feature not available.",
) )
def test_literal(doc): def test_literal(doc):
assert ( assert (
@ -1037,7 +1037,7 @@ def test_literal(doc):
@pytest.mark.skipif( @pytest.mark.skipif(
not m.defined_PYBIND11_TYPING_H_HAS_STRING_LITERAL, not m.defined_PYBIND11_TYPING_H_HAS_STRING_LITERAL,
reason="C++20 feature not available.", reason="C++20 non-type template args feature not available.",
) )
def test_typevar(doc): def test_typevar(doc):
assert ( assert (