Add poetry sections that should be combined

Signed-off-by: jamshale <[email protected]>
openwallet-foundation · Aug 8, 2024 · 4eae02a · 4eae02a
1 parent 32ebb6c
commit 4eae02a
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 62 deletions.
diff --git a/basicmessage_storage/integration/pyproject.toml b/basicmessage_storage/integration/pyproject.toml
@@ -12,6 +12,8 @@ requests = "^2.31.0"
 
 [tool.poetry.dev-dependencies]
 
+[tool.pytest.ini_options]
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

diff --git a/connection_update/integration/pyproject.toml b/connection_update/integration/pyproject.toml
@@ -13,6 +13,8 @@ aries-cloudagent = { version = ">=0.10.3, < 1.0.0" }
 
 [tool.poetry.dev-dependencies]
 
+[tool.pytest.ini_options]
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

diff --git a/firebase_push_notifications/integration/pyproject.toml b/firebase_push_notifications/integration/pyproject.toml
@@ -12,6 +12,8 @@ requests = "^2.31.0"
 
 [tool.poetry.dev-dependencies]
 
+[tool.pytest.ini_options]
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

diff --git a/jwt_vc_json/poetry.lock b/jwt_vc_json/poetry.lock
diff --git a/jwt_vc_json/pyproject.toml b/jwt_vc_json/pyproject.toml
@@ -17,12 +17,12 @@ aca-py = ["aries-cloudagent"]
 oid4vci = ["oid4vci"]
 
 [tool.poetry.dev-dependencies]
-ruff = "^0.5.0"
+ruff = "^0.5.4"
 black = "~24.4.2"
-pytest = "^8.2.0"
-pytest-asyncio = "~0.23.7"
+pytest = "^8.3.1"
+pytest-asyncio = "^0.23.8"
 pytest-cov = "^5.0.0"
-pytest-ruff = "^0.3.2"
+pytest-ruff = "^0.4.1"
 setuptools = "^70.3.0"
 
 [tool.poetry.group.integration.dependencies]
@@ -48,7 +48,7 @@ ignore = [
     "D417", "C901",
 ]
 
-[tool.ruff.lint.per-file-ignores]
+[tool.ruff.per-file-ignores]
 "**/{tests}/*" = ["F841", "D", "E501"]
 
 [tool.pytest.ini_options]
@@ -85,4 +85,5 @@ output = ".test-reports/coverage.xml"
 
 [build-system]
 requires = ["setuptools", "poetry-core>=1.2"]
-build-backend = "poetry.core.masonry.api"
+build-backend = "poetry.core.masonry.api"
+
diff --git a/kafka_events/integration/pyproject.toml b/kafka_events/integration/pyproject.toml
@@ -20,6 +20,8 @@ black = "^24.4.2"
 flake8 = "^3.9.2"
 pre-commit = "^2.13.0"
 
+[tool.pytest.ini_options]
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

diff --git a/mso_mdoc/poetry.lock b/mso_mdoc/poetry.lock
diff --git a/mso_mdoc/pyproject.toml b/mso_mdoc/pyproject.toml
@@ -6,27 +6,27 @@ authors = []
 
 [tool.poetry.dependencies]
 python = "^3.9"
-cbor2 = "~5"
-cbor-diag = "*"
-cwt = "~2"
-pycose = "~1"
 
 # Define ACA-Py as an optional/extra dependancy so it can be
 # explicitly installed with the plugin if desired.
 aries-cloudagent = { version = ">=0.10.3, < 1.0.0", optional = true }
+cbor2 = "~5"
+cbor-diag = "*"
+cwt = "~2"
+pycose = "~1"
 oid4vci = {path = "../oid4vci", optional = true, develop = true}
 
 [tool.poetry.extras]
 aca-py = ["aries-cloudagent"]
 oid4vci = ["oid4vci"]
 
 [tool.poetry.dev-dependencies]
-ruff = "^0.5.0"
+ruff = "^0.5.4"
 black = "~24.4.2"
-pytest = "^8.2.0"
-pytest-asyncio = "~0.23.7"
+pytest = "^8.3.1"
+pytest-asyncio = "^0.23.8"
 pytest-cov = "^5.0.0"
-pytest-ruff = "^0.3.2"
+pytest-ruff = "^0.4.1"
 asynctest = "0.13.0"
 setuptools = "^70.3.0"
 
@@ -53,7 +53,7 @@ ignore = [
     "D417", "C901",
 ]
 
-[tool.ruff.lint.per-file-ignores]
+[tool.ruff.per-file-ignores]
 "**/{tests}/*" = ["F841", "D", "E501"]
 
 [tool.pytest.ini_options]
@@ -90,4 +90,5 @@ output = ".test-reports/coverage.xml"
 
 [build-system]
 requires = ["setuptools", "poetry-core>=1.2"]
-build-backend = "poetry.core.masonry.api"
+build-backend = "poetry.core.masonry.api"
+
diff --git a/multitenant_provider/integration/pyproject.toml b/multitenant_provider/integration/pyproject.toml
@@ -15,6 +15,8 @@ python-dateutil = "^2.8.2"
 
 [tool.poetry.dev-dependencies]
 
+[tool.pytest.ini_options]
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

diff --git a/oid4vci/integration/poetry.lock b/oid4vci/integration/poetry.lock
diff --git a/oid4vci/poetry.lock b/oid4vci/poetry.lock
diff --git a/plugin_globals/integration/pyproject.toml b/plugin_globals/integration/pyproject.toml
@@ -12,6 +12,8 @@ requests = "^2.31.0"
 
 [tool.poetry.dev-dependencies]
 
+[tool.pytest.ini_options]
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
diff --git a/redis_events/integration/pyproject.toml b/redis_events/integration/pyproject.toml
@@ -19,6 +19,8 @@ uvicorn = "^0.30.1"
 
 [tool.poetry.dev-dependencies]
 
+[tool.pytest.ini_options]
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

diff --git a/repo_manager.py b/repo_manager.py
@@ -179,6 +179,7 @@ def get_and_combine_main_poetry_sections(name: str) -> Tuple[dict, dict]:
         extract_common_sections(filedata, plugin_sections)
 
     combine_dependencies(plugin_sections["DEPS"], global_sections["DEPS"])
+    combine_dependencies(plugin_sections["EXTRAS"], global_sections["EXTRAS"])
     combine_dependencies(plugin_sections["DEV_DEPS"], global_sections["DEV_DEPS"])
     combine_dependencies(plugin_sections["INT_DEPS"], global_sections["INT_DEPS"])
     return global_sections, plugin_sections
@@ -236,6 +237,7 @@ def get_and_combine_integration_poetry_sections(name: str) -> tuple[dict, dict]:
     extract_common_sections(filedata, plugin_sections)
     combine_dependencies(plugin_sections["DEPS"], global_sections["DEPS"])
     combine_dependencies(plugin_sections["DEV_DEPS"], global_sections["DEV_DEPS"])
+    combine_dependencies(plugin_sections["PYTEST"], global_sections["PYTEST"])
 
     return global_sections, plugin_sections
 

diff --git a/rpc/integration/pyproject.toml b/rpc/integration/pyproject.toml
@@ -12,6 +12,8 @@ requests = "^2.31.0"
 
 [tool.poetry.dev-dependencies]
 
+[tool.pytest.ini_options]
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"