Skip to content
This repository was archived by the owner on Mar 31, 2026. It is now read-only.

feat: Add support for Python 3.12#1187

Merged
cojenco merged 5 commits into from
Dec 1, 2023
Merged

feat: Add support for Python 3.12 #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
260c8b0
chore(python): Add Python 3.12
gcf-owl-bot[bot] Nov 23, 2023
d3e54cf
Add trove classifier for python 3.12
parthea Nov 23, 2023
f894ab9
Update contributing.rst, noxfile and constraints to include python 3.12
parthea Nov 24, 2023
a7ce56c
remove usage of deprecated assertDictContainsSubset https://github.co…
parthea Nov 29, 2023
70419a7
update tests KMS key settings
cojenco Dec 1, 2023
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
4 changes: 2 additions & 2 deletions .github/.OwlBot.lock.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
digest: sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61
# created: 2023-11-08T19:46:45.022803742Z
digest: sha256:bacc3af03bff793a03add584537b36b5644342931ad989e3ba1171d3bd5399f5
# created: 2023-11-23T18:17:28.105124211Z
40 changes: 40 additions & 0 deletions .kokoro/samples/python3.12/common.cfg
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Build logs will be here
action {
define_artifacts {
regex: "**/*sponge_log.xml"
}
}

# Specify which tests to run
env_vars: {
key: "RUN_TESTS_SESSION"
value: "py-3.12"
}

# Declare build specific Cloud project.
env_vars: {
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
value: "python-docs-samples-tests-312"
}

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/python-storage/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
}

# Download secrets for samples
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"

# Download trampoline resources.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-storage/.kokoro/trampoline_v2.sh"
6 changes: 6 additions & 0 deletions .kokoro/samples/python3.12/continuous.cfg
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
key: "INSTALL_LIBRARY_FROM_SOURCE"
value: "True"
}
11 changes: 11 additions & 0 deletions .kokoro/samples/python3.12/periodic-head.cfg
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
key: "INSTALL_LIBRARY_FROM_SOURCE"
value: "True"
}

env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/python-storage/.kokoro/test-samples-against-head.sh"
}
6 changes: 6 additions & 0 deletions .kokoro/samples/python3.12/periodic.cfg
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
key: "INSTALL_LIBRARY_FROM_SOURCE"
value: "False"
}
6 changes: 6 additions & 0 deletions .kokoro/samples/python3.12/presubmit.cfg
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
key: "INSTALL_LIBRARY_FROM_SOURCE"
value: "True"
}
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ In order to add a feature:
documentation.

- The feature must work fully on the following CPython versions:
3.7, 3.8, 3.9, 3.10and 3.11 on both UNIX and Windows.
3.7, 3.8, 3.9, 3.10, 3.11 and 3.12 on both UNIX and Windows.

- The feature must not add unnecessary dependencies (where
"unnecessary" is of course subjective, but new dependencies should
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@

DEFAULT_PYTHON_VERSION = "3.8"
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
CONFORMANCE_TEST_PYTHON_VERSIONS = ["3.8"]

_DEFAULT_STORAGE_HOST = "https://storage.googleapis.com"
Expand Down
2 changes: 1 addition & 1 deletion samples/snippets/encryption_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@
import storage_upload_encrypted_file

BUCKET = os.environ["CLOUD_STORAGE_BUCKET"]
KMS_KEY = os.environ["CLOUD_KMS_KEY"]
KMS_KEY = os.environ["MAIN_CLOUD_KMS_KEY"]

TEST_ENCRYPTION_KEY = "brtJUWneL92g5q0N2gyDSnlPSYAiIVZ/cWgjyZNeMy0="
TEST_ENCRYPTION_KEY_DECODED = base64.b64decode(TEST_ENCRYPTION_KEY)
Expand Down
2 changes: 1 addition & 1 deletion samples/snippets/noxfile.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,7 @@ def get_pytest_env_vars() -> Dict[str, str]:

# DO NOT EDIT - automatically generated.
# All versions used to test samples.
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]

