Skip to content

Commit

Permalink
Merge pull request #3520 from open-formulieren/chore/bump-urllib3
Browse files Browse the repository at this point in the history
Bump dependencies
  • Loading branch information
sergei-maertens authored Oct 4, 2023
2 parents 9ea9436 + b666bfd commit 5f07467
Show file tree
Hide file tree
Showing 25 changed files with 6,308 additions and 2,832 deletions.
2 changes: 1 addition & 1 deletion docker/ci/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ markupsafe==2.1.1
# via jinja2
requests==2.31.0
# via -r requirements.in
urllib3==1.26.14
urllib3==2.0.6
# via requests
300 changes: 150 additions & 150 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ boltons==21.0.0
# via
# face
# glom
cached-property==1.5.2
# via zeep
cairocffi==1.2.0
# via
# cairosvg
Expand Down Expand Up @@ -422,7 +420,7 @@ requests-mock==1.8.0
# via zgw-consumers
requests-oauthlib==1.3.0
# via o365
requests-toolbelt==0.9.1
requests-toolbelt==1.0.0
# via zeep
rfc3339-validator==0.1.4
# via openapi-schema-validator
Expand Down Expand Up @@ -478,7 +476,7 @@ tzlocal==2.1
# via o365
uritemplate==3.0.1
# via drf-spectacular
urllib3==1.26.15
urllib3==2.0.6
# via
# elastic-apm
# requests
Expand Down Expand Up @@ -506,7 +504,7 @@ xmlsec==1.3.10
# via maykin-python3-saml
xmltodict==0.12.0
# via -r requirements/base.in
zeep==4.1.0
zeep==4.2.1
# via -r requirements/base.in
zgw-consumers==0.26.2
# via -r requirements/base.in
Expand Down
11 changes: 3 additions & 8 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ boltons==21.0.0
# -r requirements/base.txt
# face
# glom
cached-property==1.5.2
# via
# -c requirements/base.txt
# -r requirements/base.txt
# zeep
cairocffi==1.2.0
# via
# -c requirements/base.txt
Expand Down Expand Up @@ -810,7 +805,7 @@ requests-oauthlib==1.3.0
# -c requirements/base.txt
# -r requirements/base.txt
# o365
requests-toolbelt==0.9.1
requests-toolbelt==1.0.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -956,7 +951,7 @@ uritemplate==3.0.1
# -c requirements/base.txt
# -r requirements/base.txt
# drf-spectacular
urllib3==1.26.15
urllib3==2.0.6
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -1018,7 +1013,7 @@ xmltodict==0.12.0
# -r requirements/base.txt
yarl==1.9.2
# via vcrpy
zeep==4.1.0
zeep==4.2.1
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down
11 changes: 3 additions & 8 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ build==0.8.0
# via pip-tools
bump2version==1.0.0
# via -r requirements/dev.in
cached-property==1.5.2
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# zeep
cairocffi==1.2.0
# via
# -c requirements/ci.txt
Expand Down Expand Up @@ -939,7 +934,7 @@ requests-oauthlib==1.3.0
# -c requirements/ci.txt
# -r requirements/ci.txt
# o365
requests-toolbelt==0.9.1
requests-toolbelt==1.0.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down Expand Up @@ -1132,7 +1127,7 @@ uritemplate==3.0.1
# -c requirements/ci.txt
# -r requirements/ci.txt
# drf-spectacular
urllib3==1.26.15
urllib3==2.0.6
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down Expand Up @@ -1211,7 +1206,7 @@ yarl==1.9.2
# -c requirements/ci.txt
# -r requirements/ci.txt
# vcrpy
zeep==4.1.0
zeep==4.2.1
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down
10 changes: 3 additions & 7 deletions requirements/extensions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ boltons==21.0.0
# -r requirements/base.txt
# face
# glom
cached-property==1.5.2
# via
# -r requirements/base.txt
# zeep
cairocffi==1.2.0
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -654,7 +650,7 @@ requests-oauthlib==1.3.0
# via
# -r requirements/base.txt
# o365
requests-toolbelt==0.9.1
requests-toolbelt==1.0.0
# via
# -r requirements/base.txt
# zeep
Expand Down Expand Up @@ -747,7 +743,7 @@ uritemplate==3.0.1
# via
# -r requirements/base.txt
# drf-spectacular
urllib3==1.26.15
urllib3==2.0.6
# via
# -r requirements/base.txt
# elastic-apm
Expand Down Expand Up @@ -790,7 +786,7 @@ xmltodict==0.12.0
# via
# -c requirements/base.in
# -r requirements/base.txt
zeep==4.1.0
zeep==4.2.1
# via
# -c requirements/base.in
# -r requirements/base.txt
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,17 @@

