Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/libraries/botframework-connec…
Browse files Browse the repository at this point in the history
…tor/cryptography-41.0.6
  • Loading branch information
tracyboehrer authored Nov 29, 2023
2 parents 1525c80 + 5982105 commit 1041349
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion libraries/botbuilder-adapters-slack/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
aiohttp==3.8.6
aiohttp==3.9.0
pyslack
botbuilder-core==4.15.0
slackclient
2 changes: 1 addition & 1 deletion libraries/botbuilder-dialogs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ botbuilder-schema==4.15.0
botbuilder-core==4.15.0
requests==2.31.0
PyJWT==2.4.0
cryptography==41.0.4
cryptography==41.0.6
aiounittest==1.3.0
2 changes: 1 addition & 1 deletion libraries/botbuilder-integration-aiohttp/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
msrest==0.6.*
botframework-connector==4.15.0
botbuilder-schema==4.15.0
aiohttp==3.8.6
aiohttp==3.9.0
16 changes: 8 additions & 8 deletions pipelines/botbuilder-python-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ variables:
COVERALLS_GIT_COMMIT: $(Build.SourceVersion)
COVERALLS_SERVICE_JOB_ID: $(Build.BuildId)
COVERALLS_SERVICE_NAME: python-ci
python.37: 3.7.x
python.38: 3.8.x
python.37: 3.7
python.38: 3.8
# python.311: 3.11.x
# PythonCoverallsToken: get this from Azure

Expand Down Expand Up @@ -60,6 +60,12 @@ jobs:
pip install black==22.3.0
displayName: 'Install dependencies'
- script: 'black --check libraries'
displayName: 'Check Black compliant'

- script: 'pylint --rcfile=.pylintrc libraries'
displayName: Pylint

- script: |
pip install pytest
pip install pytest-cov
Expand All @@ -80,12 +86,6 @@ jobs:
testResultsFiles: '**/test-results.$(PYTHON_VERSION).xml'
testRunTitle: 'Python $(PYTHON_VERSION)'

- script: 'black --check libraries'
displayName: 'Check Black compliant'

- script: 'pylint --rcfile=.pylintrc libraries'
displayName: Pylint

- script: 'COVERALLS_REPO_TOKEN=$(PythonCoverallsToken) coveralls'
displayName: 'Push test results to coveralls https://coveralls.io/github/microsoft/botbuilder-python'
continueOnError: true
Expand Down

0 comments on commit 1041349

Please sign in to comment.