# Any default versions that should be ignored.
IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]
Expand Down
10 changes: 9 additions & 1 deletion samples/snippets/noxfile_config.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,12 @@ def get_cloud_kms_key():
if session == 'py-3.10':
return ('projects/python-docs-samples-tests-310/locations/us/'
'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
if session == 'py-3.11':
return ('projects/python-docs-samples-tests-311/locations/us/'
'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
if session == 'py-3.12':
return ('projects/python-docs-samples-tests-312/locations/us/'
'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
return os.environ['CLOUD_KMS_KEY']


Expand All@@ -91,6 +97,8 @@ def get_cloud_kms_key():
# 'constraints/iam.disableServiceAccountKeyCreation' policy.
# 2. The new projects buckets need to have universal permission model.
# For those tests, we'll use the original project.
'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests'
'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests',
'MAIN_CLOUD_KMS_KEY': ('projects/python-docs-samples-tests/locations/us/'
'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
},
}
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Operating System :: OS Independent",
"Topic :: Internet",
],
Expand Down
Empty file addedtesting/constraints-3.12.txt
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion tests/unit/test_blob.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5923,7 +5923,7 @@ def test_downloads_w_client_custom_headers(self):
blob._do_download.assert_called()
called_headers = blob._do_download.call_args.args[-4]
self.assertIsInstance(called_headers, dict)
self.assertDictContainsSubset(custom_headers, called_headers)
self.assertLessEqual(custom_headers.items(), called_headers.items())


class Test__quote(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_fileio.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ def test_seek_fails(self):
writer = self._make_blob_writer(blob)

with self.assertRaises(io.UnsupportedOperation):
writer.seek()
writer.seek(0)

def test_conditional_retry_failure(self):
blob = mock.Mock()
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat: Add support for Python 3.12 by gcf-owl-bot[bot] · Pull Request #1187 · googleapis/python-storage · GitHub
Skip to content

This repository was archived by the owner on Mar 31, 2026. It is now read-only.

feat: Add support for Python 3.12#1187
 Merged

cojenco
merged 5 commits into

from

Dec 1, 2023
 Merged


feat: Add support for Python 3.12
#1187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
260c8b0

chore(python): Add Python 3.12


gcf-owl-bot[bot] Nov 23, 2023
d3e54cf

Add trove classifier for python 3.12


parthea Nov 23, 2023
f894ab9

Update contributing.rst, noxfile and constraints to include python 3.12


parthea Nov 24, 2023
a7ce56c

remove usage of deprecated assertDictContainsSubset https://github.co…


parthea Nov 29, 2023
70419a7

update tests KMS key settings


cojenco Dec 1, 2023

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


4 changes: 2 additions & 2 deletions
.github/.OwlBot.lock.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@
# limitations under the License.
docker:
 image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
 digest: sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61
# created: 2023-11-08T19:46:45.022803742Z
 digest: sha256:bacc3af03bff793a03add584537b36b5644342931ad989e3ba1171d3bd5399f5
# created: 2023-11-23T18:17:28.105124211Z

40 changes: 40 additions & 0 deletions
.kokoro/samples/python3.12/common.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Build logs will be here
action {
 define_artifacts {
 regex: "**/*sponge_log.xml"
 }
}

# Specify which tests to run
env_vars: {
 key: "RUN_TESTS_SESSION"
 value: "py-3.12"
}

# Declare build specific Cloud project.
env_vars: {
 key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
 value: "python-docs-samples-tests-312"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
env_vars: {
 key: "TRAMPOLINE_IMAGE"
 value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
}

# Download secrets for samples
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"

# Download trampoline resources.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-storage/.kokoro/trampoline_v2.sh"

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/continuous.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

11 changes: 11 additions & 0 deletions
.kokoro/samples/python3.12/periodic-head.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples-against-head.sh"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/periodic.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "False"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/presubmit.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

2 changes: 1 addition & 1 deletion
CONTRIBUTING.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ In order to add a feature:
 documentation.

- The feature must work fully on the following CPython versions:
 3.7, 3.8, 3.9, 3.10and 3.11 on both UNIX and Windows.
 3.7, 3.8, 3.9, 3.10, 3.11 and 3.12 on both UNIX and Windows.

- The feature must not add unnecessary dependencies (where
 "unnecessary" is of course subjective, but new dependencies should
Expand Down

2 changes: 1 addition & 1 deletion
noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@

DEFAULT_PYTHON_VERSION = "3.8"
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
CONFORMANCE_TEST_PYTHON_VERSIONS = ["3.8"]

_DEFAULT_STORAGE_HOST = "https://storage.googleapis.com"
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/encryption_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@
import storage_upload_encrypted_file

BUCKET = os.environ["CLOUD_STORAGE_BUCKET"]
KMS_KEY = os.environ["CLOUD_KMS_KEY"]
KMS_KEY = os.environ["MAIN_CLOUD_KMS_KEY"]

TEST_ENCRYPTION_KEY = "brtJUWneL92g5q0N2gyDSnlPSYAiIVZ/cWgjyZNeMy0="
TEST_ENCRYPTION_KEY_DECODED = base64.b64decode(TEST_ENCRYPTION_KEY)
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,7 @@ def get_pytest_env_vars() -> Dict[str, str]:

# DO NOT EDIT - automatically generated.
# All versions used to test samples.
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]

# Any default versions that should be ignored.
IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]
Expand Down

10 changes: 9 additions & 1 deletion
samples/snippets/noxfile_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,12 @@ def get_cloud_kms_key():
 if session == 'py-3.10':
 return ('projects/python-docs-samples-tests-310/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.11':
 return ('projects/python-docs-samples-tests-311/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.12':
 return ('projects/python-docs-samples-tests-312/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 return os.environ['CLOUD_KMS_KEY']


Expand All@@ -91,6 +97,8 @@ def get_cloud_kms_key():
 # 'constraints/iam.disableServiceAccountKeyCreation' policy.
 # 2. The new projects buckets need to have universal permission model.
 # For those tests, we'll use the original project.
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests'
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests',
 'MAIN_CLOUD_KMS_KEY': ('projects/python-docs-samples-tests/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 },
}

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 "Programming Language :: Python :: 3.9",
 "Programming Language :: Python :: 3.10",
 "Programming Language :: Python :: 3.11",
 "Programming Language :: Python :: 3.12",
 "Operating System :: OS Independent",
 "Topic :: Internet",
 ],
Expand Down
Empty file addedtesting/constraints-3.12.txt

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
tests/unit/test_blob.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5923,7 +5923,7 @@ def test_downloads_w_client_custom_headers(self):
 blob._do_download.assert_called()
 called_headers = blob._do_download.call_args.args[-4]
 self.assertIsInstance(called_headers, dict)
 self.assertDictContainsSubset(custom_headers, called_headers)
 self.assertLessEqual(custom_headers.items(), called_headers.items())


class Test__quote(unittest.TestCase):
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/test_fileio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ def test_seek_fails(self):
 writer = self._make_blob_writer(blob)

 with self.assertRaises(io.UnsupportedOperation):
 writer.seek()
 writer.seek(0)

 def test_conditional_retry_failure(self):
 blob = mock.Mock()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: Add support for Python 3.12 by gcf-owl-bot[bot] · Pull Request #1187 · googleapis/python-storage · GitHub
Skip to content

This repository was archived by the owner on Mar 31, 2026. It is now read-only.

feat: Add support for Python 3.12#1187
 Merged

cojenco
merged 5 commits into

from

Dec 1, 2023
 Merged


feat: Add support for Python 3.12
#1187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
260c8b0

chore(python): Add Python 3.12


gcf-owl-bot[bot] Nov 23, 2023
d3e54cf

Add trove classifier for python 3.12


parthea Nov 23, 2023
f894ab9

Update contributing.rst, noxfile and constraints to include python 3.12


parthea Nov 24, 2023
a7ce56c

remove usage of deprecated assertDictContainsSubset https://github.co…


parthea Nov 29, 2023
70419a7

update tests KMS key settings


cojenco Dec 1, 2023

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


4 changes: 2 additions & 2 deletions
.github/.OwlBot.lock.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@
# limitations under the License.
docker:
 image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
 digest: sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61
# created: 2023-11-08T19:46:45.022803742Z
 digest: sha256:bacc3af03bff793a03add584537b36b5644342931ad989e3ba1171d3bd5399f5
# created: 2023-11-23T18:17:28.105124211Z

40 changes: 40 additions & 0 deletions
.kokoro/samples/python3.12/common.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Build logs will be here
action {
 define_artifacts {
 regex: "**/*sponge_log.xml"
 }
}

# Specify which tests to run
env_vars: {
 key: "RUN_TESTS_SESSION"
 value: "py-3.12"
}

# Declare build specific Cloud project.
env_vars: {
 key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
 value: "python-docs-samples-tests-312"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
env_vars: {
 key: "TRAMPOLINE_IMAGE"
 value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
}

# Download secrets for samples
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"

# Download trampoline resources.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-storage/.kokoro/trampoline_v2.sh"

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/continuous.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

11 changes: 11 additions & 0 deletions
.kokoro/samples/python3.12/periodic-head.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples-against-head.sh"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/periodic.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "False"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/presubmit.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

2 changes: 1 addition & 1 deletion
CONTRIBUTING.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ In order to add a feature:
 documentation.

- The feature must work fully on the following CPython versions:
 3.7, 3.8, 3.9, 3.10and 3.11 on both UNIX and Windows.
 3.7, 3.8, 3.9, 3.10, 3.11 and 3.12 on both UNIX and Windows.

- The feature must not add unnecessary dependencies (where
 "unnecessary" is of course subjective, but new dependencies should
Expand Down

2 changes: 1 addition & 1 deletion
noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@

DEFAULT_PYTHON_VERSION = "3.8"
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
CONFORMANCE_TEST_PYTHON_VERSIONS = ["3.8"]

_DEFAULT_STORAGE_HOST = "https://storage.googleapis.com"
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/encryption_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@
import storage_upload_encrypted_file

BUCKET = os.environ["CLOUD_STORAGE_BUCKET"]
KMS_KEY = os.environ["CLOUD_KMS_KEY"]
KMS_KEY = os.environ["MAIN_CLOUD_KMS_KEY"]

TEST_ENCRYPTION_KEY = "brtJUWneL92g5q0N2gyDSnlPSYAiIVZ/cWgjyZNeMy0="
TEST_ENCRYPTION_KEY_DECODED = base64.b64decode(TEST_ENCRYPTION_KEY)
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,7 @@ def get_pytest_env_vars() -> Dict[str, str]:

# DO NOT EDIT - automatically generated.
# All versions used to test samples.
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]

# Any default versions that should be ignored.
IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]
Expand Down

10 changes: 9 additions & 1 deletion
samples/snippets/noxfile_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,12 @@ def get_cloud_kms_key():
 if session == 'py-3.10':
 return ('projects/python-docs-samples-tests-310/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.11':
 return ('projects/python-docs-samples-tests-311/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.12':
 return ('projects/python-docs-samples-tests-312/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 return os.environ['CLOUD_KMS_KEY']


Expand All@@ -91,6 +97,8 @@ def get_cloud_kms_key():
 # 'constraints/iam.disableServiceAccountKeyCreation' policy.
 # 2. The new projects buckets need to have universal permission model.
 # For those tests, we'll use the original project.
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests'
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests',
 'MAIN_CLOUD_KMS_KEY': ('projects/python-docs-samples-tests/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 },
}

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 "Programming Language :: Python :: 3.9",
 "Programming Language :: Python :: 3.10",
 "Programming Language :: Python :: 3.11",
 "Programming Language :: Python :: 3.12",
 "Operating System :: OS Independent",
 "Topic :: Internet",
 ],
Expand Down
Empty file addedtesting/constraints-3.12.txt

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
tests/unit/test_blob.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5923,7 +5923,7 @@ def test_downloads_w_client_custom_headers(self):
 blob._do_download.assert_called()
 called_headers = blob._do_download.call_args.args[-4]
 self.assertIsInstance(called_headers, dict)
 self.assertDictContainsSubset(custom_headers, called_headers)
 self.assertLessEqual(custom_headers.items(), called_headers.items())


class Test__quote(unittest.TestCase):
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/test_fileio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ def test_seek_fails(self):
 writer = self._make_blob_writer(blob)

 with self.assertRaises(io.UnsupportedOperation):
 writer.seek()
 writer.seek(0)

 def test_conditional_retry_failure(self):
 blob = mock.Mock()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: Add support for Python 3.12 by gcf-owl-bot[bot] · Pull Request #1187 · googleapis/python-storage · GitHub
Skip to content

This repository was archived by the owner on Mar 31, 2026. It is now read-only.

feat: Add support for Python 3.12#1187
 Merged

cojenco
merged 5 commits into

from

Dec 1, 2023
 Merged


feat: Add support for Python 3.12
#1187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
260c8b0

chore(python): Add Python 3.12


gcf-owl-bot[bot] Nov 23, 2023
d3e54cf

Add trove classifier for python 3.12


parthea Nov 23, 2023
f894ab9

Update contributing.rst, noxfile and constraints to include python 3.12


parthea Nov 24, 2023
a7ce56c

remove usage of deprecated assertDictContainsSubset https://github.co…


parthea Nov 29, 2023
70419a7

update tests KMS key settings


cojenco Dec 1, 2023

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


4 changes: 2 additions & 2 deletions
.github/.OwlBot.lock.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@
# limitations under the License.
docker:
 image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
 digest: sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61
# created: 2023-11-08T19:46:45.022803742Z
 digest: sha256:bacc3af03bff793a03add584537b36b5644342931ad989e3ba1171d3bd5399f5
# created: 2023-11-23T18:17:28.105124211Z

40 changes: 40 additions & 0 deletions
.kokoro/samples/python3.12/common.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Build logs will be here
action {
 define_artifacts {
 regex: "**/*sponge_log.xml"
 }
}

# Specify which tests to run
env_vars: {
 key: "RUN_TESTS_SESSION"
 value: "py-3.12"
}

# Declare build specific Cloud project.
env_vars: {
 key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
 value: "python-docs-samples-tests-312"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
env_vars: {
 key: "TRAMPOLINE_IMAGE"
 value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
}

# Download secrets for samples
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"

# Download trampoline resources.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-storage/.kokoro/trampoline_v2.sh"

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/continuous.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

11 changes: 11 additions & 0 deletions
.kokoro/samples/python3.12/periodic-head.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples-against-head.sh"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/periodic.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "False"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/presubmit.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

2 changes: 1 addition & 1 deletion
CONTRIBUTING.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ In order to add a feature:
 documentation.

- The feature must work fully on the following CPython versions:
 3.7, 3.8, 3.9, 3.10and 3.11 on both UNIX and Windows.
 3.7, 3.8, 3.9, 3.10, 3.11 and 3.12 on both UNIX and Windows.

- The feature must not add unnecessary dependencies (where
 "unnecessary" is of course subjective, but new dependencies should
Expand Down

2 changes: 1 addition & 1 deletion
noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@

DEFAULT_PYTHON_VERSION = "3.8"
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
CONFORMANCE_TEST_PYTHON_VERSIONS = ["3.8"]

_DEFAULT_STORAGE_HOST = "https://storage.googleapis.com"
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/encryption_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@
import storage_upload_encrypted_file

BUCKET = os.environ["CLOUD_STORAGE_BUCKET"]
KMS_KEY = os.environ["CLOUD_KMS_KEY"]
KMS_KEY = os.environ["MAIN_CLOUD_KMS_KEY"]

TEST_ENCRYPTION_KEY = "brtJUWneL92g5q0N2gyDSnlPSYAiIVZ/cWgjyZNeMy0="
TEST_ENCRYPTION_KEY_DECODED = base64.b64decode(TEST_ENCRYPTION_KEY)
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,7 @@ def get_pytest_env_vars() -> Dict[str, str]:

# DO NOT EDIT - automatically generated.
# All versions used to test samples.
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]

# Any default versions that should be ignored.
IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]
Expand Down

10 changes: 9 additions & 1 deletion
samples/snippets/noxfile_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,12 @@ def get_cloud_kms_key():
 if session == 'py-3.10':
 return ('projects/python-docs-samples-tests-310/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.11':
 return ('projects/python-docs-samples-tests-311/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.12':
 return ('projects/python-docs-samples-tests-312/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 return os.environ['CLOUD_KMS_KEY']


Expand All@@ -91,6 +97,8 @@ def get_cloud_kms_key():
 # 'constraints/iam.disableServiceAccountKeyCreation' policy.
 # 2. The new projects buckets need to have universal permission model.
 # For those tests, we'll use the original project.
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests'
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests',
 'MAIN_CLOUD_KMS_KEY': ('projects/python-docs-samples-tests/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 },
}

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 "Programming Language :: Python :: 3.9",
 "Programming Language :: Python :: 3.10",
 "Programming Language :: Python :: 3.11",
 "Programming Language :: Python :: 3.12",
 "Operating System :: OS Independent",
 "Topic :: Internet",
 ],
Expand Down
Empty file addedtesting/constraints-3.12.txt

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
tests/unit/test_blob.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5923,7 +5923,7 @@ def test_downloads_w_client_custom_headers(self):
 blob._do_download.assert_called()
 called_headers = blob._do_download.call_args.args[-4]
 self.assertIsInstance(called_headers, dict)
 self.assertDictContainsSubset(custom_headers, called_headers)
 self.assertLessEqual(custom_headers.items(), called_headers.items())


class Test__quote(unittest.TestCase):
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/test_fileio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ def test_seek_fails(self):
 writer = self._make_blob_writer(blob)

 with self.assertRaises(io.UnsupportedOperation):
 writer.seek()
 writer.seek(0)

 def test_conditional_retry_failure(self):
 blob = mock.Mock()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
feat: Add support for Python 3.12 by gcf-owl-bot[bot] · Pull Request #1187 · googleapis/python-storage · GitHub
Skip to content

This repository was archived by the owner on Mar 31, 2026. It is now read-only.

feat: Add support for Python 3.12#1187
 Merged

cojenco
merged 5 commits into

from

Dec 1, 2023
 Merged


feat: Add support for Python 3.12
#1187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
260c8b0

chore(python): Add Python 3.12


gcf-owl-bot[bot] Nov 23, 2023
d3e54cf

Add trove classifier for python 3.12


parthea Nov 23, 2023
f894ab9

Update contributing.rst, noxfile and constraints to include python 3.12


parthea Nov 24, 2023
a7ce56c

remove usage of deprecated assertDictContainsSubset https://github.co…


parthea Nov 29, 2023
70419a7

update tests KMS key settings


cojenco Dec 1, 2023

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


4 changes: 2 additions & 2 deletions
.github/.OwlBot.lock.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@
# limitations under the License.
docker:
 image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
 digest: sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61
# created: 2023-11-08T19:46:45.022803742Z
 digest: sha256:bacc3af03bff793a03add584537b36b5644342931ad989e3ba1171d3bd5399f5
# created: 2023-11-23T18:17:28.105124211Z

40 changes: 40 additions & 0 deletions
.kokoro/samples/python3.12/common.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Build logs will be here
action {
 define_artifacts {
 regex: "**/*sponge_log.xml"
 }
}

# Specify which tests to run
env_vars: {
 key: "RUN_TESTS_SESSION"
 value: "py-3.12"
}

# Declare build specific Cloud project.
env_vars: {
 key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
 value: "python-docs-samples-tests-312"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
env_vars: {
 key: "TRAMPOLINE_IMAGE"
 value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
}

# Download secrets for samples
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"

# Download trampoline resources.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-storage/.kokoro/trampoline_v2.sh"

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/continuous.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

11 changes: 11 additions & 0 deletions
.kokoro/samples/python3.12/periodic-head.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples-against-head.sh"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/periodic.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "False"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/presubmit.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

2 changes: 1 addition & 1 deletion
CONTRIBUTING.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ In order to add a feature:
 documentation.

- The feature must work fully on the following CPython versions:
 3.7, 3.8, 3.9, 3.10and 3.11 on both UNIX and Windows.
 3.7, 3.8, 3.9, 3.10, 3.11 and 3.12 on both UNIX and Windows.

- The feature must not add unnecessary dependencies (where
 "unnecessary" is of course subjective, but new dependencies should
Expand Down

2 changes: 1 addition & 1 deletion
noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@

DEFAULT_PYTHON_VERSION = "3.8"
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
CONFORMANCE_TEST_PYTHON_VERSIONS = ["3.8"]

_DEFAULT_STORAGE_HOST = "https://storage.googleapis.com"
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/encryption_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@
import storage_upload_encrypted_file

BUCKET = os.environ["CLOUD_STORAGE_BUCKET"]
KMS_KEY = os.environ["CLOUD_KMS_KEY"]
KMS_KEY = os.environ["MAIN_CLOUD_KMS_KEY"]

TEST_ENCRYPTION_KEY = "brtJUWneL92g5q0N2gyDSnlPSYAiIVZ/cWgjyZNeMy0="
TEST_ENCRYPTION_KEY_DECODED = base64.b64decode(TEST_ENCRYPTION_KEY)
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,7 @@ def get_pytest_env_vars() -> Dict[str, str]:

# DO NOT EDIT - automatically generated.
# All versions used to test samples.
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]

# Any default versions that should be ignored.
IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]
Expand Down

10 changes: 9 additions & 1 deletion
samples/snippets/noxfile_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,12 @@ def get_cloud_kms_key():
 if session == 'py-3.10':
 return ('projects/python-docs-samples-tests-310/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.11':
 return ('projects/python-docs-samples-tests-311/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.12':
 return ('projects/python-docs-samples-tests-312/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 return os.environ['CLOUD_KMS_KEY']


Expand All@@ -91,6 +97,8 @@ def get_cloud_kms_key():
 # 'constraints/iam.disableServiceAccountKeyCreation' policy.
 # 2. The new projects buckets need to have universal permission model.
 # For those tests, we'll use the original project.
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests'
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests',
 'MAIN_CLOUD_KMS_KEY': ('projects/python-docs-samples-tests/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 },
}

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 "Programming Language :: Python :: 3.9",
 "Programming Language :: Python :: 3.10",
 "Programming Language :: Python :: 3.11",
 "Programming Language :: Python :: 3.12",
 "Operating System :: OS Independent",
 "Topic :: Internet",
 ],
Expand Down
Empty file addedtesting/constraints-3.12.txt

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
tests/unit/test_blob.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5923,7 +5923,7 @@ def test_downloads_w_client_custom_headers(self):
 blob._do_download.assert_called()
 called_headers = blob._do_download.call_args.args[-4]
 self.assertIsInstance(called_headers, dict)
 self.assertDictContainsSubset(custom_headers, called_headers)
 self.assertLessEqual(custom_headers.items(), called_headers.items())


class Test__quote(unittest.TestCase):
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/test_fileio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ def test_seek_fails(self):
 writer = self._make_blob_writer(blob)

 with self.assertRaises(io.UnsupportedOperation):
 writer.seek()
 writer.seek(0)

 def test_conditional_retry_failure(self):
 blob = mock.Mock()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: Add support for Python 3.12 by gcf-owl-bot[bot] · Pull Request #1187 · googleapis/python-storage · GitHub
Skip to content

This repository was archived by the owner on Mar 31, 2026. It is now read-only.

feat: Add support for Python 3.12#1187
 Merged

cojenco
merged 5 commits into

from

Dec 1, 2023
 Merged


feat: Add support for Python 3.12
#1187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
260c8b0

chore(python): Add Python 3.12


gcf-owl-bot[bot] Nov 23, 2023
d3e54cf

Add trove classifier for python 3.12


parthea Nov 23, 2023
f894ab9

Update contributing.rst, noxfile and constraints to include python 3.12


parthea Nov 24, 2023
a7ce56c

remove usage of deprecated assertDictContainsSubset https://github.co…


parthea Nov 29, 2023
70419a7

update tests KMS key settings


cojenco Dec 1, 2023

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


4 changes: 2 additions & 2 deletions
.github/.OwlBot.lock.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@
# limitations under the License.
docker:
 image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
 digest: sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61
# created: 2023-11-08T19:46:45.022803742Z
 digest: sha256:bacc3af03bff793a03add584537b36b5644342931ad989e3ba1171d3bd5399f5
# created: 2023-11-23T18:17:28.105124211Z

40 changes: 40 additions & 0 deletions
.kokoro/samples/python3.12/common.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Build logs will be here
action {
 define_artifacts {
 regex: "**/*sponge_log.xml"
 }
}

# Specify which tests to run
env_vars: {
 key: "RUN_TESTS_SESSION"
 value: "py-3.12"
}

# Declare build specific Cloud project.
env_vars: {
 key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
 value: "python-docs-samples-tests-312"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
env_vars: {
 key: "TRAMPOLINE_IMAGE"
 value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
}

# Download secrets for samples
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"

# Download trampoline resources.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-storage/.kokoro/trampoline_v2.sh"

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/continuous.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

11 changes: 11 additions & 0 deletions
.kokoro/samples/python3.12/periodic-head.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples-against-head.sh"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/periodic.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "False"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/presubmit.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

2 changes: 1 addition & 1 deletion
CONTRIBUTING.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ In order to add a feature:
 documentation.

- The feature must work fully on the following CPython versions:
 3.7, 3.8, 3.9, 3.10and 3.11 on both UNIX and Windows.
 3.7, 3.8, 3.9, 3.10, 3.11 and 3.12 on both UNIX and Windows.

- The feature must not add unnecessary dependencies (where
 "unnecessary" is of course subjective, but new dependencies should
Expand Down

2 changes: 1 addition & 1 deletion
noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@

DEFAULT_PYTHON_VERSION = "3.8"
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
CONFORMANCE_TEST_PYTHON_VERSIONS = ["3.8"]

_DEFAULT_STORAGE_HOST = "https://storage.googleapis.com"
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/encryption_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@
import storage_upload_encrypted_file

BUCKET = os.environ["CLOUD_STORAGE_BUCKET"]
KMS_KEY = os.environ["CLOUD_KMS_KEY"]
KMS_KEY = os.environ["MAIN_CLOUD_KMS_KEY"]

TEST_ENCRYPTION_KEY = "brtJUWneL92g5q0N2gyDSnlPSYAiIVZ/cWgjyZNeMy0="
TEST_ENCRYPTION_KEY_DECODED = base64.b64decode(TEST_ENCRYPTION_KEY)
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,7 @@ def get_pytest_env_vars() -> Dict[str, str]:

# DO NOT EDIT - automatically generated.
# All versions used to test samples.
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]

# Any default versions that should be ignored.
IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]
Expand Down

10 changes: 9 additions & 1 deletion
samples/snippets/noxfile_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,12 @@ def get_cloud_kms_key():
 if session == 'py-3.10':
 return ('projects/python-docs-samples-tests-310/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.11':
 return ('projects/python-docs-samples-tests-311/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.12':
 return ('projects/python-docs-samples-tests-312/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 return os.environ['CLOUD_KMS_KEY']


Expand All@@ -91,6 +97,8 @@ def get_cloud_kms_key():
 # 'constraints/iam.disableServiceAccountKeyCreation' policy.
 # 2. The new projects buckets need to have universal permission model.
 # For those tests, we'll use the original project.
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests'
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests',
 'MAIN_CLOUD_KMS_KEY': ('projects/python-docs-samples-tests/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 },
}

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 "Programming Language :: Python :: 3.9",
 "Programming Language :: Python :: 3.10",
 "Programming Language :: Python :: 3.11",
 "Programming Language :: Python :: 3.12",
 "Operating System :: OS Independent",
 "Topic :: Internet",
 ],
Expand Down
Empty file addedtesting/constraints-3.12.txt

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
tests/unit/test_blob.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5923,7 +5923,7 @@ def test_downloads_w_client_custom_headers(self):
 blob._do_download.assert_called()
 called_headers = blob._do_download.call_args.args[-4]
 self.assertIsInstance(called_headers, dict)
 self.assertDictContainsSubset(custom_headers, called_headers)
 self.assertLessEqual(custom_headers.items(), called_headers.items())


class Test__quote(unittest.TestCase):
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/test_fileio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ def test_seek_fails(self):
 writer = self._make_blob_writer(blob)

 with self.assertRaises(io.UnsupportedOperation):
 writer.seek()
 writer.seek(0)

 def test_conditional_retry_failure(self):
 blob = mock.Mock()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: Add support for Python 3.12 by gcf-owl-bot[bot] · Pull Request #1187 · googleapis/python-storage · GitHub
Skip to content

This repository was archived by the owner on Mar 31, 2026. It is now read-only.

feat: Add support for Python 3.12#1187
 Merged

cojenco
merged 5 commits into

from

Dec 1, 2023
 Merged


feat: Add support for Python 3.12
#1187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
260c8b0

chore(python): Add Python 3.12


gcf-owl-bot[bot] Nov 23, 2023
d3e54cf

Add trove classifier for python 3.12


parthea Nov 23, 2023
f894ab9

Update contributing.rst, noxfile and constraints to include python 3.12


parthea Nov 24, 2023
a7ce56c

remove usage of deprecated assertDictContainsSubset https://github.co…


parthea Nov 29, 2023
70419a7

update tests KMS key settings


cojenco Dec 1, 2023

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


4 changes: 2 additions & 2 deletions
.github/.OwlBot.lock.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@
# limitations under the License.
docker:
 image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
 digest: sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61
# created: 2023-11-08T19:46:45.022803742Z
 digest: sha256:bacc3af03bff793a03add584537b36b5644342931ad989e3ba1171d3bd5399f5
# created: 2023-11-23T18:17:28.105124211Z

40 changes: 40 additions & 0 deletions
.kokoro/samples/python3.12/common.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Build logs will be here
action {
 define_artifacts {
 regex: "**/*sponge_log.xml"
 }
}

# Specify which tests to run
env_vars: {
 key: "RUN_TESTS_SESSION"
 value: "py-3.12"
}

# Declare build specific Cloud project.
env_vars: {
 key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
 value: "python-docs-samples-tests-312"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
env_vars: {
 key: "TRAMPOLINE_IMAGE"
 value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
}

# Download secrets for samples
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"

# Download trampoline resources.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-storage/.kokoro/trampoline_v2.sh"

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/continuous.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

11 changes: 11 additions & 0 deletions
.kokoro/samples/python3.12/periodic-head.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples-against-head.sh"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/periodic.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "False"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/presubmit.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

2 changes: 1 addition & 1 deletion
CONTRIBUTING.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ In order to add a feature:
 documentation.

- The feature must work fully on the following CPython versions:
 3.7, 3.8, 3.9, 3.10and 3.11 on both UNIX and Windows.
 3.7, 3.8, 3.9, 3.10, 3.11 and 3.12 on both UNIX and Windows.

- The feature must not add unnecessary dependencies (where
 "unnecessary" is of course subjective, but new dependencies should
Expand Down

2 changes: 1 addition & 1 deletion
noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@

DEFAULT_PYTHON_VERSION = "3.8"
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
CONFORMANCE_TEST_PYTHON_VERSIONS = ["3.8"]

_DEFAULT_STORAGE_HOST = "https://storage.googleapis.com"
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/encryption_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@
import storage_upload_encrypted_file

BUCKET = os.environ["CLOUD_STORAGE_BUCKET"]
KMS_KEY = os.environ["CLOUD_KMS_KEY"]
KMS_KEY = os.environ["MAIN_CLOUD_KMS_KEY"]

TEST_ENCRYPTION_KEY = "brtJUWneL92g5q0N2gyDSnlPSYAiIVZ/cWgjyZNeMy0="
TEST_ENCRYPTION_KEY_DECODED = base64.b64decode(TEST_ENCRYPTION_KEY)
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,7 @@ def get_pytest_env_vars() -> Dict[str, str]:

# DO NOT EDIT - automatically generated.
# All versions used to test samples.
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]

# Any default versions that should be ignored.
IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]
Expand Down

10 changes: 9 additions & 1 deletion
samples/snippets/noxfile_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,12 @@ def get_cloud_kms_key():
 if session == 'py-3.10':
 return ('projects/python-docs-samples-tests-310/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.11':
 return ('projects/python-docs-samples-tests-311/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.12':
 return ('projects/python-docs-samples-tests-312/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 return os.environ['CLOUD_KMS_KEY']


Expand All@@ -91,6 +97,8 @@ def get_cloud_kms_key():
 # 'constraints/iam.disableServiceAccountKeyCreation' policy.
 # 2. The new projects buckets need to have universal permission model.
 # For those tests, we'll use the original project.
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests'
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests',
 'MAIN_CLOUD_KMS_KEY': ('projects/python-docs-samples-tests/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 },
}

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 "Programming Language :: Python :: 3.9",
 "Programming Language :: Python :: 3.10",
 "Programming Language :: Python :: 3.11",
 "Programming Language :: Python :: 3.12",
 "Operating System :: OS Independent",
 "Topic :: Internet",
 ],
Expand Down
Empty file addedtesting/constraints-3.12.txt

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
tests/unit/test_blob.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5923,7 +5923,7 @@ def test_downloads_w_client_custom_headers(self):
 blob._do_download.assert_called()
 called_headers = blob._do_download.call_args.args[-4]
 self.assertIsInstance(called_headers, dict)
 self.assertDictContainsSubset(custom_headers, called_headers)
 self.assertLessEqual(custom_headers.items(), called_headers.items())


class Test__quote(unittest.TestCase):
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/test_fileio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ def test_seek_fails(self):
 writer = self._make_blob_writer(blob)

 with self.assertRaises(io.UnsupportedOperation):
 writer.seek()
 writer.seek(0)

 def test_conditional_retry_failure(self):
 blob = mock.Mock()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
feat: Add support for Python 3.12 by gcf-owl-bot[bot] · Pull Request #1187 · googleapis/python-storage · GitHub
Skip to content

This repository was archived by the owner on Mar 31, 2026. It is now read-only.

feat: Add support for Python 3.12#1187
 Merged

cojenco
merged 5 commits into

from

Dec 1, 2023
 Merged


feat: Add support for Python 3.12
#1187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
260c8b0

chore(python): Add Python 3.12


gcf-owl-bot[bot] Nov 23, 2023
d3e54cf

Add trove classifier for python 3.12


parthea Nov 23, 2023
f894ab9

Update contributing.rst, noxfile and constraints to include python 3.12


parthea Nov 24, 2023
a7ce56c

remove usage of deprecated assertDictContainsSubset https://github.co…


parthea Nov 29, 2023
70419a7

update tests KMS key settings


cojenco Dec 1, 2023

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


4 changes: 2 additions & 2 deletions
.github/.OwlBot.lock.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,5 @@
# limitations under the License.
docker:
 image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
 digest: sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61
# created: 2023-11-08T19:46:45.022803742Z
 digest: sha256:bacc3af03bff793a03add584537b36b5644342931ad989e3ba1171d3bd5399f5
# created: 2023-11-23T18:17:28.105124211Z

40 changes: 40 additions & 0 deletions
.kokoro/samples/python3.12/common.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Build logs will be here
action {
 define_artifacts {
 regex: "**/*sponge_log.xml"
 }
}

# Specify which tests to run
env_vars: {
 key: "RUN_TESTS_SESSION"
 value: "py-3.12"
}

# Declare build specific Cloud project.
env_vars: {
 key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
 value: "python-docs-samples-tests-312"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples.sh"
}

# Configure the docker image for kokoro-trampoline.
env_vars: {
 key: "TRAMPOLINE_IMAGE"
 value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
}

# Download secrets for samples
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"

# Download trampoline resources.
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"

# Use the trampoline script to run in docker.
build_file: "python-storage/.kokoro/trampoline_v2.sh"

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/continuous.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

11 changes: 11 additions & 0 deletions
.kokoro/samples/python3.12/periodic-head.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

env_vars: {
 key: "TRAMPOLINE_BUILD_FILE"
 value: "github/python-storage/.kokoro/test-samples-against-head.sh"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/periodic.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "False"
}

6 changes: 6 additions & 0 deletions
.kokoro/samples/python3.12/presubmit.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
# Format: //devtools/kokoro/config/proto/build.proto

env_vars: {
 key: "INSTALL_LIBRARY_FROM_SOURCE"
 value: "True"
}

2 changes: 1 addition & 1 deletion
CONTRIBUTING.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ In order to add a feature:
 documentation.

- The feature must work fully on the following CPython versions:
 3.7, 3.8, 3.9, 3.10and 3.11 on both UNIX and Windows.
 3.7, 3.8, 3.9, 3.10, 3.11 and 3.12 on both UNIX and Windows.

- The feature must not add unnecessary dependencies (where
 "unnecessary" is of course subjective, but new dependencies should
Expand Down

2 changes: 1 addition & 1 deletion
noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@

DEFAULT_PYTHON_VERSION = "3.8"
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
CONFORMANCE_TEST_PYTHON_VERSIONS = ["3.8"]

_DEFAULT_STORAGE_HOST = "https://storage.googleapis.com"
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/encryption_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@
import storage_upload_encrypted_file

BUCKET = os.environ["CLOUD_STORAGE_BUCKET"]
KMS_KEY = os.environ["CLOUD_KMS_KEY"]
KMS_KEY = os.environ["MAIN_CLOUD_KMS_KEY"]

TEST_ENCRYPTION_KEY = "brtJUWneL92g5q0N2gyDSnlPSYAiIVZ/cWgjyZNeMy0="
TEST_ENCRYPTION_KEY_DECODED = base64.b64decode(TEST_ENCRYPTION_KEY)
Expand Down

2 changes: 1 addition & 1 deletion
samples/snippets/noxfile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,7 @@ def get_pytest_env_vars() -> Dict[str, str]:

# DO NOT EDIT - automatically generated.
# All versions used to test samples.
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]

# Any default versions that should be ignored.
IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]
Expand Down

10 changes: 9 additions & 1 deletion
samples/snippets/noxfile_config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,12 @@ def get_cloud_kms_key():
 if session == 'py-3.10':
 return ('projects/python-docs-samples-tests-310/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.11':
 return ('projects/python-docs-samples-tests-311/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 if session == 'py-3.12':
 return ('projects/python-docs-samples-tests-312/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 return os.environ['CLOUD_KMS_KEY']


Expand All@@ -91,6 +97,8 @@ def get_cloud_kms_key():
 # 'constraints/iam.disableServiceAccountKeyCreation' policy.
 # 2. The new projects buckets need to have universal permission model.
 # For those tests, we'll use the original project.
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests'
 'MAIN_GOOGLE_CLOUD_PROJECT': 'python-docs-samples-tests',
 'MAIN_CLOUD_KMS_KEY': ('projects/python-docs-samples-tests/locations/us/'
 'keyRings/gcs-kms-key-ring/cryptoKeys/gcs-kms-key')
 },
}

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 "Programming Language :: Python :: 3.9",
 "Programming Language :: Python :: 3.10",
 "Programming Language :: Python :: 3.11",
 "Programming Language :: Python :: 3.12",
 "Operating System :: OS Independent",
 "Topic :: Internet",
 ],
Expand Down
Empty file addedtesting/constraints-3.12.txt

View file


Open in desktop


Empty file.


2 changes: 1 addition & 1 deletion
tests/unit/test_blob.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5923,7 +5923,7 @@ def test_downloads_w_client_custom_headers(self):
 blob._do_download.assert_called()
 called_headers = blob._do_download.call_args.args[-4]
 self.assertIsInstance(called_headers, dict)
 self.assertDictContainsSubset(custom_headers, called_headers)
 self.assertLessEqual(custom_headers.items(), called_headers.items())


class Test__quote(unittest.TestCase):
Expand Down

2 changes: 1 addition & 1 deletion
tests/unit/test_fileio.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ def test_seek_fails(self):
 writer = self._make_blob_writer(blob)

 with self.assertRaises(io.UnsupportedOperation):
 writer.seek()
 writer.seek(0)

 def test_conditional_retry_failure(self):
 blob = mock.Mock()
Expand Down