Skip to content

Commit

Permalink
Merge pull request #371 from boozallen/366-min-py-version-rewrite-copy
Browse files Browse the repository at this point in the history
#366 Feature: Update pyproject.toml files to set min Python version to >=3.8
  • Loading branch information
meliz19 authored Sep 26, 2024
2 parents 0ba29bc + 07f6172 commit afc3b89
Show file tree
Hide file tree
Showing 26 changed files with 94 additions and 83 deletions.
2 changes: 2 additions & 0 deletions DRAFT_RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Note: instructions for adapting to these changes are outlined in the upgrade ins

_There are no breaking changes in the 1.10 release._


# Known Issues
_There are no known issues with the 1.10 release._

Expand Down Expand Up @@ -74,3 +75,4 @@ To start your aiSSEMBLE upgrade, update your project's pom.xml to use the 1.10.0
3. Repeat the previous step until all manual actions are resolved

# What's Changed
- `pyproject.toml` files updated to allow for Python version `>=3.8`.
2 changes: 1 addition & 1 deletion build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<version.habushu.plugin>2.16.1</version.habushu.plugin>
<version.python>3.11.4</version.python>
<version.help.plugin>3.2.0</version.help.plugin>
<version.krausening>19</version.krausening>
<version.krausening>20</version.krausening>
<version.plexus.archiver>3.6.0</version.plexus.archiver>
<version.plugin.plugin>3.9.0</version.plugin.plugin>
<version.quarkus>2.8.3.Final</version.quarkus>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ packages = [
]

[tool.poetry.dependencies]
python = ">=3.11.4, <3.12"
python = ">=3.8"
fastapi = ">=0.95.0"
uvicorn = {version = "^0.18.0", extras = ["standard"]}
pydantic = ">=2.8.0"
kubernetes = ">=26.1.0"
urllib3 = "^1.26.18"
krausening = ">=19"
krausening = ">=20"
sagemaker = ">=2.218.0"
mlflow = "^2.3.1"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ packages = [
]

[tool.poetry.dependencies]
python = ">=3.11.4, <4"
krausening = ">=19"
python = ">=3.8"
krausening = ">=20"
pyspark = "3.4.0"
pyyaml = "^6.0"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,22 @@ packages = [
]

[tool.poetry.dependencies]
python = ">=3.11.4, <4"
hvac = ">=1.0.0"
python = ">=3.8"
hvac = [
{version = ">=1.0.0", python = ">=3.8,<4.0"},
]
cryptography = ">=42.0.4"
krausening = ">=19"
krausening = ">=20"
urllib3 = "^1.26.18"

[tool.poetry.group.dev.dependencies]
black = ">=22.1.0"
behave = ">=1.2.6"
nose = ">=1.3.7"
testcontainers = ">=4.5.1"
testcontainers = [
{version = ">=4.5.1", python = ">=3.9,<4.0"},
{version = "3.7.1", python = ">=3.8, <3.9"},
]
setuptools = "^69.0.3"
kappa-maki = ">=1.0.1"
pylint = "^3.1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ packages = [
]

[tool.poetry.dependencies]
python = ">=3.11.4, <4"
krausening = ">=19"
python = ">=3.8"
krausening = ">=20"
pydantic = ">=2.8.0"

pyspark = "3.4.0"
cryptography = ">=42.0.4"
urllib3 = "^1.26.18"
Expand Down
4 changes: 2 additions & 2 deletions foundation/aissemble-foundation-core-python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ packages = [
]

[tool.poetry.dependencies]
python = ">=3.11.4, <4"
python = ">=3.8"
pydantic = ">=2.8.0"
krausening = ">=19"
krausening = ">=20"
cryptography = ">=42.0.4"
pyjwt = ">=2.3.0"
pyjks = ">=20.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ packages = [

[tool.poetry.dependencies]
aissemble-foundation-messaging-python = {path = "../foundation-messaging/foundation-messaging-python/aissemble-foundation-messaging-python-client", develop = true}
python = ">=3.11.4, <3.12"
python = ">=3.8"
fastapi = ">=0.95.0"
uvicorn = {version = "^0.18.0", extras = ["standard"]}
pydantic = ">=2.8.0"
kubernetes = ">=26.1.0"
urllib3 = "^1.26.18"
krausening = ">=19"
krausening = ">=20"

[tool.poetry.group.dev.dependencies]
black = ">=22.1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages = [
# the versioning_api.py module within aissemble-versioning-docker are defined here and installed when the corresponding
# wheel for aissemble-versioning-service is installed.
[tool.poetry.dependencies]
python = ">=3.11.4, <3.12"
python = ">=3.8"
mlflow = "^2.3.1"
fastapi = ">=0.95.0"
uvicorn = {version = "^0.18.0", extras = ["standard"]}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ packages = [
]

