From 4aa6c7cf161e3c355c739b51b9fa0850f2b64b08 Mon Sep 17 00:00:00 2001 From: Molly He Date: Tue, 25 Feb 2025 16:24:20 -0800 Subject: [PATCH 01/13] Test py312 ci support --- .github/workflows/codebuild-ci-health.yml | 2 +- .github/workflows/codebuild-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codebuild-ci-health.yml b/.github/workflows/codebuild-ci-health.yml index 7ecefd310f..69f982f638 100644 --- a/.github/workflows/codebuild-ci-health.yml +++ b/.github/workflows/codebuild-ci-health.yml @@ -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 diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index 8c6bd6b337..f9fcffbd48 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -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 From 280424dbdbd84a2ba1d416c1c85991dcb61260d1 Mon Sep 17 00:00:00 2001 From: Molly He Date: Wed, 26 Feb 2025 17:08:03 -0800 Subject: [PATCH 02/13] Test py312 ci support --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index b16c0d2f0b..963dd9dda5 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -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 From 1374184c990fa59330dcda19eabf59cb24b69593 Mon Sep 17 00:00:00 2001 From: Molly He Date: Tue, 17 Dec 2024 17:12:24 -0800 Subject: [PATCH 03/13] first commit --- .gitconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .gitconfig diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000000..e7f2a61985 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,11 @@ +[secrets] + patterns = [aA]pollo|[bB]razil|[cC]oral|[oO]din + patterns = tt.amazon.com|issues.amazon.com|cr.amazon.com|sim.amazon.com + patterns = ic.gov|sgov.gov + patterns = us-iso|aws-iso + providers = git secrets --aws-provider + patterns = [A-Z0-9]{20} + patterns = (\"|')?(AWS|aws|Aws)?_?(SECRET|secret|Secret)?_?(ACCESS|access|Access)?_?(KEY|key|Key)(\"|')?\\s*(:|=>|=)\\s*(\"|')?[A-Za-z0-9/\\+=]{40}(\"|')? + patterns = (\"|')?(AWS|aws|Aws)?_?(ACCOUNT|account|Account)_?(ID|id|Id)?(\"|')?\\s*(:|=>|=)\\s*(\"|')?[0-9]{4}\\-?[0-9]{4}\\-?[0-9]{4}(\"|')? + patterns = (ironman|IronMan|Ironman)* + patterns = iron man|Iron Man|Iron man From 49de84423bc257ddaacc22664d39f4f8be17142a Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 2 Jan 2025 13:22:34 -0800 Subject: [PATCH 04/13] test to point to personal stack --- src/sagemaker/telemetry/telemetry_logging.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/sagemaker/telemetry/telemetry_logging.py b/src/sagemaker/telemetry/telemetry_logging.py index b0ecedee4c..a55ea6216b 100644 --- a/src/sagemaker/telemetry/telemetry_logging.py +++ b/src/sagemaker/telemetry/telemetry_logging.py @@ -230,9 +230,17 @@ def _construct_url( ) -> str: """Construct the URL for the telemetry request""" + # base_url = ( + # f"https://sm-pysdk-t-{region}.s3.{region}.amazonaws.com/telemetry?" + # f"x-accountId={accountId}" + # f"&x-status={status}" + # f"&x-feature={feature}" + # ) + + # Change telemetry emitter to point to Molly's personal stack base_url = ( - f"https://sm-pysdk-t-{region}.s3.{region}.amazonaws.com/telemetry?" - f"x-accountId={accountId}" + f"https://sm-pysdk-t-personal-mollyhe-pia.s3.us-west-2.amazonaws.com/telemetry?" + f"x-accountId=879381237580" f"&x-status={status}" f"&x-feature={feature}" ) From 696cb47d2ee48db11962e7ae752b6d46ca754a91 Mon Sep 17 00:00:00 2001 From: Molly He Date: Wed, 26 Feb 2025 17:17:14 -0800 Subject: [PATCH 05/13] changed tox.ini --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 0122a6bf3c..664697b39b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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", From 5d35bd054f589870726328d5bb8760a911681914 Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:10:27 -0800 Subject: [PATCH 06/13] Revert "changed tox.ini" This reverts commit 696cb47d2ee48db11962e7ae752b6d46ca754a91. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 664697b39b..0122a6bf3c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,6 @@ 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", From 2ab95fbdd4866a6d9eeea727e5fa9710fb8f997e Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:12:42 -0800 Subject: [PATCH 07/13] Revert "Revert "changed tox.ini"" This reverts commit 5d35bd054f589870726328d5bb8760a911681914. --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 0122a6bf3c..664697b39b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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", From dc2fcd5e31d080a90fc1c84377bc4ee1153aa1ed Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:14:43 -0800 Subject: [PATCH 08/13] Revert "Revert "Revert "changed tox.ini""" This reverts commit 2ab95fbdd4866a6d9eeea727e5fa9710fb8f997e. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 664697b39b..0122a6bf3c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,6 @@ 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", From f143ca7a4c68fce0999ad6a71151fa1dfabf70c1 Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:14:58 -0800 Subject: [PATCH 09/13] Revert "Revert "changed tox.ini"" This reverts commit 5d35bd054f589870726328d5bb8760a911681914. --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 0122a6bf3c..664697b39b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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", From 31d74781b418c67e5b21429cc4159696b30015b8 Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:15:01 -0800 Subject: [PATCH 10/13] Revert "changed tox.ini" This reverts commit 696cb47d2ee48db11962e7ae752b6d46ca754a91. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 664697b39b..0122a6bf3c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,6 @@ 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", From f78febe2319b845344d55622d71efab6587da7df Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:15:04 -0800 Subject: [PATCH 11/13] Revert "test to point to personal stack" This reverts commit 49de84423bc257ddaacc22664d39f4f8be17142a. --- src/sagemaker/telemetry/telemetry_logging.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/sagemaker/telemetry/telemetry_logging.py b/src/sagemaker/telemetry/telemetry_logging.py index a55ea6216b..b0ecedee4c 100644 --- a/src/sagemaker/telemetry/telemetry_logging.py +++ b/src/sagemaker/telemetry/telemetry_logging.py @@ -230,17 +230,9 @@ def _construct_url( ) -> str: """Construct the URL for the telemetry request""" - # base_url = ( - # f"https://sm-pysdk-t-{region}.s3.{region}.amazonaws.com/telemetry?" - # f"x-accountId={accountId}" - # f"&x-status={status}" - # f"&x-feature={feature}" - # ) - - # Change telemetry emitter to point to Molly's personal stack base_url = ( - f"https://sm-pysdk-t-personal-mollyhe-pia.s3.us-west-2.amazonaws.com/telemetry?" - f"x-accountId=879381237580" + f"https://sm-pysdk-t-{region}.s3.{region}.amazonaws.com/telemetry?" + f"x-accountId={accountId}" f"&x-status={status}" f"&x-feature={feature}" ) From 766955021b848c3bd3e1ac6dfe8b472d784f72be Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:15:06 -0800 Subject: [PATCH 12/13] Revert "first commit" This reverts commit 1374184c990fa59330dcda19eabf59cb24b69593. --- .gitconfig | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .gitconfig diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index e7f2a61985..0000000000 --- a/.gitconfig +++ /dev/null @@ -1,11 +0,0 @@ -[secrets] - patterns = [aA]pollo|[bB]razil|[cC]oral|[oO]din - patterns = tt.amazon.com|issues.amazon.com|cr.amazon.com|sim.amazon.com - patterns = ic.gov|sgov.gov - patterns = us-iso|aws-iso - providers = git secrets --aws-provider - patterns = [A-Z0-9]{20} - patterns = (\"|')?(AWS|aws|Aws)?_?(SECRET|secret|Secret)?_?(ACCESS|access|Access)?_?(KEY|key|Key)(\"|')?\\s*(:|=>|=)\\s*(\"|')?[A-Za-z0-9/\\+=]{40}(\"|')? - patterns = (\"|')?(AWS|aws|Aws)?_?(ACCOUNT|account|Account)_?(ID|id|Id)?(\"|')?\\s*(:|=>|=)\\s*(\"|')?[0-9]{4}\\-?[0-9]{4}\\-?[0-9]{4}(\"|')? - patterns = (ironman|IronMan|Ironman)* - patterns = iron man|Iron Man|Iron man From 598447f10ce83f3213e3b8f52e932c51ff78560a Mon Sep 17 00:00:00 2001 From: Molly He Date: Thu, 27 Feb 2025 11:22:06 -0800 Subject: [PATCH 13/13] add pyproject.toml --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 0122a6bf3c..664697b39b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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",