Skip to content

Merge Master ci py312 for PR test #5066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 36 commits into from
Closed
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
4aa6c7c
Test py312 ci support
mollyheamazon Feb 26, 2025
280424d
Test py312 ci support
mollyheamazon Feb 27, 2025
1374184
first commit
mollyheamazon Dec 18, 2024
49de844
test to point to personal stack
mollyheamazon Jan 2, 2025
696cb47
changed tox.ini
mollyheamazon Feb 27, 2025
5d35bd0
Revert "changed tox.ini"
mollyheamazon Feb 27, 2025
2ab95fb
Revert "Revert "changed tox.ini""
mollyheamazon Feb 27, 2025
dc2fcd5
Revert "Revert "Revert "changed tox.ini"""
mollyheamazon Feb 27, 2025
f143ca7
Revert "Revert "changed tox.ini""
mollyheamazon Feb 27, 2025
31d7478
Revert "changed tox.ini"
mollyheamazon Feb 27, 2025
f78febe
Revert "test to point to personal stack"
mollyheamazon Feb 27, 2025
7669550
Revert "first commit"
mollyheamazon Feb 27, 2025
598447f
add pyproject.toml
mollyheamazon Feb 27, 2025
c915fed
add py312 to ci
mollyheamazon Feb 27, 2025
1f0f608
Merge branch 'master-ci-py312-pr-test' into master-ci-py312
mollyheamazon Feb 27, 2025
332389c
bump numpy version
mollyheamazon Feb 27, 2025
041c739
numpy version change
mollyheamazon Feb 27, 2025
88fbe0c
add py312
mollyheamazon Feb 27, 2025
5c20eee
upgrade pip version
mollyheamazon Feb 27, 2025
3feadc5
add setuptools wheel to tox.ini
mollyheamazon Feb 28, 2025
a27527d
add pyyaml version constraint, remove py312 from docstring because th…
mollyheamazon Feb 28, 2025
340ab3b
update pyyaml version constraint
mollyheamazon Feb 28, 2025
5bfbb55
update pyyaml version constraint
mollyheamazon Feb 28, 2025
5084e6f
deprecate py38
mollyheamazon Feb 28, 2025
f679f2c
bump scipy
mollyheamazon Feb 28, 2025
6655760
bump tensorflow and tensorboard
mollyheamazon Mar 1, 2025
4116094
bump dill
mollyheamazon Mar 1, 2025
1a23c2a
bump apache-airflow to ensure dill and greenlet version
mollyheamazon Mar 1, 2025
9b9eb32
remove constraint for apache-airflow
mollyheamazon Mar 3, 2025
b5da915
remove constraint for apache-airflow
mollyheamazon Mar 3, 2025
e0caf76
bump torch version
mollyheamazon Mar 3, 2025
c69de67
bump torchvision version
mollyheamazon Mar 3, 2025
ff0ab5a
modified tests to comply with py312 requirements
mollyheamazon Mar 3, 2025
e25e8b0
modified tests again to comply with py312 requirements
mollyheamazon Mar 4, 2025
5dd3c04
git related
mollyheamazon Mar 4, 2025
eb51f6f
remove assert before assert_called_once_with
mollyheamazon Mar 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codebuild-ci-health.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["py38", "py39", "py310", "py311"]
python-version: ["py38", "py39", "py310", "py311","py312"]
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codebuild-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["py38","py39","py310","py311"]
python-version: ["py38","py39","py310","py311","py312"]
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"attrs>=23.1.0,<24",
Expand All @@ -39,7 +40,7 @@ dependencies = [
"google-pasta",
"importlib-metadata>=1.4.0,<7.0",
"jsonschema",
"numpy>=1.9.0,<2.0",
"numpy>=1.26.4,<3.0",
"omegaconf>=2.2,<=2.3",
"packaging>=20.0",
"pandas",
Expand Down
2 changes: 1 addition & 1 deletion requirements/extras/test_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tox==3.24.5
numpy>=1.24.0
numpy>=1.26.4
build[virtualenv]==1.2.1
flake8==4.0.1
pytest==6.2.5
Expand Down
12 changes: 6 additions & 6 deletions src/sagemaker/fw_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ def validate_smdistributed(
framework_name (str): A string representing the name of framework selected.
framework_version (str): A string representing the framework version selected.
py_version (str): A string representing the python version selected.
Ex: `py38, py39, py310, py311`
Ex: `py38, py39, py310, py311, py312`
distribution (dict): A dictionary with information to enable distributed training.
(Defaults to None if distributed training is not enabled.) For example:

Expand Down Expand Up @@ -762,7 +762,7 @@ def _validate_smdataparallel_args(
framework_name (str): A string representing the name of framework selected. Ex: `tensorflow`
framework_version (str): A string representing the framework version selected. Ex: `2.3.1`
py_version (str): A string representing the python version selected.
Ex: `py38, py39, py310, py311`
Ex: `py38, py39, py310, py311, py312`
distribution (dict): A dictionary with information to enable distributed training.
(Defaults to None if distributed training is not enabled.) Ex:

Expand Down Expand Up @@ -846,7 +846,7 @@ def validate_distribution(
framework_name (str): A string representing the name of framework selected.
framework_version (str): A string representing the framework version selected.
py_version (str): A string representing the python version selected.
Ex: `py38, py39, py310, py311`
Ex: `py38, py39, py310, py311, py312`
image_uri (str): A string representing a Docker image URI.
kwargs(dict): Additional kwargs passed to this function

Expand Down Expand Up @@ -1010,7 +1010,7 @@ def validate_torch_distributed_distribution(
}
framework_version (str): A string representing the framework version selected.
py_version (str): A string representing the python version selected.
Ex: `py38, py39, py310, py311`
Ex: `py38, py39, py310, py311, py312`
image_uri (str): A string representing a Docker image URI.
entry_point (str or PipelineVariable): The absolute or relative path to the local Python
source file that should be executed as the entry point to
Expand Down Expand Up @@ -1162,7 +1162,7 @@ def validate_version_or_image_args(framework_version, py_version, image_uri):
Args:
framework_version (str): The version of the framework.
py_version (str): A string representing the python version selected.
Ex: `py38, py39, py310, py311`
Ex: `py38, py39, py310, py311, py312`
image_uri (str): The URI of the image.

Raises:
Expand Down Expand Up @@ -1194,7 +1194,7 @@ def create_image_uri(
instance_type (str): SageMaker instance type. Used to determine device
type (cpu/gpu/family-specific optimized).
framework_version (str): The version of the framework.
py_version (str): Optional. Python version Ex: `py38, py39, py310, py311`.
py_version (str): Optional. Python version Ex: `py38, py39, py310, py311, py312`.
If not specified, image uri will not include a python component.
account (str): AWS account that contains the image. (default:
'520713654638')
Expand Down
2 changes: 1 addition & 1 deletion src/sagemaker/processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -1465,7 +1465,7 @@ def __init__(
instance_type (str or PipelineVariable): The type of EC2 instance to use for
processing, for example, 'ml.c4.xlarge'.
py_version (str): Python version you want to use for executing your
model training code. Ex `py38, py39, py310, py311`. Value
model training code. Ex `py38, py39, py310, py311, py312`. Value
is ignored when ``image_uri`` is provided.
image_uri (str or PipelineVariable): The URI of the Docker image to use for the
processing jobs (default: None).
Expand Down
2 changes: 2 additions & 0 deletions src/sagemaker/serve/model_format/mlflow/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"py39": "1.13.1",
"py310": "2.2.0",
"py311": "2.3.0",
"py312": "2.5.0",

}
MODEL_PACKAGE_ARN_REGEX = (
r"^arn:aws:sagemaker:[a-z0-9\-]+:[0-9]{12}:model-package\/(.*?)(?:/(\d+))?$"
Expand Down
2 changes: 1 addition & 1 deletion src/sagemaker/serve/utils/conda_in_process.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- boto3>=1.34.142,<2.0
- cloudpickle==2.2.1
- google-pasta
- numpy>=1.9.0,<2.0
- numpy>=1.26.4,<3.0
- protobuf>=3.12,<5.0
- smdebug_rulesconfig==1.0.1
- importlib-metadata>=1.4.0,<7.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cloudpickle==2.2.1
defusedxml==0.7.1
dill==0.3.8
gmpy2==2.1.2
numpy==1.24.4
numpy==1.26.4
opt-einsum==3.3.0
packaging==21.3
pandas==2.2.1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mlflow==2.13.2
lz4==4.3.2
numpy==1.24.4
numpy==1.26.4
pandas==2.0.3
psutil==5.9.8
scikit-learn==1.3.2
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/sagemaker/jumpstart/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -14360,7 +14360,7 @@
"jmespath==1.0.1",
"jsonschema==4.17.3",
"multiprocess==0.70.14",
"numpy==1.24.3",
"numpy==1.26.4",
"oscrypto==1.3.0",
"packaging==23.1",
"pandas==2.0.2",
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

[tox]
isolated_build = true
envlist = black-format,flake8,pylint,docstyle,sphinx,doc8,twine,py38,py39,py310,py311
envlist = black-format,flake8,pylint,docstyle,sphinx,doc8,twine,py38,py39,py310,py311,py312

skip_missing_interpreters = False

Expand Down Expand Up @@ -67,7 +67,7 @@ markers =
[testenv]
setenv =
PYTHONHASHSEED=42
pip_version = pip==21.3
pip_version = pip==24.3
passenv =
AWS_ACCESS_KEY_ID
AWS_SECRET_ACCESS_KEY
Expand All @@ -90,7 +90,7 @@ commands =
pytest {posargs}
deps = .[test]
depends =
{py38,py39,py310,p311}: clean
{py38,py39,py310,py311,py312}: clean

[testenv:runcoverage]
description = run unit tests with coverage
Expand Down Expand Up @@ -132,7 +132,7 @@ commands =
twine check dist/*.tar.gz

[testenv:sphinx]
pip_version = pip==21.3
pip_version = pip==24.3
changedir = doc
# pip install requirements.txt is separate as RTD does it in separate steps
# having the requirements.txt installed in deps above results in Double Requirement exception
Expand Down
Loading