Skip to content

Commit

Permalink
Merge branch 'main' into docs-dapr-api-token
Browse files Browse the repository at this point in the history
  • Loading branch information
berndverst authored Jan 9, 2024
2 parents b810adb + 656207a commit c957fc8
Show file tree
Hide file tree
Showing 24 changed files with 980 additions and 531 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
- feature/*
tags:
- v*
- workflow-v*
- grpc-v*
- flask-v*
- fastapi-v*
pull_request:
branches:
- main
Expand All @@ -25,7 +29,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python_ver }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python_ver }}
- name: Install dependencies
Expand All @@ -52,41 +56,46 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine tox
- name: Build and publish Dapr Python SDK
if: startsWith(github.ref_name, 'v')
env:
TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_PASS }}
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
- name: Build and publish dapr-ext-workflow
if: startsWith(github.ref_name, 'worfklow-v')
env:
TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_PASS }}
run: |
cd ext/dapr-ext-workflow
python setup.py sdist bdist_wheel
twine upload dist/*
- name: Build and publish Dapr Flask Extension
if: startsWith(github.ref_name, 'flask-v')
env:
TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_PASS }}
run: |
cd ext/flask_dapr
python setup.py sdist bdist_wheel
twine upload dist/*
- name: Build and publish dapr-ext-grpc
if: startsWith(github.ref_name, 'grpc-v')
env:
TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_PASS }}
run: |
cd ext/dapr-ext-grpc
python setup.py sdist bdist_wheel
twine upload dist/*
- name: Build and publish dapr-ext-fastapi
if: startsWith(github.ref_name, 'fastapi-v')
env:
TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_PASS }}
run: |
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/fossa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ on:
- feature/*
tags:
- v*
- workflow-v*
- grpc-v*
- flask-v*
- fastapi-v*
pull_request:
branches:
- main
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/validate_examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
- feature/*
tags:
- v*
- workflow-v*
- grpc-v*
- fastapi-v*
- flask-v*
pull_request:
branches:
- main
Expand Down Expand Up @@ -70,7 +74,7 @@ jobs:
echo "DAPR_CLI_VER=$CLI_VERSION" >> $GITHUB_ENV
echo "Found $CLI_VERSION"
- name: Set up Python ${{ matrix.python_ver }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python_ver }}
- name: Install dependencies
Expand All @@ -81,7 +85,7 @@ jobs:
run: wget -q ${{ env.DAPR_INSTALL_URL }} -O - | /bin/bash -s ${{ env.DAPR_CLI_VER }}
- name: Set up Go ${{ env.GOVER }}
if: env.DAPR_REF != '' || env.DAPR_CLI_REF != ''
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ env.GOVER }}
- name: Checkout Dapr CLI repo to override dapr command.
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ cd python-sdk
pip3 install -e .
pip3 install -e ./ext/dapr-ext-grpc/
pip3 install -e ./ext/dapr-ext-fastapi/
pip3 install -e ./ext/dapr-ext-workflow/
```

3. Install required packages
Expand Down
2 changes: 1 addition & 1 deletion dapr/aio/clients/grpc/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def get_credentials(self):
async def close(self):
"""Closes Dapr runtime gRPC channel."""
if hasattr(self, '_channel') and self._channel:
self._channel.close()
await self._channel.close()

async def __aenter__(self) -> Self: # type: ignore
return self
Expand Down
73 changes: 37 additions & 36 deletions dapr/proto/common/v1/common_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c957fc8

Please sign in to comment.