Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build, test: upgrade to vcrpy>=5 & refresh broken cassettes #2519

Merged
merged 1 commit into from
Oct 30, 2023
Merged

build, test: upgrade to vcrpy>=5 & refresh broken cassettes #2519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ sphinx>=4,<5
sphinxcontrib-autoprogram==0.1.8
# custom plugin to help with RFC links
sphinx-rfcsection~=0.1.1
vcrpy<3.0.0
# use fork of vcrpy 5.x until kevin1024/vcrpy#777 is (hopefully) accepted
# (or until py3.9 EOL... in 10/2025, I HOPE NOT)
vcrpy @ git+https://github.com/sopel-irc/vcrpy@uncap-urllib3
# type check
mypy>=1.3,<2
sqlalchemy[mypy]>=1.4,<1.5
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ dependencies = [
"pytz",
"geoip2>=4.0,<5.0",
"requests>=2.24.0,<3.0.0",
"urllib3<2.0", # TODO: unpin when vcrpy etc. will tolerate it
"dnspython<3.0",
"sqlalchemy>=1.4,<1.5",
"importlib_metadata>=3.6",
Expand Down
920 changes: 695 additions & 225 deletions test/vcr/modules/search/test_example_duck_0.yaml
View file
Open in desktop

Large diffs are not rendered by default.

936 changes: 742 additions & 194 deletions test/vcr/modules/search/test_example_duck_1.yaml
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions test/vcr/modules/search/test_example_suggest_0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ interactions:
uri: https://suggestqueries.google.com/complete/search?output=toolbar&hl=en&q=lkashdfiauwgaef
response:
body:
string: !!binary |
H4sIAAAAAAAC/7Oxr8jNUShLLSrOzM+zVTLUM1Cyt7MpyS/ISS1LzbGz0YczAYEc0EoqAAAA
string: <?xml version="1.0"?><toplevel></toplevel>
headers:
Alt-Svc:
- h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
Expand All @@ -24,24 +23,24 @@ interactions:
Content-Encoding:
- gzip
Content-Security-Policy:
- 'object-src ''none'';base-uri ''self'';script-src ''nonce-bqn-bde_sURx7gg6smeyow''
- 'object-src ''none'';base-uri ''self'';script-src ''nonce-yoXc9HzWTdGO9RKE1Acudw''
''strict-dynamic'' ''report-sample'' ''unsafe-eval'' ''unsafe-inline'' https:
http:;report-uri https://csp.withgoogle.com/csp/gws/xsrp'
Content-Type:
- text/xml; charset=ISO-8859-1
Date:
- Sun, 01 Oct 2023 22:08:12 GMT
- Thu, 12 Oct 2023 04:39:29 GMT
Expires:
- Sun, 01 Oct 2023 22:08:12 GMT
- Thu, 12 Oct 2023 04:39:29 GMT
P3P:
- CP="This is not a P3P policy! See g.co/p3phelp for more info."
Server:
- gws
Set-Cookie:
- 1P_JAR=2023-10-01-22; expires=Tue, 31-Oct-2023 22:08:12 GMT; path=/; domain=.google.com;
- 1P_JAR=2023-10-12-04; expires=Sat, 11-Nov-2023 04:39:29 GMT; path=/; domain=.google.com;
Secure
- NID=511=dO-EpOs4FOklsnc4Pp3npRl1SVjfpgKMbw8to-Rx9usNNf_zbI02DRK-uIdRBYYvAVDOdu_zksAU1aRpNDsefpbsuAf54C2fz4RMgIrUH5i-MEnJ5kFBbrq-d8Of2g-Cp2BZDB0-_XyI1WT5VWdwpNprOyrNJVs4wtfLPxPe_DQ;
expires=Mon, 01-Apr-2024 22:08:12 GMT; path=/; domain=.google.com; HttpOnly
- NID=511=EDlXqJw8GIVnkknq9WCPq-iS6jGJAaE5aoJrBdn0MHgUw7s7fedPgPYNqkijDLggXLwIN3ZrcyvQZ-BZZmepycsJ0Ye-oy6T5G3zUtJgUAvym_DfBst5Ug8waBXcvNyVg5v4U5TAW9QyzUW35i6NZ3f9kpNOksKFlUT5UAXiVS4;
expires=Fri, 12-Apr-2024 04:39:29 GMT; path=/; domain=.google.com; HttpOnly
Transfer-Encoding:
- chunked
X-Frame-Options:
Expand Down
26 changes: 16 additions & 10 deletions test/vcr/modules/search/test_example_suggest_1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,16 @@ interactions:
uri: https://suggestqueries.google.com/complete/search?output=toolbar&hl=en&q=wikip
response:
body:
string: !!binary |
H4sIAAAAAAAC/63TPQrDMAwF4KsYH6Bpd8cZeoSeQMQPR8R/2E6a4zdTpnYoaHuD9METyExHDGpH
bZzTqB+3u56s6bkE7AjWPHM8Y8dr8x6tn0PWtCsrR51G/eaVCxyTHqwZvq38x6gGqvMipSH5wE2M
8xQhVrQArm5J9nCKk3TpXArSAo6oUqSjuqqYndgxKyWXo6LaeQ7C6k9tuH7lA1+7OeZLAwAA
string: <?xml version="1.0"?><toplevel><CompleteSuggestion><suggestion data="wikipedia"/></CompleteSuggestion><CompleteSuggestion><suggestion
data="wikipedia search"/></CompleteSuggestion><CompleteSuggestion><suggestion
data="wikipedia game"/></CompleteSuggestion><CompleteSuggestion><suggestion
data="wikipedia israel"/></CompleteSuggestion><CompleteSuggestion><suggestion
data="wikipedia speedrun"/></CompleteSuggestion><CompleteSuggestion><suggestion
data="wikipedia search in english"/></CompleteSuggestion><CompleteSuggestion><suggestion
data="wikipedia palestine"/></CompleteSuggestion><CompleteSuggestion><suggestion
data="wikipedia oppenheimer"/></CompleteSuggestion><CompleteSuggestion><suggestion
data="wikipedia dark mode"/></CompleteSuggestion><CompleteSuggestion><suggestion
data="wikipedia gaza strip"/></CompleteSuggestion></toplevel>
headers:
Alt-Svc:
- h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
Expand All @@ -26,24 +32,24 @@ interactions:
Content-Encoding:
- gzip
Content-Security-Policy:
- 'object-src ''none'';base-uri ''self'';script-src ''nonce-tweQn7Ss8hox9zQe-xYVHA''
- 'object-src ''none'';base-uri ''self'';script-src ''nonce-ZhhjlE3AKG1y99DS-lRDMw''
''strict-dynamic'' ''report-sample'' ''unsafe-eval'' ''unsafe-inline'' https:
http:;report-uri https://csp.withgoogle.com/csp/gws/xsrp'
Content-Type:
- text/xml; charset=ISO-8859-1
Date:
- Sun, 01 Oct 2023 22:08:12 GMT
- Thu, 12 Oct 2023 04:39:29 GMT
Expires:
- Sun, 01 Oct 2023 22:08:12 GMT
- Thu, 12 Oct 2023 04:39:29 GMT
P3P:
- CP="This is not a P3P policy! See g.co/p3phelp for more info."
Server:
- gws
Set-Cookie:
- 1P_JAR=2023-10-01-22; expires=Tue, 31-Oct-2023 22:08:12 GMT; path=/; domain=.google.com;
- 1P_JAR=2023-10-12-04; expires=Sat, 11-Nov-2023 04:39:29 GMT; path=/; domain=.google.com;
Secure
- NID=511=GKP1S5d2fEPy67A69aYS0ZwYbNd_e7leYIAx6IRB4HxNWKE6YG-6ydKKf73w7khkbQ_LvVsrCodezyg_WiNpixCKw22_O0v3YtaiBlEGJ5tjKg7xQgW2wdGhVXo_svbIoz-SXgCyIsf-iMIGrKeUYQzTybvG5Jpc3PmvYcn62VQ;
expires=Mon, 01-Apr-2024 22:08:12 GMT; path=/; domain=.google.com; HttpOnly
- NID=511=UgsnerPc1dI5PMohIss-UiIUw3x_rOLP_sxO8gmZkuxyrpa7Iq4m4wDK4tZTWT4kMBMS6euma3kFUB2Tl9jrSdHulPrzoTgK0yZG_r_gr8uemYmNhndNcEn18gvCN89m8k7EnYapDx5P9Sbxr5ufxR2ruXS-OmU6iqu0p88oPqM;
expires=Fri, 12-Apr-2024 04:39:29 GMT; path=/; domain=.google.com; HttpOnly
Transfer-Encoding:
- chunked
X-Frame-Options:
Expand Down
17 changes: 8 additions & 9 deletions test/vcr/modules/search/test_example_suggest_2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ interactions:
uri: https://suggestqueries.google.com/complete/search?output=toolbar&hl=en&q=sopel+irc
response:
body:
string: !!binary |
H4sIAAAAAAAC/7Oxr8jNUShLLSrOzM+zVTLUM1Cyt7MpyS/ISS1LzbGzcc7PBTJLUoNL09NTi0uA
iuxsiuFshZTEkkRbpeL8gtQchcyiZCV9Oxt9bFr04SYCAKTyHI5xAAAA
string: <?xml version="1.0"?><toplevel><CompleteSuggestion><suggestion data="sopel
irc"/></CompleteSuggestion></toplevel>
headers:
Alt-Svc:
- h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
Expand All @@ -25,24 +24,24 @@ interactions:
Content-Encoding:
- gzip
Content-Security-Policy:
- 'object-src ''none'';base-uri ''self'';script-src ''nonce-0QjS0PS1bkaLNV-ZwUrXtw''
- 'object-src ''none'';base-uri ''self'';script-src ''nonce-ZNUDAmWQ5jWHwsBTLOrGXw''
''strict-dynamic'' ''report-sample'' ''unsafe-eval'' ''unsafe-inline'' https:
http:;report-uri https://csp.withgoogle.com/csp/gws/xsrp'
Content-Type:
- text/xml; charset=ISO-8859-1
Date:
- Sun, 01 Oct 2023 22:08:13 GMT
- Thu, 12 Oct 2023 04:39:29 GMT
Expires:
- Sun, 01 Oct 2023 22:08:13 GMT
- Thu, 12 Oct 2023 04:39:29 GMT
P3P:
- CP="This is not a P3P policy! See g.co/p3phelp for more info."
Server:
- gws
Set-Cookie:
- 1P_JAR=2023-10-01-22; expires=Tue, 31-Oct-2023 22:08:13 GMT; path=/; domain=.google.com;
- 1P_JAR=2023-10-12-04; expires=Sat, 11-Nov-2023 04:39:29 GMT; path=/; domain=.google.com;
Secure
- NID=511=R9yxS4Vqfw-TpuqZFOmLmSnTAI9dE_3a_3kI-t4dINKpdeJb12NLhoIAA9S5O8uE1Lz1Qj00FYzA1bVuMEASytLNDl920QJDA8u7Yp-YiskoGG9T0FRMK4-QzMSAy4gBwmY-e2MT_5uYFM_FgFY7EoaeWpo6hotXXbbopRdg9Co;
expires=Mon, 01-Apr-2024 22:08:13 GMT; path=/; domain=.google.com; HttpOnly
- NID=511=jlELNMjRfk79a0trEFcZFKHypFdBzv4AODS-ttpnXttvig8APhjENyAlXfiSGgicvm8DNjxoBW4NUAah5Ubw2ABcODT5w5UgXvTTXOpMrJEtQFtmviJvJe_wlbVH3T87PNdX46acUC91aS9_N12SMm_hznR9VBVazAYv4JRpPUg;
expires=Fri, 12-Apr-2024 04:39:29 GMT; path=/; domain=.google.com; HttpOnly
Transfer-Encoding:
- chunked
X-Frame-Options:
Expand Down
Loading