From 80696386c9e65c2c708d6f20026a34db5679bb2e Mon Sep 17 00:00:00 2001 From: Ivan Sabelnikov Date: Tue, 12 Sep 2023 17:47:18 +0100 Subject: [PATCH 01/22] Bump aiohttp to 3.8.5 to fix CVE https://github.com/microsoft/botbuilder-python/issues/2016 --- libraries/botbuilder-adapters-slack/requirements.txt | 2 +- libraries/botbuilder-ai/setup.py | 2 +- libraries/botbuilder-integration-aiohttp/requirements.txt | 2 +- libraries/botbuilder-integration-aiohttp/setup.py | 2 +- .../botbuilder-integration-applicationinsights-aiohttp/setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/botbuilder-adapters-slack/requirements.txt b/libraries/botbuilder-adapters-slack/requirements.txt index 60f0c6ec9..4b93ca95a 100644 --- a/libraries/botbuilder-adapters-slack/requirements.txt +++ b/libraries/botbuilder-adapters-slack/requirements.txt @@ -1,4 +1,4 @@ -aiohttp==3.8.4 +aiohttp==3.8.5 pyslack botbuilder-core==4.15.0 slackclient diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py index b178b6f82..476d9a085 100644 --- a/libraries/botbuilder-ai/setup.py +++ b/libraries/botbuilder-ai/setup.py @@ -8,7 +8,7 @@ "azure-cognitiveservices-language-luis==0.2.0", "botbuilder-schema==4.15.0", "botbuilder-core==4.15.0", - "aiohttp==3.8.4", + "aiohttp==3.8.5", ] TESTS_REQUIRES = ["aiounittest>=1.1.0"] diff --git a/libraries/botbuilder-integration-aiohttp/requirements.txt b/libraries/botbuilder-integration-aiohttp/requirements.txt index 6b3bb75a1..3e2517b24 100644 --- a/libraries/botbuilder-integration-aiohttp/requirements.txt +++ b/libraries/botbuilder-integration-aiohttp/requirements.txt @@ -1,4 +1,4 @@ msrest==0.6.* botframework-connector==4.15.0 botbuilder-schema==4.15.0 -aiohttp==3.8.4 +aiohttp==3.8.5 diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index ddedc2e4e..338077a81 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -10,7 +10,7 @@ "botframework-connector==4.15.0", "botbuilder-core==4.15.0", "yarl<=1.4.2", - "aiohttp==3.8.4", + "aiohttp==3.8.5", ] root = os.path.abspath(os.path.dirname(__file__)) diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py index 30faceae2..f6b661c88 100644 --- a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py +++ b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py @@ -6,7 +6,7 @@ REQUIRES = [ "applicationinsights>=0.11.9", - "aiohttp==3.8.4", + "aiohttp==3.8.5", "botbuilder-schema==4.15.0", "botframework-connector==4.15.0", "botbuilder-core==4.15.0", From 15240bd0b130763f5b4a1535c2e8cb83fc4843c4 Mon Sep 17 00:00:00 2001 From: Ivan Sabelnikov Date: Fri, 15 Sep 2023 14:13:17 +0100 Subject: [PATCH 02/22] Add CI --- .github/workflows/ci.yaml | 45 ++++++++++++++++++++++++++++++++++ .github/workflows/pr-style.yml | 18 -------------- 2 files changed, 45 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/ci.yaml delete mode 100644 .github/workflows/pr-style.yml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 000000000..a850fce7d --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,45 @@ +name: ci + +on: + push: + branches: + - main + +env: + WORKING_DIR: ./libraries/botbuilder-integration-aiohttp + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Pull Source + uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: "3.10" + + - name: Establish Versioning, Tags, and Labels + id: vtl + uses: mapped/action-vtl@latest + with: + baseVersion: 1.0.0 + gitHubToken: ${{ secrets.GITHUB_TOKEN }} + + - name: Run image + uses: abatilo/actions-poetry@v2.1.5 + with: + poetry-version: "1.4.2" + + - name: update package version + run: | + echo "${{ steps.vtl.outputs.ver_semVerNoMeta}}" + poetry version "${{ steps.vtl.outputs.ver_semVerNoMeta}}" + working-directory: ${{ env.WORKING_DIR }} + + - name: publish the package to PyPI + run: | + poetry publish --build -r fury -u ${{ secrets.FURY_PUSH_TOKEN }} -p NOPASS + working-directory: ${{ env.WORKING_DIR }} diff --git a/.github/workflows/pr-style.yml b/.github/workflows/pr-style.yml deleted file mode 100644 index 51dbf531a..000000000 --- a/.github/workflows/pr-style.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: pr-style.yml - -on: - pull_request: - types: [opened, edited, synchronize] - -jobs: - prStyle: - name: pr-style - runs-on: ubuntu-latest - - steps: - - uses: joshgummersall/pr-style@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - require_issue: "true" - skip_authors: "dependabot" From fbc4076d699401999b299a7c84dbb951f155e735 Mon Sep 17 00:00:00 2001 From: Ivan Sabelnikov Date: Fri, 15 Sep 2023 14:23:43 +0100 Subject: [PATCH 03/22] Fix publish --- .github/workflows/ci.yaml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a850fce7d..8355d9dcc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,18 +28,11 @@ jobs: baseVersion: 1.0.0 gitHubToken: ${{ secrets.GITHUB_TOKEN }} - - name: Run image - uses: abatilo/actions-poetry@v2.1.5 - with: - poetry-version: "1.4.2" - - - name: update package version - run: | - echo "${{ steps.vtl.outputs.ver_semVerNoMeta}}" - poetry version "${{ steps.vtl.outputs.ver_semVerNoMeta}}" - working-directory: ${{ env.WORKING_DIR }} - - - name: publish the package to PyPI + - name: publish run: | - poetry publish --build -r fury -u ${{ secrets.FURY_PUSH_TOKEN }} -p NOPASS + echo version: $packageVersion + python setup.py sdist + curl -F package=@./dist/botbuilder-integration-aiohttp-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ + env: + packageVersion: ${{ steps.vtl.outputs.ver_semVerNoMeta}} working-directory: ${{ env.WORKING_DIR }} From 81ff6837c1358a27c9c10742fef983ba5b484de0 Mon Sep 17 00:00:00 2001 From: "Jason B. Koh" Date: Fri, 15 Sep 2023 10:46:32 -0700 Subject: [PATCH 04/22] downgrade botbuilder core --- libraries/botbuilder-integration-aiohttp/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/botbuilder-integration-aiohttp/requirements.txt b/libraries/botbuilder-integration-aiohttp/requirements.txt index 3e2517b24..b46b6ea3e 100644 --- a/libraries/botbuilder-integration-aiohttp/requirements.txt +++ b/libraries/botbuilder-integration-aiohttp/requirements.txt @@ -1,4 +1,4 @@ msrest==0.6.* -botframework-connector==4.15.0 -botbuilder-schema==4.15.0 +botframework-connector==4.14.0 +botbuilder-schema==4.14.0 aiohttp==3.8.5 From 9376d8f0adb073e507918bb89994f6c89610b26f Mon Sep 17 00:00:00 2001 From: "Jason B. Koh" Date: Fri, 15 Sep 2023 10:52:37 -0700 Subject: [PATCH 05/22] downgrade dep versions --- libraries/botbuilder-integration-aiohttp/setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index 338077a81..b0b5c5f49 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -6,9 +6,9 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ - "botbuilder-schema==4.15.0", - "botframework-connector==4.15.0", - "botbuilder-core==4.15.0", + "botbuilder-schema==4.14.0", + "botframework-connector==4.14.0", + "botbuilder-core==4.14.0", "yarl<=1.4.2", "aiohttp==3.8.5", ] From 910ac7743a77e7ed90c7f90d3cb7e9a29da0da39 Mon Sep 17 00:00:00 2001 From: Ivan Sabelnikov Date: Tue, 19 Sep 2023 14:33:35 +0100 Subject: [PATCH 06/22] fix: fix CVEs & publish 3 more packages --- .github/workflows/ci.yaml | 34 +++++++++++++++++++---- libraries/botbuilder-core/setup.py | 4 +-- libraries/botframework-connector/setup.py | 2 +- libraries/botframework-streaming/setup.py | 2 +- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8355d9dcc..8c019ee84 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,9 +5,6 @@ on: branches: - main -env: - WORKING_DIR: ./libraries/botbuilder-integration-aiohttp - jobs: build: runs-on: ubuntu-latest @@ -28,11 +25,38 @@ jobs: baseVersion: 1.0.0 gitHubToken: ${{ secrets.GITHUB_TOKEN }} - - name: publish + - name: publish botbuilder-integration-aiohttp run: | echo version: $packageVersion python setup.py sdist curl -F package=@./dist/botbuilder-integration-aiohttp-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ env: packageVersion: ${{ steps.vtl.outputs.ver_semVerNoMeta}} - working-directory: ${{ env.WORKING_DIR }} + working-directory: ./libraries/botbuilder-integration-aiohttp + + - name: publish botframework-connector + run: | + echo version: $packageVersion + python setup.py sdist + curl -F package=@./dist/botframework-connector-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ + env: + packageVersion: ${{ steps.vtl.outputs.ver_semVerNoMeta}} + working-directory: ./libraries/botframework-connector + + - name: publish botframework-streaming + run: | + echo version: $packageVersion + python setup.py sdist + curl -F package=@./dist/botframework-streaming-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ + env: + packageVersion: ${{ steps.vtl.outputs.ver_semVerNoMeta}} + working-directory: ./libraries/botframework-streaming + + - name: publish botbuilder-core + run: | + echo version: $packageVersion + python setup.py sdist + curl -F package=@./dist/botbuilder-core-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ + env: + packageVersion: ${{ steps.vtl.outputs.ver_semVerNoMeta}} + working-directory: ./libraries/botbuilder-core diff --git a/libraries/botbuilder-core/setup.py b/libraries/botbuilder-core/setup.py index a9b9b9fd0..067d3a3a8 100644 --- a/libraries/botbuilder-core/setup.py +++ b/libraries/botbuilder-core/setup.py @@ -7,8 +7,8 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ "botbuilder-schema==4.15.0", - "botframework-connector==4.15.0", - "botframework-streaming==4.15.0", + "botframework-connector>=4.15.0", + "botframework-streaming>=4.15.0", "jsonpickle>=1.2,<1.5", ] diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index 15411c492..60c8ea126 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -8,7 +8,7 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ "msrest==0.6.*", - # "requests>=2.23.0,<2.26", + "requests>=2.23.0,<2.31.0", "PyJWT>=2.4.0", "botbuilder-schema==4.15.0", "msal==1.*", diff --git a/libraries/botframework-streaming/setup.py b/libraries/botframework-streaming/setup.py index 9a5f06e20..53f98cf4b 100644 --- a/libraries/botframework-streaming/setup.py +++ b/libraries/botframework-streaming/setup.py @@ -7,7 +7,7 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ "botbuilder-schema==4.15.0", - "botframework-connector==4.15.0", + "botframework-connector>=4.15.0", ] root = os.path.abspath(os.path.dirname(__file__)) From 1440de34d5e0391966b0b06da9d3a3bd99291139 Mon Sep 17 00:00:00 2001 From: Ivan Sabelnikov Date: Tue, 19 Sep 2023 14:44:56 +0100 Subject: [PATCH 07/22] Allow higher SDK versions --- libraries/botbuilder-integration-aiohttp/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index b0b5c5f49..0572f049d 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -7,8 +7,8 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ "botbuilder-schema==4.14.0", - "botframework-connector==4.14.0", - "botbuilder-core==4.14.0", + "botframework-connector>=4.14.0", + "botbuilder-core>=4.14.0", "yarl<=1.4.2", "aiohttp==3.8.5", ] From 43b6237c979c6770b378ce716bc3e304169f7e5b Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Tue, 19 Sep 2023 16:07:10 -0700 Subject: [PATCH 08/22] forked package for botframework-streaming --- libraries/botframework-streaming/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botframework-streaming/setup.py b/libraries/botframework-streaming/setup.py index 53f98cf4b..645cbdfc1 100644 --- a/libraries/botframework-streaming/setup.py +++ b/libraries/botframework-streaming/setup.py @@ -21,7 +21,7 @@ long_description = f.read() setup( - name=package_info["__title__"], + name=package_info["__title__"] + "-forked", version=package_info["__version__"], url=package_info["__uri__"], author=package_info["__author__"], From 1edb9d4cc497adb5ab5aa4c35789ffe624bb1a0f Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Tue, 19 Sep 2023 16:11:53 -0700 Subject: [PATCH 09/22] fix streaming upload --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8c019ee84..f5de850db 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,7 +47,7 @@ jobs: run: | echo version: $packageVersion python setup.py sdist - curl -F package=@./dist/botframework-streaming-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ + curl -F package=@./dist/botframework-streaming-forked-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ env: packageVersion: ${{ steps.vtl.outputs.ver_semVerNoMeta}} working-directory: ./libraries/botframework-streaming From fe1287843e0142c9fc75092f230a59efacbe8bd3 Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Tue, 19 Sep 2023 16:13:51 -0700 Subject: [PATCH 10/22] use forked in core --- .github/workflows/ci.yaml | 2 +- libraries/botbuilder-core/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f5de850db..5f3ce984a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -43,7 +43,7 @@ jobs: packageVersion: ${{ steps.vtl.outputs.ver_semVerNoMeta}} working-directory: ./libraries/botframework-connector - - name: publish botframework-streaming + - name: publish botframework-streaming-forked run: | echo version: $packageVersion python setup.py sdist diff --git a/libraries/botbuilder-core/setup.py b/libraries/botbuilder-core/setup.py index 067d3a3a8..8c69644fe 100644 --- a/libraries/botbuilder-core/setup.py +++ b/libraries/botbuilder-core/setup.py @@ -8,7 +8,7 @@ REQUIRES = [ "botbuilder-schema==4.15.0", "botframework-connector>=4.15.0", - "botframework-streaming>=4.15.0", + "botframework-streaming-forked>=1.0.8", "jsonpickle>=1.2,<1.5", ] From 999a35b6242ac24bea3ff97d4250c2c77c20b7cc Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Tue, 19 Sep 2023 16:15:27 -0700 Subject: [PATCH 11/22] core forked --- .github/workflows/ci.yaml | 4 ++-- libraries/botbuilder-core/setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5f3ce984a..6a0ad6843 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -52,11 +52,11 @@ jobs: packageVersion: ${{ steps.vtl.outputs.ver_semVerNoMeta}} working-directory: ./libraries/botframework-streaming - - name: publish botbuilder-core + - name: publish botbuilder-core-forked run: | echo version: $packageVersion python setup.py sdist - curl -F package=@./dist/botbuilder-core-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ + curl -F package=@./dist/botbuilder-core-forked-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ env: packageVersion: ${{ steps.vtl.outputs.ver_semVerNoMeta}} working-directory: ./libraries/botbuilder-core diff --git a/libraries/botbuilder-core/setup.py b/libraries/botbuilder-core/setup.py index 8c69644fe..d45698870 100644 --- a/libraries/botbuilder-core/setup.py +++ b/libraries/botbuilder-core/setup.py @@ -23,7 +23,7 @@ long_description = f.read() setup( - name=package_info["__title__"], + name=package_info["__title__"] + "-forked", version=package_info["__version__"], url=package_info["__uri__"], author=package_info["__author__"], From 0045c6286ce52e01fe1ef1395c46c501af85a258 Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Tue, 19 Sep 2023 16:18:17 -0700 Subject: [PATCH 12/22] forked connector --- .github/workflows/ci.yaml | 4 ++-- libraries/botframework-connector/setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6a0ad6843..4a575418d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,11 +34,11 @@ jobs: packageVersion: ${{ steps.vtl.outputs.ver_semVerNoMeta}} working-directory: ./libraries/botbuilder-integration-aiohttp - - name: publish botframework-connector + - name: publish botframework-connector-forked run: | echo version: $packageVersion python setup.py sdist - curl -F package=@./dist/botframework-connector-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ + curl -F package=@./dist/botframework-connector-forked-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ env: packageVersion: ${{ steps.vtl.outputs.ver_semVerNoMeta}} working-directory: ./libraries/botframework-connector diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index 60c8ea126..235e17009 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -20,7 +20,7 @@ long_description = f.read() setup( - name=NAME, + name=NAME + "-forked", version=VERSION, description="Microsoft Bot Framework Bot Builder SDK for Python.", author="Microsoft", From 1ccca8b23f2c07b0d9691f87c64f45528977482d Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Tue, 19 Sep 2023 16:19:49 -0700 Subject: [PATCH 13/22] use forked inside core --- libraries/botbuilder-core/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/botbuilder-core/setup.py b/libraries/botbuilder-core/setup.py index d45698870..61e93d7d6 100644 --- a/libraries/botbuilder-core/setup.py +++ b/libraries/botbuilder-core/setup.py @@ -7,8 +7,8 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ "botbuilder-schema==4.15.0", - "botframework-connector>=4.15.0", - "botframework-streaming-forked>=1.0.8", + "botframework-connector-forked>=1.0.11", + "botframework-streaming-forked>=1.0.11", "jsonpickle>=1.2,<1.5", ] From 9007b3b0468d3a7f4a33847f700624b81de38837 Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Tue, 19 Sep 2023 16:31:55 -0700 Subject: [PATCH 14/22] use forked --- .github/workflows/ci.yaml | 4 ++-- libraries/botbuilder-integration-aiohttp/setup.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4a575418d..464cea4e3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -25,11 +25,11 @@ jobs: baseVersion: 1.0.0 gitHubToken: ${{ secrets.GITHUB_TOKEN }} - - name: publish botbuilder-integration-aiohttp + - name: publish botbuilder-integration-aiohttp-forked run: | echo version: $packageVersion python setup.py sdist - curl -F package=@./dist/botbuilder-integration-aiohttp-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ + curl -F package=@./dist/botbuilder-integration-aiohttp-forked-$packageVersion.tar.gz https://${{ secrets.FURY_PUSH_TOKEN }}@push.fury.io/mapped/ env: packageVersion: ${{ steps.vtl.outputs.ver_semVerNoMeta}} working-directory: ./libraries/botbuilder-integration-aiohttp diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index 0572f049d..c3e867cef 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -7,8 +7,8 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ "botbuilder-schema==4.14.0", - "botframework-connector>=4.14.0", - "botbuilder-core>=4.14.0", + "botframework-connector-forked>=1.0.10", + "botbuilder-core-forked>=1.0.11", "yarl<=1.4.2", "aiohttp==3.8.5", ] @@ -24,7 +24,7 @@ long_description = f.read() setup( - name=package_info["__title__"], + name=package_info["__title__"] + "-forked", version=package_info["__version__"], url=package_info["__uri__"], author=package_info["__author__"], From f1f9c94910b9d201077833ed5e307da01336d556 Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Tue, 19 Sep 2023 23:11:09 -0700 Subject: [PATCH 15/22] rollback schema version --- libraries/botbuilder-adapters-slack/setup.py | 2 +- libraries/botbuilder-ai/requirements.txt | 2 +- libraries/botbuilder-ai/setup.py | 2 +- libraries/botbuilder-applicationinsights/setup.py | 2 +- libraries/botbuilder-azure/setup.py | 2 +- libraries/botbuilder-core/requirements.txt | 2 +- libraries/botbuilder-core/setup.py | 2 +- libraries/botbuilder-dialogs/requirements.txt | 2 +- libraries/botbuilder-dialogs/setup.py | 2 +- .../botbuilder-integration-applicationinsights-aiohttp/setup.py | 2 +- libraries/botbuilder-testing/requirements.txt | 2 +- libraries/botbuilder-testing/setup.py | 2 +- libraries/botframework-connector/requirements.txt | 2 +- libraries/botframework-connector/setup.py | 2 +- libraries/botframework-streaming/setup.py | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libraries/botbuilder-adapters-slack/setup.py b/libraries/botbuilder-adapters-slack/setup.py index 41ac5dc42..e44c2168c 100644 --- a/libraries/botbuilder-adapters-slack/setup.py +++ b/libraries/botbuilder-adapters-slack/setup.py @@ -5,7 +5,7 @@ from setuptools import setup REQUIRES = [ - "botbuilder-schema==4.15.0", + "botbuilder-schema=4.14.0", "botframework-connector==4.15.0", "botbuilder-core==4.15.0", "pyslack", diff --git a/libraries/botbuilder-ai/requirements.txt b/libraries/botbuilder-ai/requirements.txt index b1b9ce14a..632a97696 100644 --- a/libraries/botbuilder-ai/requirements.txt +++ b/libraries/botbuilder-ai/requirements.txt @@ -1,5 +1,5 @@ msrest==0.6.* -botbuilder-schema==4.15.0 +botbuilder-schema=4.14.0 botbuilder-core==4.15.0 requests==2.31.0 aiounittest==1.3.0 diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py index 476d9a085..3d5705739 100644 --- a/libraries/botbuilder-ai/setup.py +++ b/libraries/botbuilder-ai/setup.py @@ -6,7 +6,7 @@ REQUIRES = [ "azure-cognitiveservices-language-luis==0.2.0", - "botbuilder-schema==4.15.0", + "botbuilder-schema=4.14.0", "botbuilder-core==4.15.0", "aiohttp==3.8.5", ] diff --git a/libraries/botbuilder-applicationinsights/setup.py b/libraries/botbuilder-applicationinsights/setup.py index fe0b40bfe..ea7bf53f8 100644 --- a/libraries/botbuilder-applicationinsights/setup.py +++ b/libraries/botbuilder-applicationinsights/setup.py @@ -6,7 +6,7 @@ REQUIRES = [ "applicationinsights==0.11.9", - "botbuilder-schema==4.15.0", + "botbuilder-schema=4.14.0", "botframework-connector==4.15.0", "botbuilder-core==4.15.0", ] diff --git a/libraries/botbuilder-azure/setup.py b/libraries/botbuilder-azure/setup.py index 0b9806867..6ad2745eb 100644 --- a/libraries/botbuilder-azure/setup.py +++ b/libraries/botbuilder-azure/setup.py @@ -8,7 +8,7 @@ "azure-cosmos==3.2.0", "azure-storage-blob==12.7.0", "azure-storage-queue==12.1.5", - "botbuilder-schema==4.15.0", + "botbuilder-schema=4.14.0", "botframework-connector==4.15.0", "jsonpickle>=1.2,<1.5", ] diff --git a/libraries/botbuilder-core/requirements.txt b/libraries/botbuilder-core/requirements.txt index 715def773..dbfba5ecb 100644 --- a/libraries/botbuilder-core/requirements.txt +++ b/libraries/botbuilder-core/requirements.txt @@ -1,6 +1,6 @@ msrest==0.6.* botframework-connector==4.15.0 -botbuilder-schema==4.15.0 +botbuilder-schema=4.14.0 botframework-streaming==4.15.0 requests==2.31.0 PyJWT==2.4.0 diff --git a/libraries/botbuilder-core/setup.py b/libraries/botbuilder-core/setup.py index 61e93d7d6..17e508482 100644 --- a/libraries/botbuilder-core/setup.py +++ b/libraries/botbuilder-core/setup.py @@ -6,7 +6,7 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ - "botbuilder-schema==4.15.0", + "botbuilder-schema=4.14.0", "botframework-connector-forked>=1.0.11", "botframework-streaming-forked>=1.0.11", "jsonpickle>=1.2,<1.5", diff --git a/libraries/botbuilder-dialogs/requirements.txt b/libraries/botbuilder-dialogs/requirements.txt index 5cb87629e..f9f11b9ac 100644 --- a/libraries/botbuilder-dialogs/requirements.txt +++ b/libraries/botbuilder-dialogs/requirements.txt @@ -1,6 +1,6 @@ msrest==0.6.* botframework-connector==4.15.0 -botbuilder-schema==4.15.0 +botbuilder-schema=4.14.0 botbuilder-core==4.15.0 requests==2.31.0 PyJWT==2.4.0 diff --git a/libraries/botbuilder-dialogs/setup.py b/libraries/botbuilder-dialogs/setup.py index 6e97715a5..1acca9cbd 100644 --- a/libraries/botbuilder-dialogs/setup.py +++ b/libraries/botbuilder-dialogs/setup.py @@ -13,7 +13,7 @@ "recognizers-text>=1.0.2a1", "recognizers-text-choice>=1.0.2a1", "babel==2.9.1", - "botbuilder-schema==4.15.0", + "botbuilder-schema=4.14.0", "botframework-connector==4.15.0", "botbuilder-core==4.15.0", ] diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py index f6b661c88..9332e0210 100644 --- a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py +++ b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py @@ -7,7 +7,7 @@ REQUIRES = [ "applicationinsights>=0.11.9", "aiohttp==3.8.5", - "botbuilder-schema==4.15.0", + "botbuilder-schema=4.14.0", "botframework-connector==4.15.0", "botbuilder-core==4.15.0", "botbuilder-applicationinsights==4.15.0", diff --git a/libraries/botbuilder-testing/requirements.txt b/libraries/botbuilder-testing/requirements.txt index 8f011997c..1679bcb0b 100644 --- a/libraries/botbuilder-testing/requirements.txt +++ b/libraries/botbuilder-testing/requirements.txt @@ -1,4 +1,4 @@ -botbuilder-schema==4.15.0 +botbuilder-schema=4.14.0 botbuilder-core==4.15.0 botbuilder-dialogs==4.15.0 aiounittest==1.4.0 diff --git a/libraries/botbuilder-testing/setup.py b/libraries/botbuilder-testing/setup.py index 0dbc2304d..4ac074ced 100644 --- a/libraries/botbuilder-testing/setup.py +++ b/libraries/botbuilder-testing/setup.py @@ -5,7 +5,7 @@ from setuptools import setup REQUIRES = [ - "botbuilder-schema==4.15.0", + "botbuilder-schema=4.14.0", "botbuilder-core==4.15.0", "botbuilder-dialogs==4.15.0", "botbuilder-azure==4.15.0", diff --git a/libraries/botframework-connector/requirements.txt b/libraries/botframework-connector/requirements.txt index 0637ebad8..5f1668300 100644 --- a/libraries/botframework-connector/requirements.txt +++ b/libraries/botframework-connector/requirements.txt @@ -1,5 +1,5 @@ msrest==0.6.* -botbuilder-schema==4.15.0 +botbuilder-schema=4.14.0 requests==2.31.0 PyJWT==2.4.0 cryptography==39.0.1 diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index 235e17009..eb00e215f 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -10,7 +10,7 @@ "msrest==0.6.*", "requests>=2.23.0,<2.31.0", "PyJWT>=2.4.0", - "botbuilder-schema==4.15.0", + "botbuilder-schema=4.14.0", "msal==1.*", ] diff --git a/libraries/botframework-streaming/setup.py b/libraries/botframework-streaming/setup.py index 645cbdfc1..8a088a55b 100644 --- a/libraries/botframework-streaming/setup.py +++ b/libraries/botframework-streaming/setup.py @@ -6,7 +6,7 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ - "botbuilder-schema==4.15.0", + "botbuilder-schema=4.14.0", "botframework-connector>=4.15.0", ] From b7b2cff61b968131a6cc5dadf28df30850f70202 Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Tue, 19 Sep 2023 23:14:58 -0700 Subject: [PATCH 16/22] tyop --- libraries/botbuilder-adapters-slack/setup.py | 2 +- libraries/botbuilder-ai/requirements.txt | 2 +- libraries/botbuilder-ai/setup.py | 2 +- libraries/botbuilder-applicationinsights/setup.py | 2 +- libraries/botbuilder-azure/setup.py | 2 +- libraries/botbuilder-core/requirements.txt | 2 +- libraries/botbuilder-core/setup.py | 2 +- libraries/botbuilder-dialogs/requirements.txt | 2 +- libraries/botbuilder-dialogs/setup.py | 2 +- .../botbuilder-integration-applicationinsights-aiohttp/setup.py | 2 +- libraries/botbuilder-testing/requirements.txt | 2 +- libraries/botbuilder-testing/setup.py | 2 +- libraries/botframework-connector/requirements.txt | 2 +- libraries/botframework-connector/setup.py | 2 +- libraries/botframework-streaming/setup.py | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libraries/botbuilder-adapters-slack/setup.py b/libraries/botbuilder-adapters-slack/setup.py index e44c2168c..24a311f16 100644 --- a/libraries/botbuilder-adapters-slack/setup.py +++ b/libraries/botbuilder-adapters-slack/setup.py @@ -5,7 +5,7 @@ from setuptools import setup REQUIRES = [ - "botbuilder-schema=4.14.0", + "botbuilder-schema==4.14.0", "botframework-connector==4.15.0", "botbuilder-core==4.15.0", "pyslack", diff --git a/libraries/botbuilder-ai/requirements.txt b/libraries/botbuilder-ai/requirements.txt index 632a97696..5511e590f 100644 --- a/libraries/botbuilder-ai/requirements.txt +++ b/libraries/botbuilder-ai/requirements.txt @@ -1,5 +1,5 @@ msrest==0.6.* -botbuilder-schema=4.14.0 +botbuilder-schema==4.14.0 botbuilder-core==4.15.0 requests==2.31.0 aiounittest==1.3.0 diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py index 3d5705739..15e8d8a7f 100644 --- a/libraries/botbuilder-ai/setup.py +++ b/libraries/botbuilder-ai/setup.py @@ -6,7 +6,7 @@ REQUIRES = [ "azure-cognitiveservices-language-luis==0.2.0", - "botbuilder-schema=4.14.0", + "botbuilder-schema==4.14.0", "botbuilder-core==4.15.0", "aiohttp==3.8.5", ] diff --git a/libraries/botbuilder-applicationinsights/setup.py b/libraries/botbuilder-applicationinsights/setup.py index ea7bf53f8..3ef45b6fb 100644 --- a/libraries/botbuilder-applicationinsights/setup.py +++ b/libraries/botbuilder-applicationinsights/setup.py @@ -6,7 +6,7 @@ REQUIRES = [ "applicationinsights==0.11.9", - "botbuilder-schema=4.14.0", + "botbuilder-schema==4.14.0", "botframework-connector==4.15.0", "botbuilder-core==4.15.0", ] diff --git a/libraries/botbuilder-azure/setup.py b/libraries/botbuilder-azure/setup.py index 6ad2745eb..704856bf5 100644 --- a/libraries/botbuilder-azure/setup.py +++ b/libraries/botbuilder-azure/setup.py @@ -8,7 +8,7 @@ "azure-cosmos==3.2.0", "azure-storage-blob==12.7.0", "azure-storage-queue==12.1.5", - "botbuilder-schema=4.14.0", + "botbuilder-schema==4.14.0", "botframework-connector==4.15.0", "jsonpickle>=1.2,<1.5", ] diff --git a/libraries/botbuilder-core/requirements.txt b/libraries/botbuilder-core/requirements.txt index dbfba5ecb..9bb8cbf2d 100644 --- a/libraries/botbuilder-core/requirements.txt +++ b/libraries/botbuilder-core/requirements.txt @@ -1,6 +1,6 @@ msrest==0.6.* botframework-connector==4.15.0 -botbuilder-schema=4.14.0 +botbuilder-schema==4.14.0 botframework-streaming==4.15.0 requests==2.31.0 PyJWT==2.4.0 diff --git a/libraries/botbuilder-core/setup.py b/libraries/botbuilder-core/setup.py index 17e508482..7fb1fe8f0 100644 --- a/libraries/botbuilder-core/setup.py +++ b/libraries/botbuilder-core/setup.py @@ -6,7 +6,7 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ - "botbuilder-schema=4.14.0", + "botbuilder-schema==4.14.0", "botframework-connector-forked>=1.0.11", "botframework-streaming-forked>=1.0.11", "jsonpickle>=1.2,<1.5", diff --git a/libraries/botbuilder-dialogs/requirements.txt b/libraries/botbuilder-dialogs/requirements.txt index f9f11b9ac..31eef27ab 100644 --- a/libraries/botbuilder-dialogs/requirements.txt +++ b/libraries/botbuilder-dialogs/requirements.txt @@ -1,6 +1,6 @@ msrest==0.6.* botframework-connector==4.15.0 -botbuilder-schema=4.14.0 +botbuilder-schema==4.14.0 botbuilder-core==4.15.0 requests==2.31.0 PyJWT==2.4.0 diff --git a/libraries/botbuilder-dialogs/setup.py b/libraries/botbuilder-dialogs/setup.py index 1acca9cbd..aa94be6fd 100644 --- a/libraries/botbuilder-dialogs/setup.py +++ b/libraries/botbuilder-dialogs/setup.py @@ -13,7 +13,7 @@ "recognizers-text>=1.0.2a1", "recognizers-text-choice>=1.0.2a1", "babel==2.9.1", - "botbuilder-schema=4.14.0", + "botbuilder-schema==4.14.0", "botframework-connector==4.15.0", "botbuilder-core==4.15.0", ] diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py index 9332e0210..1db489bdc 100644 --- a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py +++ b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py @@ -7,7 +7,7 @@ REQUIRES = [ "applicationinsights>=0.11.9", "aiohttp==3.8.5", - "botbuilder-schema=4.14.0", + "botbuilder-schema==4.14.0", "botframework-connector==4.15.0", "botbuilder-core==4.15.0", "botbuilder-applicationinsights==4.15.0", diff --git a/libraries/botbuilder-testing/requirements.txt b/libraries/botbuilder-testing/requirements.txt index 1679bcb0b..44047a344 100644 --- a/libraries/botbuilder-testing/requirements.txt +++ b/libraries/botbuilder-testing/requirements.txt @@ -1,4 +1,4 @@ -botbuilder-schema=4.14.0 +botbuilder-schema==4.14.0 botbuilder-core==4.15.0 botbuilder-dialogs==4.15.0 aiounittest==1.4.0 diff --git a/libraries/botbuilder-testing/setup.py b/libraries/botbuilder-testing/setup.py index 4ac074ced..4bda36d77 100644 --- a/libraries/botbuilder-testing/setup.py +++ b/libraries/botbuilder-testing/setup.py @@ -5,7 +5,7 @@ from setuptools import setup REQUIRES = [ - "botbuilder-schema=4.14.0", + "botbuilder-schema==4.14.0", "botbuilder-core==4.15.0", "botbuilder-dialogs==4.15.0", "botbuilder-azure==4.15.0", diff --git a/libraries/botframework-connector/requirements.txt b/libraries/botframework-connector/requirements.txt index 5f1668300..7f3892334 100644 --- a/libraries/botframework-connector/requirements.txt +++ b/libraries/botframework-connector/requirements.txt @@ -1,5 +1,5 @@ msrest==0.6.* -botbuilder-schema=4.14.0 +botbuilder-schema==4.14.0 requests==2.31.0 PyJWT==2.4.0 cryptography==39.0.1 diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index eb00e215f..92ff6a113 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -10,7 +10,7 @@ "msrest==0.6.*", "requests>=2.23.0,<2.31.0", "PyJWT>=2.4.0", - "botbuilder-schema=4.14.0", + "botbuilder-schema==4.14.0", "msal==1.*", ] diff --git a/libraries/botframework-streaming/setup.py b/libraries/botframework-streaming/setup.py index 8a088a55b..a25787be4 100644 --- a/libraries/botframework-streaming/setup.py +++ b/libraries/botframework-streaming/setup.py @@ -6,7 +6,7 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ - "botbuilder-schema=4.14.0", + "botbuilder-schema==4.14.0", "botframework-connector>=4.15.0", ] From b3c10835255916a3dae4e77c30021859fa5be38f Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Tue, 19 Sep 2023 23:24:11 -0700 Subject: [PATCH 17/22] missing forked dep --- libraries/botframework-streaming/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botframework-streaming/setup.py b/libraries/botframework-streaming/setup.py index a25787be4..c5f7ad85f 100644 --- a/libraries/botframework-streaming/setup.py +++ b/libraries/botframework-streaming/setup.py @@ -7,7 +7,7 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ "botbuilder-schema==4.14.0", - "botframework-connector>=4.15.0", + "botframework-connector-forked>=1.0.15", ] root = os.path.abspath(os.path.dirname(__file__)) From d4d6f96f5f1038eec8a9c1e236c60d547a4120c0 Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Tue, 19 Sep 2023 23:28:24 -0700 Subject: [PATCH 18/22] trying to remove VERSION --- libraries/botframework-streaming/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botframework-streaming/setup.py b/libraries/botframework-streaming/setup.py index c5f7ad85f..4f732925b 100644 --- a/libraries/botframework-streaming/setup.py +++ b/libraries/botframework-streaming/setup.py @@ -4,7 +4,7 @@ import os from setuptools import setup -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" +#VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ "botbuilder-schema==4.14.0", "botframework-connector-forked>=1.0.15", From 317eef988a9e0e254c1976233e6f69ec974d4e43 Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Tue, 19 Sep 2023 23:43:42 -0700 Subject: [PATCH 19/22] update requests --- libraries/botframework-connector/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index 92ff6a113..7db4cc6a5 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -8,7 +8,7 @@ VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" REQUIRES = [ "msrest==0.6.*", - "requests>=2.23.0,<2.31.0", + "requests>=2.23.0,<3.0.0", "PyJWT>=2.4.0", "botbuilder-schema==4.14.0", "msal==1.*", From 3a26619b09ea3608b66f384ef802a5af8aa27398 Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Fri, 1 Dec 2023 01:00:39 -0800 Subject: [PATCH 20/22] update dep --- libraries/botbuilder-integration-aiohttp/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-integration-aiohttp/requirements.txt b/libraries/botbuilder-integration-aiohttp/requirements.txt index b46b6ea3e..416d578b3 100644 --- a/libraries/botbuilder-integration-aiohttp/requirements.txt +++ b/libraries/botbuilder-integration-aiohttp/requirements.txt @@ -1,4 +1,4 @@ msrest==0.6.* botframework-connector==4.14.0 botbuilder-schema==4.14.0 -aiohttp==3.8.5 +aiohttp>=3.9.0 From a8a8370a166490aa9493caa591805210ac0c10ad Mon Sep 17 00:00:00 2001 From: Jason Koh Date: Fri, 1 Dec 2023 01:23:57 -0800 Subject: [PATCH 21/22] update dep --- libraries/botbuilder-integration-aiohttp/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index c3e867cef..d175b908e 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -10,7 +10,7 @@ "botframework-connector-forked>=1.0.10", "botbuilder-core-forked>=1.0.11", "yarl<=1.4.2", - "aiohttp==3.8.5", + "aiohttp>=3.9.0", ] root = os.path.abspath(os.path.dirname(__file__)) From 0c8d270698c85b7a7d040b33546dec0b8a5681c3 Mon Sep 17 00:00:00 2001 From: Ivan Sabelnikov Date: Fri, 6 Sep 2024 15:12:14 +0100 Subject: [PATCH 22/22] fix(#8689d5c2k): Bump not working yarl --- libraries/botbuilder-integration-aiohttp/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index d175b908e..90d5fe83a 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -9,7 +9,7 @@ "botbuilder-schema==4.14.0", "botframework-connector-forked>=1.0.10", "botbuilder-core-forked>=1.0.11", - "yarl<=1.4.2", + "yarl>=1.8.1", "aiohttp>=3.9.0", ]