diff --git a/examples/invoke-http/README.md b/examples/invoke-http/README.md index 466392d20..7f69b1798 100644 --- a/examples/invoke-http/README.md +++ b/examples/invoke-http/README.md @@ -12,13 +12,17 @@ This example utilizes a receiver and a caller for the `invoke_method` functional ### Install requirements You can install dapr SDK package using pip command: +```sh +pip3 install dapr +``` - +Also install Flask package: ```sh -pip3 install dapr Flask +pip3 install Flask ``` @@ -55,7 +59,7 @@ expected_stdout_lines: - '== APP == 503' - '== APP == Internal Server Error' background: true -sleep: 5 +sleep: 5 --> ```bash @@ -66,7 +70,7 @@ dapr run --app-id=invoke-caller -- python3 invoke-caller.py ## Cleanup @@ -75,4 +79,4 @@ name: Shutdown dapr dapr stop --app-id invoke-receiver ``` - \ No newline at end of file + diff --git a/examples/w3c-tracing/requirements.txt b/examples/w3c-tracing/requirements.txt index f11985e63..32683b57c 100644 --- a/examples/w3c-tracing/requirements.txt +++ b/examples/w3c-tracing/requirements.txt @@ -1,5 +1,5 @@ -dapr-ext-grpc >= 1.17.0rc5 -dapr >= 1.17.0rc5 +dapr-ext-grpc >= 1.17.0.dev +dapr >= 1.17.0.dev opentelemetry-sdk opentelemetry-instrumentation-grpc opentelemetry-exporter-zipkin diff --git a/ext/dapr-ext-fastapi/setup.py b/ext/dapr-ext-fastapi/setup.py index 8d6a400cf..2899b9b24 100644 --- a/ext/dapr-ext-fastapi/setup.py +++ b/ext/dapr-ext-fastapi/setup.py @@ -13,6 +13,7 @@ limitations under the License. """ +import configparser import os from setuptools import setup @@ -47,11 +48,22 @@ def is_release(): # Get build number from GITHUB_RUN_NUMBER environment variable build_number = os.environ.get('GITHUB_RUN_NUMBER', '0') +cfg = configparser.ConfigParser() +cfg.read('setup.cfg') +install_requires = [ + r.strip() + for r in cfg.get('options', 'install_requires', fallback='').strip().splitlines() + if r.strip() +] + if not is_release(): name += '-dev' version = f'{__version__}{build_number}' description = 'The developmental release for Dapr FastAPI extension.' long_description = 'This is the developmental release for Dapr FastAPI extension.' + install_requires = [ + 'dapr-dev' + r[4:] if r.startswith('dapr ') else r for r in install_requires + ] print(f'package name: {name}, version: {version}', flush=True) @@ -61,4 +73,5 @@ def is_release(): version=version, description=description, long_description=long_description, + install_requires=install_requires, ) diff --git a/ext/dapr-ext-grpc/setup.py b/ext/dapr-ext-grpc/setup.py index 67d282b68..6c95a9151 100644 --- a/ext/dapr-ext-grpc/setup.py +++ b/ext/dapr-ext-grpc/setup.py @@ -13,6 +13,7 @@ limitations under the License. """ +import configparser import os from setuptools import setup @@ -47,11 +48,22 @@ def is_release(): # Get build number from GITHUB_RUN_NUMBER environment variable build_number = os.environ.get('GITHUB_RUN_NUMBER', '0') +cfg = configparser.ConfigParser() +cfg.read('setup.cfg') +install_requires = [ + r.strip() + for r in cfg.get('options', 'install_requires', fallback='').strip().splitlines() + if r.strip() +] + if not is_release(): name += '-dev' version = f'{__version__}{build_number}' description = 'The developmental release for Dapr gRPC AppCallback.' long_description = 'This is the developmental release for Dapr gRPC AppCallback.' + install_requires = [ + 'dapr-dev' + r[4:] if r.startswith('dapr ') else r for r in install_requires + ] print(f'package name: {name}, version: {version}', flush=True) @@ -61,4 +73,5 @@ def is_release(): version=version, description=description, long_description=long_description, + install_requires=install_requires, ) diff --git a/ext/dapr-ext-langgraph/setup.py b/ext/dapr-ext-langgraph/setup.py index 78c0daace..48dc9ad5a 100644 --- a/ext/dapr-ext-langgraph/setup.py +++ b/ext/dapr-ext-langgraph/setup.py @@ -13,6 +13,7 @@ limitations under the License. """ +import configparser import os from setuptools import setup @@ -47,6 +48,14 @@ def is_release(): # Get build number from GITHUB_RUN_NUMBER environment variable build_number = os.environ.get('GITHUB_RUN_NUMBER', '0') +cfg = configparser.ConfigParser() +cfg.read('setup.cfg') +install_requires = [ + r.strip() + for r in cfg.get('options', 'install_requires', fallback='').strip().splitlines() + if r.strip() +] + if not is_release(): name += '-dev' version = f'{__version__}{build_number}' @@ -54,6 +63,9 @@ def is_release(): long_description = ( 'This is the developmental release for the Dapr Checkpointer extension for LangGraph' ) + install_requires = [ + 'dapr-dev' + r[4:] if r.startswith('dapr ') else r for r in install_requires + ] print(f'package name: {name}, version: {version}', flush=True) @@ -63,4 +75,5 @@ def is_release(): version=version, description=description, long_description=long_description, + install_requires=install_requires, ) diff --git a/ext/dapr-ext-strands/setup.py b/ext/dapr-ext-strands/setup.py index 1d8c6732d..eea782d5b 100644 --- a/ext/dapr-ext-strands/setup.py +++ b/ext/dapr-ext-strands/setup.py @@ -13,6 +13,7 @@ limitations under the License. """ +import configparser import os from setuptools import setup @@ -47,6 +48,14 @@ def is_release(): # Get build number from GITHUB_RUN_NUMBER environment variable build_number = os.environ.get('GITHUB_RUN_NUMBER', '0') +cfg = configparser.ConfigParser() +cfg.read('setup.cfg') +install_requires = [ + r.strip() + for r in cfg.get('options', 'install_requires', fallback='').strip().splitlines() + if r.strip() +] + if not is_release(): name += '-dev' version = f'{__version__}{build_number}' @@ -54,6 +63,9 @@ def is_release(): 'The developmental release for the Dapr Session Manager extension for Strands Agents' ) long_description = 'This is the developmental release for the Dapr Session Manager extension for Strands Agents' + install_requires = [ + 'dapr-dev' + r[4:] if r.startswith('dapr ') else r for r in install_requires + ] print(f'package name: {name}, version: {version}', flush=True) @@ -63,4 +75,5 @@ def is_release(): version=version, description=description, long_description=long_description, + install_requires=install_requires, ) diff --git a/ext/dapr-ext-workflow/setup.py b/ext/dapr-ext-workflow/setup.py index e66837f7c..e09cf77a5 100644 --- a/ext/dapr-ext-workflow/setup.py +++ b/ext/dapr-ext-workflow/setup.py @@ -13,6 +13,7 @@ limitations under the License. """ +import configparser import os from setuptools import setup @@ -47,11 +48,22 @@ def is_release(): # Get build number from GITHUB_RUN_NUMBER environment variable build_number = os.environ.get('GITHUB_RUN_NUMBER', '0') +cfg = configparser.ConfigParser() +cfg.read('setup.cfg') +install_requires = [ + r.strip() + for r in cfg.get('options', 'install_requires', fallback='').strip().splitlines() + if r.strip() +] + if not is_release(): name += '-dev' version = f'{__version__}{build_number}' description = 'The developmental release for Dapr Workflow Authoring.' long_description = 'This is the developmental release for Dapr Workflow Authoring.' + install_requires = [ + 'dapr-dev' + r[4:] if r.startswith('dapr ') else r for r in install_requires + ] print(f'package name: {name}, version: {version}', flush=True) @@ -61,4 +73,5 @@ def is_release(): version=version, description=description, long_description=long_description, + install_requires=install_requires, ) diff --git a/ext/flask_dapr/setup.py b/ext/flask_dapr/setup.py index d2aca0577..b14b4fabc 100644 --- a/ext/flask_dapr/setup.py +++ b/ext/flask_dapr/setup.py @@ -13,6 +13,7 @@ limitations under the License. """ +import configparser import os from setuptools import setup @@ -47,11 +48,22 @@ def is_release(): # Get build number from GITHUB_RUN_NUMBER environment variable build_number = os.environ.get('GITHUB_RUN_NUMBER', '0') +cfg = configparser.ConfigParser() +cfg.read('setup.cfg') +install_requires = [ + r.strip() + for r in cfg.get('options', 'install_requires', fallback='').strip().splitlines() + if r.strip() +] + if not is_release(): name += '-dev' version = f'{__version__}{build_number}' description = 'The developmental release for Dapr Python SDK Flask.' long_description = 'This is the developmental release for Dapr Python SDK Flask.' + install_requires = [ + 'dapr-dev' + r[4:] if r.startswith('dapr ') else r for r in install_requires + ] print(f'package name: {name}, version: {version}', flush=True) @@ -61,4 +73,5 @@ def is_release(): version=version, description=description, long_description=long_description, + install_requires=install_requires, ) diff --git a/tox.ini b/tox.ini index 65f26ea0d..c7123a593 100644 --- a/tox.ini +++ b/tox.ini @@ -9,15 +9,6 @@ envlist = [testenv] setenv = PYTHONDONTWRITEBYTECODE=1 -deps = - -rdev-requirements.txt - -e {toxinidir}/ext/dapr-ext-workflow/ - -e {toxinidir}/ext/dapr-ext-grpc/ - -e {toxinidir}/ext/dapr-ext-fastapi/ - -e {toxinidir}/ext/dapr-ext-langgraph/ - -e {toxinidir}/ext/dapr-ext-strands/ - -e {toxinidir}/ext/flask_dapr/ - -e {toxinidir}/ commands = coverage run -m unittest discover -v ./tests coverage run -a -m unittest discover -v ./ext/dapr-ext-workflow/tests @@ -30,6 +21,14 @@ commands = commands_pre = pip uninstall -y dapr dapr-ext-grpc dapr-ext-fastapi dapr-ext-langgraph dapr-ext-strands dapr-ext-flask dapr-ext-langgraph dapr-ext-strands + pip install -r dev-requirements.txt \ + -e {toxinidir}/ \ + -e {toxinidir}/ext/dapr-ext-workflow/ \ + -e {toxinidir}/ext/dapr-ext-grpc/ \ + -e {toxinidir}/ext/dapr-ext-fastapi/ \ + -e {toxinidir}/ext/dapr-ext-langgraph/ \ + -e {toxinidir}/ext/dapr-ext-strands/ \ + -e {toxinidir}/ext/flask_dapr/ [testenv:ruff] basepython = python3 @@ -44,13 +43,6 @@ basepython = python3 changedir = ./examples/ deps = mechanical-markdown - -e {toxinidir}/ext/dapr-ext-workflow/ - -e {toxinidir}/ext/dapr-ext-grpc/ - -e {toxinidir}/ext/dapr-ext-fastapi/ - -e {toxinidir}/ext/dapr-ext-langgraph/ - -e {toxinidir}/ext/dapr-ext-strands/ - -e {toxinidir}/ext/flask_dapr/ - -e {toxinidir}/ commands = ./validate.sh conversation @@ -80,6 +72,13 @@ allowlist_externals=* commands_pre = pip uninstall -y dapr dapr-ext-grpc dapr-ext-fastapi dapr-ext-langgraph dapr-ext-strands dapr-ext-flask dapr-ext-langgraph dapr-ext-strands + pip install -e {toxinidir}/ \ + -e {toxinidir}/ext/dapr-ext-workflow/ \ + -e {toxinidir}/ext/dapr-ext-grpc/ \ + -e {toxinidir}/ext/dapr-ext-fastapi/ \ + -e {toxinidir}/ext/dapr-ext-langgraph/ \ + -e {toxinidir}/ext/dapr-ext-strands/ \ + -e {toxinidir}/ext/flask_dapr/ [testenv:example-component] ; This environment is used to validate a specific example component. @@ -90,13 +89,6 @@ basepython = python3 changedir = ./examples/ deps = mechanical-markdown - -e {toxinidir}/ext/dapr-ext-workflow/ - -e {toxinidir}/ext/dapr-ext-grpc/ - -e {toxinidir}/ext/dapr-ext-fastapi/ - -e {toxinidir}/ext/dapr-ext-langgraph/ - -e {toxinidir}/ext/dapr-ext-strands/ - -e {toxinidir}/ext/flask_dapr/ - -e {toxinidir}/ commands = ./validate.sh {posargs} @@ -104,23 +96,29 @@ allowlist_externals=* commands_pre = pip uninstall -y dapr dapr-ext-grpc dapr-ext-fastapi dapr-ext-langgraph dapr-ext-strands dapr-ext-flask dapr-ext-langgraph dapr-ext-strands + pip install -e {toxinidir}/ \ + -e {toxinidir}/ext/dapr-ext-workflow/ \ + -e {toxinidir}/ext/dapr-ext-grpc/ \ + -e {toxinidir}/ext/dapr-ext-fastapi/ \ + -e {toxinidir}/ext/dapr-ext-langgraph/ \ + -e {toxinidir}/ext/dapr-ext-strands/ \ + -e {toxinidir}/ext/flask_dapr/ [testenv:type] basepython = python3 usedevelop = False -deps = - -rdev-requirements.txt - -e {toxinidir}/ext/dapr-ext-workflow/ - -e {toxinidir}/ext/dapr-ext-grpc/ - -e {toxinidir}/ext/dapr-ext-fastapi/ - -e {toxinidir}/ext/dapr-ext-langgraph/ - -e {toxinidir}/ext/dapr-ext-strands/ - -e {toxinidir}/ext/flask_dapr/ - -e {toxinidir}/ commands = mypy --config-file mypy.ini commands_pre = pip uninstall -y dapr dapr-ext-grpc dapr-ext-fastapi dapr-ext-langgraph dapr-ext-strands dapr-ext-flask dapr-ext-langgraph dapr-ext-strands + pip install -r dev-requirements.txt \ + -e {toxinidir}/ \ + -e {toxinidir}/ext/dapr-ext-workflow/ \ + -e {toxinidir}/ext/dapr-ext-grpc/ \ + -e {toxinidir}/ext/dapr-ext-fastapi/ \ + -e {toxinidir}/ext/dapr-ext-langgraph/ \ + -e {toxinidir}/ext/dapr-ext-strands/ \ + -e {toxinidir}/ext/flask_dapr/ [testenv:doc] basepython = python3