[tool.poetry.dependencies]
python = ">=3.11.4, <4"
python = ">=3.8"
pydantic = ">=2.8.0"
requests = ">=2.32.2"
krausening = ">=19"
krausening = ">=20"
cryptography = ">=42.0.4"
urllib3 = "^1.26.18"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ packages = [
]

[tool.poetry.dependencies]
python = ">=3.11.4, <4"
krausening = ">=19"
python = ">=3.8"
krausening = ">=20"
cryptography = ">=42.0.4"
urllib3 = "^1.26.18"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ packages = [
]

[tool.poetry.dependencies]
python = ">=3.11.4, <4"
python = ">=3.8"
openlineage-python = {version = "^0.21.1"}

#[tool.poetry.group.monorepo.dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ include = [
]

[tool.poetry.dependencies]
python = ">=3.11.4, <4"
krausening = ">=19"
python = ">=3.8"
krausening = ">=20"
kafka-python = "^2.0.2"
openlineage-python = {version = "^0.21.1"}

Expand All @@ -24,7 +24,10 @@ aissemble-foundation-messaging-python = { path = "../../../foundation-messaging/
black = ">=22.1.0"
behave = ">=1.2.6"
nose = ">=1.3.7"
testcontainers = ">=4.5.1"
testcontainers = [
{version = ">=4.5.1", python = ">=3.9,<4.0"},
{version = "3.7.1", python = ">=3.8, <3.9"},
]
callee = "0.3.1"
confluent-kafka = { version = "2.1.1", optional = true }
kappa-maki = ">=1.0.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ authors = ["Your Name <you@example.com>"]
include = ["src/${packageFolderName}/generated/**/*"]

[tool.poetry.dependencies]
python = "^3.11.4"
krausening = ">=17"
python = ">=3.8"
krausening = ">=20"
pyspark = "${versionSpark}"
jsonpickle = "^2.1.0"
pyyaml = "^6.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ authors = ["Your Name <you@example.com>"]
include = ["src/${packageFolderName}/generated/**/*"]

[tool.poetry.dependencies]
python = "^3.11.4"
krausening = ">=16"
python = ">=3.8"
krausening = ">=20"
mlflow = "^2.3.1"
kafka-python = "^2.0.2"
pandas = "^1.5.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ authors = ["Your Name <you@example.com>"]
include = ["src/${artifactIdPythonCase}/generated/**/*"]

[tool.poetry.dependencies]
python = "^3.11.4"
python = ">=3.8"
mlflow = "^2.3.1"
fastapi = ">=0.95.0"
uvicorn = { version = "^0.18.0", extras = ["standard"]}
grpcio = "^1.50.0"
krausening = ">=16"
krausening = ">=20"
pandas = "^1.5.0"

# The latest versions of scipy cap numpy to < 1.26.0, but older versions don't. The recent release of numpy caused
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,21 @@ packages = [
include = ["src/${packageFolderName}/generated/**/*"]

[tool.poetry.dependencies]
python = "^3.11.4"
sagemaker-training = "^4.6.1"
mlflow = "^2.3.1"

# Necessary for working with v39.0.0 of crytopgraphy
# https://stackoverflow.com/questions/74981558/error-updating-python3-pip-attributeerror-module-lib-has-no-attribute-openss
pyopenssl = ">22.1.0"

# If protobuf is not explicitly downgraded and 4.x is transitively used via mlflow, developers
# may need to set the PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python to achieve backward compatibility
# with any modules that were generated using protobuf 3.x
protobuf = "^3.20.3"

# The latest versions of scipy cap numpy to < 1.26.0, but older versions don't. The recent release of numpy caused
# scipy to downgrade to a version that is incompatible with the latest version of numpy. Presumably, scipy will release
# a new version that is compatible with the latest version of numpy, but until then, we need to explicitly avoid the downgrade.
scipy = "^1.9.3"
python = ">=3.8"
sagemaker-training = ">=4.6.1"
mlflow = ">=2.16.2"

# Poetry lock was timing out attempting to resolve dependencies
# I removed the mlflow dependency and ran poetry add mlflow and the dependencies resolved, so I copied
# over the problematic pacakges' versions from the lock file.
opentelemetry-api = ">=1.9.0,<3"
opentelemetry-sdk = ">=1.9.0,<3"
mlflow-skinny = "2.16.2"
botocore = ">=1.33.2,<2.0a.0"

# Poetry export-without-path-deps fails due to a "Dependency walk failed at urllib3 (>=1.26.0)"
# Adding to resolve the issue; Poetry changes the value from >= -> ^
urllib3 = "^1.26.18"

[tool.poetry.group.dev.dependencies]
black = ">=22.1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ include = [
]

[tool.poetry.dependencies]
python = ">=3.11.4, <4"
python = ">=3.8"
py4j = "0.10.9.7"
krausening = ">=19"
krausening = ">=20"

[tool.poetry.group.dev.dependencies]
black = ">=22.1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ packages = [
]

