Merge branch 'main' into patch-1

googleapis · Sep 3, 2024 · 0bd0485 · 0bd0485
2 parents c9653a7 + ee5c209
commit 0bd0485
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,21 @@
 
 [1]: https://pypi.org/project/google-crc32c/#history
 
+## [1.6.0](https://github.com/googleapis/python-crc32c/compare/v1.5.0...v1.6.0) (2024-08-29)
+
+
+### Features
+
+* Add support for python 3.12 ([#177](https://github.com/googleapis/python-crc32c/issues/177)) ([5ff1207](https://github.com/googleapis/python-crc32c/commit/5ff1207e7b60256e7a32932324ccb9ad4ec265d2))
+* Build using Visual Studio 17 2022 instead of Visual Studio 16 2019 ([c1c8c59](https://github.com/googleapis/python-crc32c/commit/c1c8c597d07e573406d76765022a837b007f9074))
+
+
+### Bug Fixes
+
+* Drop support for python 3.7 and 3.8 ([c1c8c59](https://github.com/googleapis/python-crc32c/commit/c1c8c597d07e573406d76765022a837b007f9074))
+* Drop support for Windows 32bit which is not supported in Visual Studio 17 2022 ([c1c8c59](https://github.com/googleapis/python-crc32c/commit/c1c8c597d07e573406d76765022a837b007f9074))
+* Remove manylinux1 which is no longer supported by PyPA ([#186](https://github.com/googleapis/python-crc32c/issues/186)) ([79edb3f](https://github.com/googleapis/python-crc32c/commit/79edb3fd3cda0e4193a6fb6a8346058398df43de))
+
 ## [1.5.0](https://github.com/googleapis/python-crc32c/compare/v1.4.0...v1.5.0) (2022-08-31)
 
 

diff --git a/scripts/osx/publish_python_wheel.sh b/scripts/osx/publish_python_wheel.sh
@@ -28,4 +28,4 @@ TWINE=${PYTHON_BIN}/twine
 export PYTHONUNBUFFERED=1
 
 TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google-cloud-pypi-token-keystore-1")
-${PYTHON} -m twine upload --skip-existing --username __token__ --password "${TWINE_PASSWORD}" ${REPO_ROOT}/dist_wheels/*
+${PYTHON} -m twine upload --skip-existing --username __token__ --password "${TWINE_PASSWORD}" ${REPO_ROOT}/wheels/*
diff --git a/scripts/requirements.txt b/scripts/requirements.txt
@@ -4,36 +4,36 @@
 #
 #    pip-compile --allow-unsafe --generate-hashes requirements.in
 #
-cmake==3.27.9 \
-    --hash=sha256:07bf268f42c9cdf3b06e04cc145c203b83d5a700f7c2a597772610f48c3dca04 \
-    --hash=sha256:434714990d82e3c3936a726c1706c6a1d5a34964a7415d1433af0904a994e414 \
-    --hash=sha256:5c83fe2c6059aaa3ad86f49e6e3da4483e582994a6c152aa7efa175282f7b207 \
-    --hash=sha256:5c91df483ebaa03107f8b9488de207ff32fc74ef93bba79ac52dd830fff40b06 \
-    --hash=sha256:5e8cc5554de86a072e6cbfef725e7dff542bc164a08f5fd41bc194f7778710b7 \
-    --hash=sha256:64c7cd776d07a82163c3265cc82920e64e328d1c87049644005bfd49e4de4d7b \
-    --hash=sha256:87e95c452e522c9379bbd04b300a0b28ba03841d57532166e109669f82f2bdef \
-    --hash=sha256:8eb760800b8bd0178a29334ea3c729ac0534865a30f40994cdfc9c0897488a9e \
-    --hash=sha256:9163fabf484b437cd11d5abe0b5161de57e9c22c75f779c9e6df7765b8138b42 \
-    --hash=sha256:baad87ffe2b257ad51f66fab23f3ba5c16e24d757ba1543d4edb3b6cb4de47a2 \
-    --hash=sha256:c0603c6dc9c7a4c6fce2717e5813bc6126d86388ce057f5bf1a643384966d784 \
-    --hash=sha256:d3030f9f3773154cf6e8c581eac7b0225822f08d6bce37995180d901dfc62465 \
-    --hash=sha256:d7880be7798bd58e43e0eb2e0ce67e7bb0d2ae29b3dc8f3cfbc1f991ae94305d \
-    --hash=sha256:d8306b6e4442496dc1d87e3e64394ebbf02c04f1c6324a1a37cad3695f7d835a \
-    --hash=sha256:d8a40eef1268c91e5b520b28fd5fe0591d750e48e44276dbfd493a14ee595c41 \
-    --hash=sha256:e09cddb8338aab68b17f99ac0ac39ec3d9f8923f0d1527d25f9b4e1bdf8fa057 \
-    --hash=sha256:f564e739b0ef37c1422fe91938b2ab971e21756b848bf840e3672ef3acacf73f
+cmake==3.30.2 \
+    --hash=sha256:02657456811a8dd95d07728e0878ee6e09d0466de84319513af99490beefe753 \
+    --hash=sha256:27f9f8b8a442d489cf4ae5dae1e475430979e9fcfbaef5fd0810aac4206548a9 \
+    --hash=sha256:33e6ce72a4865b25f7f61e40e634382a7cfbe494785ce3c0aa94475b5e0f9252 \
+    --hash=sha256:48e0998068d785d3b78cc60a7e3d38fd71cfb942ce0a72ee046de38ec2bd6523 \
+    --hash=sha256:54dba98c12c6b77bd86b452b71c7f7f3b04027081f3451e18cdf2d926e4695e5 \
+    --hash=sha256:6021b64ec6ddf43ff5887e510f897468a281f1822feedf48edf86926288a48a7 \
+    --hash=sha256:709568c04f60f6dbee846a997a774ae28e12e809b4cbb12b6cd00767c111ede0 \
+    --hash=sha256:806d3295c75ae4f9bd53100b4cdd17c00b41e1606a6cff6faf1f599fdace7d71 \
+    --hash=sha256:894214560a6d70af6e88d8506f41f6911c31757a7799eced3322ca1fc4c76e4a \
+    --hash=sha256:8d0b29a92cf31c54ab21040e84a78420abbf59cdd73c30d05e0e70229b2e9348 \
+    --hash=sha256:977acfb5256e29bc9e14004a2350a7f8bb6a2c5d42ad74183fb64275b99af2fa \
+    --hash=sha256:9beca135489d56a89cf54cf3d324bcf8dd6c50cc9bdb76b9a97e8540935797b2 \
+    --hash=sha256:b58b658f3ea47b1b6deb8fab817bf68a9c7f00fde514ad344b9cef16d684206a \
+    --hash=sha256:e706eded76e0e8b09d2cf09cbab0a930f6550084a85950982b7c53f6a79a0451 \
+    --hash=sha256:ee421b9531279b88e54c4bd3ff41c538d1f563e75b1340a8eb2569c38949d230 \
+    --hash=sha256:fe4f48bb96fadef92697ccaeb98b22ff36b3add80e45ce48e0c67462846fd242 \
+    --hash=sha256:fef0b8a18a6376ff430e86bedcccb4018b344295a17584aaebf1b7339c92f505
     # via -r requirements.in
-wheel==0.42.0 \
-    --hash=sha256:177f9c9b0d45c47873b619f5b650346d632cdc35fb5e4d25058e09c9e581433d \
-    --hash=sha256:c45be39f7882c9d34243236f2d63cbd58039e360f85d0913425fbd7ceea617a8
+wheel==0.44.0 \
+    --hash=sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f \
+    --hash=sha256:a29c3f2817e95ab89aa4660681ad547c0e9547f20e75b0562fe7723c9a2a9d49
     # via -r requirements.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.3.1 \
-    --hash=sha256:1fcaa041308d01f14575f6d0d2ea4b75a3e2871fe4f9c694976f908768e14174 \
-    --hash=sha256:55eb67bb6171d37447e82213be585b75fe2b12b359e993773aca4de9247a052b
+pip==24.2 \
+    --hash=sha256:2cd581cf58ab7fcfca4ce8efa6dcacd0de5bf8d0a3eb9ec927e07405f4d9e2a2 \
+    --hash=sha256:5b5e490b5e9cb275c879595064adce9ebd31b854e3e803740b72f9ccf34a45b8
     # via -r requirements.in
-setuptools==70.0.0 \
-    --hash=sha256:54faa7f2e8d2d11bcd2c07bed282eef1046b5c080d1c32add737d7b5817b1ad4 \
-    --hash=sha256:f211a66637b8fa059bb28183da127d4e86396c991a942b028c6650d4319c3fd0
+setuptools==73.0.1 \
+    --hash=sha256:b208925fcb9f7af924ed2dc04708ea89791e24bde0d3020b27df0e116088b34e \
+    --hash=sha256:d59a3e788ab7e012ab2c4baed1b376da6366883ee20d7a5fc426816e3d7b1193
     # via -r requirements.in
diff --git a/scripts/windows/build.bat b/scripts/windows/build.bat
@@ -74,7 +74,7 @@ FOR %%P IN (3.9, 3.10, 3.11, 3.12) DO (
     py -%%P-64 -m pip wheel . --wheel-dir wheels/
 
     echo "Built wheel, now running tests."
-    call %~dp0/test.bat %%P
+    call %~dp0/test.bat %%P || goto :error
 
     echo "Finished with Python version %%P, now uninstalling"
     choco uninstall python -y

diff --git a/setup.cfg b/setup.cfg
@@ -14,7 +14,7 @@
 
 [metadata]
 name = google-crc32c
-version = 1.5.0
+version = 1.6.0
 description = A python wrapper of the C library 'Google CRC32C'
 url = https://github.com/googleapis/python-crc32c
 long_description = file: README.md

diff --git a/setup.py b/setup.py
@@ -29,7 +29,6 @@
 
 
 def copy_dll(build_lib):
-    return #  trying static build of C library.
     install_prefix = os.environ.get("CRC32C_INSTALL_PREFIX")
 
     if os.name == "nt" and install_prefix is not None: