Skip to content

Commit e71ed01

Browse files
authored
Merge pull request #90 from kevin1024/test-on-3-13-and-pypy-3-10
2 parents f81b16b + c86126c commit e71ed01

File tree

19 files changed

+73
-275
lines changed

19 files changed

+73
-275
lines changed

.github/workflows/main.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,19 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
python-version: [3.8, 3.9, '3.10', 3.11, 3.12, pypy-3.8, pypy-3.9]
16+
python-version: [3.8, 3.9, '3.10', 3.11, 3.12, 3.13, pypy-3.10]
1717
os: [macOS-latest, ubuntu-latest, windows-latest]
1818

1919
steps:
2020
- name: Checkout
2121
uses: actions/checkout@v2
2222

2323
- name: Set Up Python ${{ matrix.python-version }}
24-
uses: actions/setup-python@v2
24+
uses: actions/setup-python@v5
2525
with:
2626
python-version: ${{ matrix.python-version }}
2727
cache: pip
28+
allow-prereleases: true
2829
cache-dependency-path: |
2930
pyproject.toml
3031
setup.cfg

pytest_httpbin/certs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
def where():
1616
"""Return the preferred certificate bundle."""
1717
# vendored bundle inside Requests
18-
return os.path.join(os.path.dirname(__file__), "certs", "cacert.pem")
18+
return os.path.join(os.path.dirname(__file__), "certs", "client.pem")
1919

2020

2121
if __name__ == "__main__":

pytest_httpbin/certs/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
generated with 'python -m trustme'

pytest_httpbin/certs/cacert.pem

Lines changed: 0 additions & 30 deletions
This file was deleted.

pytest_httpbin/certs/cert.pem

Lines changed: 0 additions & 26 deletions
This file was deleted.

pytest_httpbin/certs/client.pem

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIB0TCCAXegAwIBAgIUScnyyX1CI+ywC6GdKol8IIwuGnkwCgYIKoZIzj0EAwIw
3+
RDEbMBkGA1UECgwSdHJ1c3RtZSB2MS4xLjArZGV2MSUwIwYDVQQLDBxUZXN0aW5n
4+
IENBICNBdXNVcWJaNG81d3pjb0tCMCAXDTAwMDEwMTAwMDAwMFoYDzMwMDAwMTAx
5+
MDAwMDAwWjBEMRswGQYDVQQKDBJ0cnVzdG1lIHYxLjEuMCtkZXYxJTAjBgNVBAsM
6+
HFRlc3RpbmcgQ0EgI0F1c1VxYlo0bzV3emNvS0IwWTATBgcqhkjOPQIBBggqhkjO
7+
PQMBBwNCAARhrRi78wmZY28t3/y8MTDDCsi7Lzir4WaQm96gf4/9kSolBTFVDUvB
8+
MkSC7Yged+2bWEzTRERZQLf88uiorUnAo0UwQzAdBgNVHQ4EFgQUHymIBJV4gCrA
9+
qv+6Q9pSJFtd7PYwEgYDVR0TAQH/BAgwBgEB/wIBCTAOBgNVHQ8BAf8EBAMCAYYw
10+
CgYIKoZIzj0EAwIDSAAwRQIgLf0sybmdbJoTIgZWrU1k11oecQbdkzh+3jFtNEFn
11+
zYUCIQCRXjIBDZXtyaywk3DgIggByCQxrrB5vjlnyYTd9vNUSw==
12+
-----END CERTIFICATE-----

pytest_httpbin/certs/etc/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

pytest_httpbin/certs/etc/certificate.conf

Lines changed: 0 additions & 18 deletions
This file was deleted.

pytest_httpbin/certs/etc/localhost.crt

Lines changed: 0 additions & 26 deletions
This file was deleted.

pytest_httpbin/certs/etc/localhost.csr

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)