Skip to content

Commit

Permalink
Merge branch 'main' into MIJN-7441-deploy-bbz-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
timvanoostrom authored Dec 18, 2023
2 parents f4e45aa + 332626c commit 4b4c2a2
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 12 deletions.
3 changes: 2 additions & 1 deletion azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ trigger:
include:
- testen
- az-acceptance
- main
pr:
autoCancel: true
branches:
Expand Down Expand Up @@ -43,7 +44,7 @@ variables:
- ${{ if or(eq(variables['Build.SourceBranchName'], 'testen'), eq(variables['Build.Reason'], 'PullRequest')) }}:
- name: dtapName
value: t
- ${{ if eq(variables['Build.SourceBranchName'], 'az-acceptance') }}:
- ${{ if or(eq(variables['Build.SourceBranchName'], 'az-acceptance'), eq(variables['Build.SourceBranchName'], 'main')) }}:
- name: dtapName
value: a
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
Expand Down
42 changes: 31 additions & 11 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,23 @@
#
# pip-compile --output-file=requirements.txt requirements-root.txt
#
aiohttp==3.9.1
# via black
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.3
# via aiohttp
attrs==23.1.0
# via zeep
black==23.11.0
# via
# aiohttp
# zeep
black==23.12.0
# via -r requirements-root.txt
blinker==1.7.0
# via
# flask
# sentry-sdk
certifi==2023.7.22
certifi==2023.11.17
# via
# requests
# sentry-sdk
Expand All @@ -26,7 +34,7 @@ click==8.1.7
# flask
coverage==7.3.2
# via -r requirements-root.txt
cryptography==41.0.5
cryptography==41.0.7
# via -r requirements-root.txt
dpath==2.1.6
# via -r requirements-root.txt
Expand All @@ -39,8 +47,14 @@ flask==3.0.0
# sentry-sdk
flask-httpauth==4.8.0
# via -r requirements-root.txt
idna==3.4
# via requests
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
idna==3.6
# via
# requests
# yarl
isodate==0.6.1
# via zeep
itsdangerous==2.1.2
Expand All @@ -56,13 +70,17 @@ markupsafe==2.1.3
# werkzeug
mccabe==0.7.0
# via flake8
multidict==6.0.4
# via
# aiohttp
# yarl
mypy-extensions==1.0.0
# via black
packaging==23.2
# via black
pathspec==0.11.2
pathspec==0.12.1
# via black
platformdirs==3.11.0
platformdirs==4.1.0
# via
# black
# zeep
Expand All @@ -86,21 +104,23 @@ requests-file==1.5.1
# via zeep
requests-toolbelt==1.0.0
# via zeep
sentry-sdk[flask]==1.34.0
sentry-sdk[flask]==1.39.0
# via -r requirements-root.txt
six==1.16.0
# via
# isodate
# requests-file
tomli==2.0.1
# via black
typing-extensions==4.8.0
typing-extensions==4.9.0
# via black
urllib3==2.0.7
urllib3==2.1.0
# via
# requests
# sentry-sdk
werkzeug==3.0.1
# via flask
yarl==1.9.4
# via aiohttp
zeep==4.2.1
# via -r requirements-root.txt

0 comments on commit 4b4c2a2

Please sign in to comment.