mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-11 08:03:55 +00:00
Merge branch 'master' into cpp_transporter
This commit is contained in:
commit
2617a04e41
2
.github/workflows/pip.yml
vendored
2
.github/workflows/pip.yml
vendored
@ -102,7 +102,7 @@ jobs:
|
||||
- uses: actions/download-artifact@v4
|
||||
|
||||
- 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:
|
||||
subject-path: "*/pybind11*"
|
||||
|
||||
|
@ -100,9 +100,7 @@ class Never : public none {
|
||||
using none::none;
|
||||
};
|
||||
|
||||
#if defined(__cpp_nontype_template_parameter_class) \
|
||||
&& (/* See #5201 */ !defined(__GNUC__) \
|
||||
|| (__GNUC__ > 10 || (__GNUC__ == 10 && __GNUC_MINOR__ >= 3)))
|
||||
#if defined(__cpp_nontype_template_args) && __cpp_nontype_template_args >= 201911L
|
||||
# define PYBIND11_TYPING_H_HAS_STRING_LITERAL
|
||||
template <size_t N>
|
||||
struct StringLiteral {
|
||||
|
@ -1026,7 +1026,7 @@ def test_optional_object_annotations(doc):
|
||||
|
||||
@pytest.mark.skipif(
|
||||
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):
|
||||
assert (
|
||||
@ -1037,7 +1037,7 @@ def test_literal(doc):
|
||||
|
||||
@pytest.mark.skipif(
|
||||
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):
|
||||
assert (
|
||||
|
Loading…
Reference in New Issue
Block a user