[tool.poetry.dependencies]
python = ">=3.11.4, <4"
python = ">=3.8"
requests = ">=2.32.2"
urllib3 = "^1.26.18"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ packages = [
]

[tool.poetry.dependencies]
python = ">=3.11.4, <4"
python = ">=3.8"
aissemble-foundation-core-python = {path = "../../aissemble-foundation-core-python", develop = true}
pydantic = ">=2.8.0"
krausening = ">=19"
krausening = ">=20"
cryptography = ">=42.0.4"

[tool.poetry.group.dev.dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ apache-sedona = "~1.4.0"
aissemble-foundation-encryption-policy-python = {path = "../../../foundation/foundation-encryption/aissemble-foundation-encryption-policy-python", develop = true}
aissemble-extensions-encryption-vault-python = {path = "../../../extensions/extensions-encryption/aissemble-extensions-encryption-vault-python", develop = true}
kafka-python = "^2.0.2"
python = "^3.11.4"
krausening = ">=19"
python = ">=3.8"
krausening = ">=20"
pyspark = "3.4.0"
jsonpickle = "^2.1.0"
pyyaml = "^6.0"
Expand All @@ -33,7 +33,10 @@ urllib3 = "^1.26.18"
black = ">=22.1.0"
behave = ">=1.2.6"
nose = ">=1.3.7"
testcontainers = ">=4.5.1"
testcontainers = [
{version = ">=4.5.1", python = ">=3.9,<4.0"},
{version = "3.7.1", python = ">=3.8, <3.9"},
]
kappa-maki = ">=1.0.1"
pylint = "^3.1.0"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ apache-sedona = "~1.4.0"
aissemble-foundation-encryption-policy-python = {path = "../../../foundation/foundation-encryption/aissemble-foundation-encryption-policy-python", develop = true}
aissemble-extensions-encryption-vault-python = {path = "../../../extensions/extensions-encryption/aissemble-extensions-encryption-vault-python", develop = true}
kafka-python = "^2.0.2"
python = "^3.11.4"
krausening = ">=19"
python = ">=3.8"
krausening = ">=20"
pyspark = "3.4.0"
jsonpickle = "^2.1.0"
pyyaml = "^6.0"
Expand All @@ -34,7 +34,10 @@ urllib3 = "^1.26.18"
black = ">=22.1.0"
behave = ">=1.2.6"
nose = ">=1.3.7"
testcontainers = ">=4.5.1"
testcontainers = [
{version = ">=4.5.1", python = ">=3.9,<4.0"},
{version = "3.7.1", python = ">=3.8, <3.9"},
]
kappa-maki = ">=1.0.1"
pylint = "^3.1.0"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ include = ["src/aissemble_machine_learning_training_base/generated/**/*"]
[tool.poetry.dependencies]
aissemble-foundation-pdp-client-python = {path = "../../../../foundation/foundation-security/aissemble-foundation-pdp-client-python", develop = true}
aissemble-foundation-core-python = {path = "../../../../foundation/aissemble-foundation-core-python", develop = true}
python = "^3.11.4"
krausening = ">=19"
python = ">=3.8"
krausening = ">=20"
mlflow = "^2.3.1"
kafka-python = "^2.0.2"
pandas = "^1.5.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ aissemble-foundation-pdp-client-python = {path = "../../../../foundation/foundat
aissemble-foundation-core-python = {path = "../../../../foundation/aissemble-foundation-core-python", develop = true}
aissemble-foundation-encryption-policy-python = {path = "../../../../foundation/foundation-encryption/aissemble-foundation-encryption-policy-python", develop = true}
aissemble-extensions-encryption-vault-python = {path = "../../../../extensions/extensions-encryption/aissemble-extensions-encryption-vault-python", develop = true}
python = "^3.11.4"
python = ">=3.8"
mlflow = "^2.3.1"
fastapi = ">=0.95.0"
uvicorn = { version = "^0.18.0", extras = ["standard"]}
grpcio = "^1.50.0"
krausening = ">=19"
krausening = ">=20"
pandas = "^1.5.0"

# The latest versions of scipy cap numpy to < 1.26.0, but older versions don't. The recent release of numpy caused
Expand Down
Loading

0 comments on commit afc3b89

Please sign in to comment.