# The test date below should return actual results when querying for times. So if you
# need to re-generate the cassettes, pick a week day in the future!
TEST_DATE = date(2023, 9, 8)
TEST_DATE = date(2023, 10, 23)

plugin = QmaticAppointment("qmatic")


def scrub_cookies(response: dict):
if "Set-Cookie" in response["headers"]:
del response["headers"]["Set-Cookie"]
return response


class CreateAppointmentTests(OFVCRMixin, MockConfigMixin, TestCase):
VCR_TEST_FILES = TEST_FILES

Expand All @@ -40,14 +46,22 @@ def setUp(self):
location for location in locations if location.name == "KCC"
)

def _get_vcr_kwargs(self, **kwargs):
kwargs = super()._get_vcr_kwargs(**kwargs)
kwargs["before_record_response"] = scrub_cookies
return kwargs

def test_create_appointment_single_product_single_customer(self):
customer = _CustomerDetails(
details={
CustomerFields.email: "automated-test@example.com",
CustomerFields.last_name: "TEST (automated)",
}
)
product = plugin.get_available_products(location_id=self.location.identifier)[0]
products = plugin.get_available_products(location_id=self.location.identifier)
product = next(
product for product in products if product.identifier == "Identiteitskaart"
)
assert product.amount == 1
times = plugin.get_times(
products=[product], location=self.location, day=TEST_DATE
Expand All @@ -73,9 +87,10 @@ def test_create_appointment_multi_product_multi_customer(self):
CustomerFields.last_name: "TEST (automated)",
}
)
product1 = plugin.get_available_products(location_id=self.location.identifier)[
0
]
products = plugin.get_available_products(location_id=self.location.identifier)
product1 = next(
product for product in products if product.identifier == "Identiteitskaart"
)
products2 = plugin.get_available_products(
location_id=self.location.identifier, current_products=[product1]
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
plugin = QmaticAppointment("qmatic")


def _get_location():
def _get_location(index: int = 0):
locations = plugin.get_locations()
assert len(locations) > 1
return locations[0]
return locations[index]


class ListAvailableProductsTests(OFVCRMixin, MockConfigMixin, TestCase):
Expand All @@ -36,7 +36,7 @@ def test_listing_products_without_other_product_constraint(self):
Test that with/without location filter produces different amounts of products.
"""
num_unfiltered_products = 0
location = _get_location() # can't pickle this if a subtest fails
location = _get_location(-1) # can't pickle this if a subtest fails

with self.subTest("List of unfiltered products"):
products = plugin.get_available_products()
Expand Down
16 changes: 12 additions & 4 deletions src/openforms/appointments/contrib/qmatic/tests/test_times_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# The test date below should return actual results when querying for times. So if you
# need to re-generate the cassettes, pick a week day in the future!
TEST_DATE = date(2023, 9, 8)
TEST_DATE = date(2023, 10, 23)

plugin = QmaticAppointment("qmatic")

Expand All @@ -39,7 +39,10 @@ def setUp(self):
)

def test_listing_times_single_product_single_customer(self):
product = plugin.get_available_products(location_id=self.location.identifier)[0]
products = plugin.get_available_products(location_id=self.location.identifier)
product = next(
product for product in products if product.identifier == "Identiteitskaart"
)
assert product.amount == 1

times = plugin.get_times(
Expand All @@ -50,7 +53,10 @@ def test_listing_times_single_product_single_customer(self):
self.assertIsInstance(times[0], date)

def test_listing_times_single_product_multiple_customers(self):
product = plugin.get_available_products(location_id=self.location.identifier)[0]
products = plugin.get_available_products(location_id=self.location.identifier)
product = next(
product for product in products if product.identifier == "Identiteitskaart"
)
product.amount = 999 # amount that should not return any times

with self.subTest("product.amount set"):
Expand All @@ -70,7 +76,9 @@ def test_listing_times_single_product_multiple_customers(self):

def test_multiple_products_multiple_customers(self):
products = plugin.get_available_products(location_id=self.location.identifier)
product1 = products[0]
product1 = next(
product for product in products if product.identifier == "Identiteitskaart"
)
products2 = plugin.get_available_products(
location_id=self.location.identifier, current_products=[product1]
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,14 @@ interactions:
uri: https://api.kvk.nl/test/api/v1/basisprofielen/69599084
response:
body:
string: !!binary |
H4sIAAAAAAAAALVU70/bMBD9VyJ/YlK3JC1df3zrAAlNK0PbBBLThC71NTVx7Mp2gwbq/76zU0IK
FIQGVtXEd8/PZ997uWVFVZysyhING7PPo/5olAz3WYcJxU+0moKQQuWU+goUVAAlvf9C66Kj6UV0
CLnO0DhKzbUpUeIPzIV1BpxADm7l0d0kHSSDNCFQCQ6N2Iax8S0L0AmoCsJeYUWaDNm6w5x2APIc
TXEDJZ6isVqhYuO0wxagOEqrKE6B37fPlVdpmWvDabdk3blHXiNyjBoiKKN0erEFT1vwQzQvoLst
9Jl4Ed5b/+kwm4nJzIlKOKRffRKKHWiPYGmSpiyAvpd2tjDiqqob8lPCbOGv8wpVtJcj/S/lSpQV
4scPdQOPtZ5zaLjrLvoKt+i7T9Kfbrhsa5tdrCeIj2l7T9KeSaKs0FxTQykS7SmBLqImRyW12Ykr
jmpn9WEfurFL0mRhvXAsyrl/LgzSky2cW9pxHMNSfCJdf1IydiQGP4+rNM7ACrs0eu4lqOJG7SSz
imAip4p8A/6TL26TrYn8EssMOUceqP2xGoSPNBOr7oyY0OgN+8mon3gz7vDoc57rJsmwO3yV5/ph
BdWL5DKHx/fC3WGquya1TlN/JyhxoH29M7/x2cP0M54GbtDajQvc36UXU4Y3GouQqbkn8xxJVWhK
vlFFMJVELvJJgI3ZJMMMoy+iEBIkgIrSQTSNXhpp0ts//xZNSjq/4XRw0jBdGbjNLTxkpfxiJZq+
pYN6LtG50KwpAZbautmdLTy9j9FiF8ps7STpwsN5OJrw/g5ajx/I712l32Ft2Nv69PWsj5YS9ZbP
1t6rKKh0AON5DdKnz1bkMmI/QlWCsjcABfVqJVyOmUHByVc7UW/dvKa4t79aP/4BFyjCsw0IAAA=
string: '{"kvkNummer":"69599084","indNonMailing":"Ja","naam":"Test EMZ Dagobert","formeleRegistratiedatum":"20170710","materieleRegistratie":{"datumAanvang":"20170108"},"totaalWerkzamePersonen":1,"handelsnamen":[{"naam":"Test
EMZ Dagobert","volgorde":0},{"naam":"Tweede handelsnaam 1MZ","volgorde":1},{"naam":"Derde
handelsnaam 1MZ","volgorde":2},{"naam":"Vierde handelsnaam 1MZ","volgorde":3}],"sbiActiviteiten":[{"sbiCode":"1011","sbiOmschrijving":"Slachterijen
(geen pluimvee-)","indHoofdactiviteit":"Ja"},{"sbiCode":"1012","sbiOmschrijving":"Pluimveeslachterijen","indHoofdactiviteit":"Nee"},{"sbiCode":"1013","sbiOmschrijving":"Vleesverwerking
(niet tot maaltijden)","indHoofdactiviteit":"Nee"}],"_links":{"self":{"href":"https://api.kvk.nl/test/api/v1/basisprofielen/69599084"},"vestigingen":{"href":"https://api.kvk.nl/test/api/v1/basisprofielen/69599084/vestigingen"}},"_embedded":{"hoofdvestiging":{"vestigingsnummer":"000038509504","kvkNummer":"69599084","formeleRegistratiedatum":"20200828","materieleRegistratie":{"datumAanvang":"20150828"},"eersteHandelsnaam":"Test
EMZ Dagobert","indHoofdvestiging":"Ja","indCommercieleVestiging":"Ja","totaalWerkzamePersonen":1,"adressen":[{"type":"bezoekadres","indAfgeschermd":"Nee","volledigAdres":"Abebe
Bikilalaan 17 M 1034WL Amsterdam","straatnaam":"Abebe
Bikilalaan","huisnummer":17,"huisletter":"M","postcode":"1034WL","plaats":"Amsterdam","land":"Nederland"}],"_links":{"self":{"href":"https://api.kvk.nl/test/api/v1/basisprofielen/69599084/hoofdvestiging"},"vestigingen":{"href":"https://api.kvk.nl/test/api/v1/basisprofielen/69599084/vestigingen"},"basisprofiel":{"href":"https://api.kvk.nl/test/api/v1/basisprofielen/69599084"},"vestigingsprofiel":{"href":"https://api.kvk.nl/test/api/v1/vestigingsprofielen/000038509504"}}},"eigenaar":{"rechtsvorm":"Eenmanszaak","uitgebreideRechtsvorm":"Eenmanszaak","_links":{"self":{"href":"https://api.kvk.nl/test/api/v1/basisprofielen/69599084/eigenaar"},"basisprofiel":{"href":"https://api.kvk.nl/test/api/v1/basisprofielen/69599084"}}}}}'
headers:
API-Version:
- 1.4.1
Expand All @@ -43,7 +38,7 @@ interactions:
Content-Type:
- application/hal+json
Date:
- Thu, 21 Sep 2023 16:14:52 GMT
- Wed, 04 Oct 2023 09:57:14 GMT
Keep-Alive:
- timeout=60
Server:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ interactions:
uri: https://api.kvk.nl/test/api/v1/basisprofielen/12345678
response:
body:
string: !!binary |
H4sIAAAAAAAAAKtWSssvLVGyiq5WSs5PSVWyUvIMcLEEAiUdpfzc4uSMosysssy8dKCEY056am5q
XqpCSWpyRl4mUC5VAaRZT6k2thYAfL7PzUgAAAA=
string: '{"fout":[{"code":"IPD9999","omschrijving":"Algemene technische fout."}]}'
headers:
Connection:
- close
Expand All @@ -31,7 +29,7 @@ interactions:
Content-Type:
- application/json
Date:
- Thu, 21 Sep 2023 16:14:52 GMT
- Wed, 04 Oct 2023 09:57:14 GMT
Server:
- unknown
strict-transport-security:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,11 @@ interactions:
uri: https://api.kvk.nl/test/api/v1/basisprofielen/90000749
response:
body:
string: !!binary |
H4sIAAAAAAAAALVSUYvbMAz+K8FPG5RL0nS7S966u7ExWA/2MAZjHEqtJFodO9hKjq30v09OSrnB
PdzDZgJ2pE/Sp086qsN02I19j15VqszkXG9KtVJk9c7Zz0CGbCuuTyBGC9DL+4NxNZjk1lnvrJgb
53s0+AVbCuyBCTXwGJHrLM+ydXYjoB4YPf0NU9VRzdAt2AnmOnlZlnmeFeq0UoHFx0Aed88XDjVt
90wTMcpnVfX9GG23TmPsZlOW1wvqvg/7ztPPaWnmfhIqLSY1GqmKtsYOPFMr3uSVx8CvFwU+Otdo
uFRYZDj9WKkHUeUQIv2Apol351Fu1TEPoUpTGOhKlL2yJmXJF//TKU9rCBQG75oohE0vep+k2wfs
a9QadUyHQk/U9vHtA9nYTrkuNtmbuSWP+47DJLqL4yt6tAt5ETF5fw4NghuJW6w9khbZXxYCWgQI
ZzH51xCVrPG3w8PsWYTZNi2Kouh7Yat2iGKenDGoqd3OsEq9MwDj4yO2Sf62SIpiffPtLrlzXs/k
41xkCYDPO3VBi6MbKdjzTkrsSg0u8H4Z6pJHQIMEcKzzNKWMcyGk0c/v/zCs9DIbGdpTzL9YAzl/
AMVZIkiTAwAA
string: '{"kvkNummer":"90000749","indNonMailing":"Ja","naam":"Global Conron","formeleRegistratiedatum":"20100208","materieleRegistratie":{"datumAanvang":"19991103"},"statutaireNaam":"Global
Conron","sbiActiviteiten":[{"sbiCode":"94997","sbiOmschrijving":"Overige belangenbehartiging
(rest)","indHoofdactiviteit":"Ja"}],"_links":{"self":{"href":"https://api.kvk.nl/test/api/v1/basisprofielen/90000749"}},"_embedded":{"eigenaar":{"rsin":"992340597","rechtsvorm":"Vereniging
van Eigenaars","uitgebreideRechtsvorm":"Vereniging van Eigenaars","adressen":[{"type":"bezoekadres","indAfgeschermd":"Nee","volledigAdres":"Blaauwweg
163 3328XD Dordrecht","straatnaam":"Blaauwweg","huisnummer":163,"postcode":"3328XD","plaats":"Dordrecht","land":"Nederland"}],"_links":{"self":{"href":"https://api.kvk.nl/test/api/v1/basisprofielen/90000749/eigenaar"},"basisprofiel":{"href":"https://api.kvk.nl/test/api/v1/basisprofielen/90000749"}}}}}'
headers:
API-Version:
- 1.4.1
Expand All @@ -40,7 +35,7 @@ interactions:
Content-Type:
- application/hal+json
Date:
- Thu, 21 Sep 2023 16:14:52 GMT
- Wed, 04 Oct 2023 09:57:15 GMT
Keep-Alive:
- timeout=60
Server:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,9 @@ interactions:
uri: https://api.kvk.nl/test/api/v1/zoeken?kvkNummer=69599084
response:
body:
string: !!binary |
H4sIAAAAAAAAANVRu07DMBT9lchz1LiFoCYbCNSpnTqBELohN4kVx47s20gQ5d+55lFSIYay4cWP
87B9zih6qJUBkS9jAWAINC9lLMgShPUqFg79QRMQGpE/jKId2t2h69CJXFxlaZbJ9aWIxYCeFFvV
3nyhksfFOpVZKgOjAVOi9gagY3DP/Ohuex/dQm0LdMQMKPmu/UuPjBf4arF9P2HEkwOgT+l1gQVG
N6pVGjQ/mvGeZ/IB6zyhK5nHf/hwaqytyuPz+PxJK9MyeRQFeOV7ZyuFOuwbh1VQEPU+TxLo1YK/
uzA6IdaHfTIsk7kKTXIMYZqncLbrDylbnyQ4TVP8t/hX8vf4dzigOaqjjR3O6mKDBhUbzzvYAjBH
PTf0XYI5ueaflsA5cgmP0xvmcMCPNgMAAA==
string: '{"pagina":1,"aantal":10,"totaal":2,"resultaten":[{"kvkNummer":"69599084","vestigingsnummer":"000038509504","handelsnaam":"Test
EMZ Dagobert","adresType":"bezoekadres","straatnaam":"Abebe Bikilalaan","plaats":"Amsterdam","type":"hoofdvestiging","_links":{"basisprofiel":{"href":"https://api.kvk.nl/test/api/v1/basisprofielen/69599084"},"vestigingsprofiel":{"href":"https://api.kvk.nl/test/api/v1/vestigingsprofielen/000038509504"}}},{"kvkNummer":"69599084","vestigingsnummer":"000038509520","handelsnaam":"Test
EMZ Nevenvestiging Govert","adresType":"bezoekadres","straatnaam":"Geneinde","plaats":"Maastricht","type":"nevenvestiging","_links":{"basisprofiel":{"href":"https://api.kvk.nl/test/api/v1/basisprofielen/69599084"},"vestigingsprofiel":{"href":"https://api.kvk.nl/test/api/v1/vestigingsprofielen/000038509520"}}}]}'
headers:
API-Version:
- 1.4.1
Expand All @@ -37,7 +33,7 @@ interactions:
Content-Type:
- application/hal+json
Date:
- Thu, 21 Sep 2023 16:13:31 GMT
- Wed, 04 Oct 2023 09:57:15 GMT
Keep-Alive:
- timeout=60
Server:
Expand Down
Loading

0 comments on commit 5f07467

Please sign in to comment.