diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 000000000..464cea4e3 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,62 @@ +name: ci + +on: + push: + branches: + - main + +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: publish botbuilder-integration-aiohttp-forked + run: | + echo version: $packageVersion + python setup.py sdist + 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 + + - name: publish botframework-connector-forked + run: | + echo version: $packageVersion + python setup.py sdist + 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 + + - name: publish botframework-streaming-forked + run: | + echo version: $packageVersion + python setup.py sdist + 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 + + - name: publish botbuilder-core-forked + run: | + echo version: $packageVersion + python setup.py sdist + 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/.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" 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-adapters-slack/setup.py b/libraries/botbuilder-adapters-slack/setup.py index 41ac5dc42..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.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..5511e590f 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 b178b6f82..15e8d8a7f 100644 --- a/libraries/botbuilder-ai/setup.py +++ b/libraries/botbuilder-ai/setup.py @@ -6,9 +6,9 @@ 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.4", + "aiohttp==3.8.5", ] TESTS_REQUIRES = ["aiounittest>=1.1.0"] diff --git a/libraries/botbuilder-applicationinsights/setup.py b/libraries/botbuilder-applicationinsights/setup.py index fe0b40bfe..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.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..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.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..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.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 a9b9b9fd0..7fb1fe8f0 100644 --- a/libraries/botbuilder-core/setup.py +++ b/libraries/botbuilder-core/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", - "botframework-streaming==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", ] @@ -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__"], diff --git a/libraries/botbuilder-dialogs/requirements.txt b/libraries/botbuilder-dialogs/requirements.txt index 5cb87629e..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.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..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.15.0", + "botbuilder-schema==4.14.0", "botframework-connector==4.15.0", "botbuilder-core==4.15.0", ] diff --git a/libraries/botbuilder-integration-aiohttp/requirements.txt b/libraries/botbuilder-integration-aiohttp/requirements.txt index 6b3bb75a1..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.15.0 -botbuilder-schema==4.15.0 -aiohttp==3.8.4 +botframework-connector==4.14.0 +botbuilder-schema==4.14.0 +aiohttp>=3.9.0 diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index ddedc2e4e..90d5fe83a 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -6,11 +6,11 @@ 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", - "yarl<=1.4.2", - "aiohttp==3.8.4", + "botbuilder-schema==4.14.0", + "botframework-connector-forked>=1.0.10", + "botbuilder-core-forked>=1.0.11", + "yarl>=1.8.1", + "aiohttp>=3.9.0", ] root = os.path.abspath(os.path.dirname(__file__)) @@ -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__"], diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py index 30faceae2..1db489bdc 100644 --- a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py +++ b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py @@ -6,8 +6,8 @@ REQUIRES = [ "applicationinsights>=0.11.9", - "aiohttp==3.8.4", - "botbuilder-schema==4.15.0", + "aiohttp==3.8.5", + "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..44047a344 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..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.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..7f3892334 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 15411c492..7db4cc6a5 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -8,9 +8,9 @@ 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,<3.0.0", "PyJWT>=2.4.0", - "botbuilder-schema==4.15.0", + "botbuilder-schema==4.14.0", "msal==1.*", ] @@ -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", diff --git a/libraries/botframework-streaming/setup.py b/libraries/botframework-streaming/setup.py index 9a5f06e20..4f732925b 100644 --- a/libraries/botframework-streaming/setup.py +++ b/libraries/botframework-streaming/setup.py @@ -4,10 +4,10 @@ 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.15.0", - "botframework-connector==4.15.0", + "botbuilder-schema==4.14.0", + "botframework-connector-forked>=1.0.15", ] root = os.path.abspath(os.path.dirname(__file__)) @@ -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__"],