Merge pull request #32112 Upgrade Apache Beam to use Cython 3.x.

apache · Aug 9, 2024 · 49e98e5 · 49e98e5
2 parents 1c0cfa1 + 00de740
commit 49e98e5
Show file tree

Hide file tree

Showing 24 changed files with 9 additions and 41 deletions.
diff --git a/sdks/python/apache_beam/coders/coder_impl.py b/sdks/python/apache_beam/coders/coder_impl.py
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 """Coder implementations.
 
 The actual encode/decode implementations are split off from coders to

diff --git a/sdks/python/apache_beam/coders/stream.pyx b/sdks/python/apache_beam/coders/stream.pyx
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 """Compiled version of the Stream objects used by CoderImpl.
 
 For internal use only; no backwards-compatibility guarantees.

diff --git a/sdks/python/apache_beam/metrics/cells.py b/sdks/python/apache_beam/metrics/cells.py
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 """
 This file contains metric cell classes. A metric cell is used to accumulate
 in-memory changes to a metric. It represents a specific metric in a single

diff --git a/sdks/python/apache_beam/metrics/execution.py b/sdks/python/apache_beam/metrics/execution.py
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 """
 This module is for internal use only; no backwards-compatibility guarantees.
 

diff --git a/sdks/python/apache_beam/metrics/monitoring_infos.py b/sdks/python/apache_beam/metrics/monitoring_infos.py
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 # pytype: skip-file
 
 import collections

diff --git a/sdks/python/apache_beam/runners/common.py b/sdks/python/apache_beam/runners/common.py
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# cython: language_level=3
 
 """Worker operations executor.
 

diff --git a/sdks/python/apache_beam/runners/worker/logger.py b/sdks/python/apache_beam/runners/worker/logger.py
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 """Python worker logging."""
 
 # pytype: skip-file

diff --git a/sdks/python/apache_beam/runners/worker/opcounters.py b/sdks/python/apache_beam/runners/worker/opcounters.py
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 """Counters collect the progress of the Worker for reporting to the service."""
 
 # pytype: skip-file

diff --git a/sdks/python/apache_beam/runners/worker/operations.py b/sdks/python/apache_beam/runners/worker/operations.py
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 """Worker operations executor."""
 
 # pytype: skip-file

diff --git a/sdks/python/apache_beam/runners/worker/statesampler_fast.pyx b/sdks/python/apache_beam/runners/worker/statesampler_fast.pyx
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 """State sampler for tracking time spent in execution steps.
 
 The state sampler profiles the time spent in each step of a pipeline.
@@ -59,7 +57,7 @@ cdef extern from "crossplatform_time.h" nogil:
     long tv_nsec  # nanoseconds
   int clock_gettime(int clock_id, timespec *result)
 
-cdef inline int64_t get_nsec_time() nogil:
+cdef inline int64_t get_nsec_time() noexcept nogil:
   """Get current time as microseconds since Unix epoch."""
   cdef timespec current_time
   # First argument value of 0 corresponds to CLOCK_REALTIME.

diff --git a/sdks/python/apache_beam/testing/fast_test_utils.pyx b/sdks/python/apache_beam/testing/fast_test_utils.pyx
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 cimport libc.stdint
 cimport libc.stdlib
 cimport libc.string

diff --git a/sdks/python/apache_beam/transforms/cy_combiners.py b/sdks/python/apache_beam/transforms/cy_combiners.py
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 """A library of basic cythonized CombineFn subclasses.
 
 For internal use only; no backwards-compatibility guarantees.

diff --git a/sdks/python/apache_beam/transforms/cy_dataflow_distribution_counter.pyx b/sdks/python/apache_beam/transforms/cy_dataflow_distribution_counter.pyx
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 """ For internal use only. No backwards compatibility guarantees."""
 
 cimport cython

diff --git a/sdks/python/apache_beam/transforms/stats.py b/sdks/python/apache_beam/transforms/stats.py
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-# cython: language_level=3
-
 """This module has all statistic related transforms.
 
 This ApproximateUnique class will be deprecated [1]. PLease look into using

diff --git a/sdks/python/apache_beam/utils/counters.py b/sdks/python/apache_beam/utils/counters.py
@@ -17,7 +17,6 @@
 
 # cython: profile=False
 # cython: overflowcheck=True
-# cython: language_level=3
 
 """Counters collect the progress of the Worker for reporting to the service.
 

diff --git a/sdks/python/apache_beam/utils/windowed_value.py b/sdks/python/apache_beam/utils/windowed_value.py
@@ -22,8 +22,6 @@
 # editing this file as WindowedValues are created for every element for
 # every step in a Beam pipeline.
 
-# cython: language_level=3
-
 # pytype: skip-file
 
 import collections

diff --git a/sdks/python/container/base_image_requirements_manual.txt b/sdks/python/container/base_image_requirements_manual.txt
@@ -25,9 +25,7 @@
 # Consider constraining requirements of Beam itself when necessary.
 
 bs4  # Commonly used HTML processing tool.
-# Don't upgrade to Cython 3.x, until it's released, stable and we have consensus
-# to upgrade. Use 0.xx for now.
-cython<1
+cython>=3,<4
 # future is no longer a Beam dependency, but is an implicit dependency in
 # some versions of libraries that launch Beam pipelines, like tensorflow-transform.
 # Leaving 'future' in our containers for now prevent breaking tft users.

diff --git a/sdks/python/container/py310/base_image_requirements.txt b/sdks/python/container/py310/base_image_requirements.txt
@@ -36,7 +36,7 @@ cloudpickle==2.2.1
 cramjam==2.8.3
 crcmod==1.7
 cryptography==43.0.0
-Cython==0.29.37
+Cython==3.0.10
 deprecation==2.1.0
 dill==0.3.1.1
 dnspython==2.6.1

diff --git a/sdks/python/container/py311/base_image_requirements.txt b/sdks/python/container/py311/base_image_requirements.txt
@@ -35,7 +35,7 @@ cloudpickle==2.2.1
 cramjam==2.8.3
 crcmod==1.7
 cryptography==43.0.0
-Cython==0.29.37
+Cython==3.0.10
 deprecation==2.1.0
 dill==0.3.1.1
 dnspython==2.6.1

diff --git a/sdks/python/container/py312/base_image_requirements.txt b/sdks/python/container/py312/base_image_requirements.txt
@@ -35,7 +35,7 @@ cloudpickle==2.2.1
 cramjam==2.8.3
 crcmod==1.7
 cryptography==43.0.0
-Cython==0.29.37
+Cython==3.0.10
 deprecation==2.1.0
 dill==0.3.1.1
 dnspython==2.6.1

diff --git a/sdks/python/container/py38/base_image_requirements.txt b/sdks/python/container/py38/base_image_requirements.txt
@@ -37,7 +37,7 @@ cloudpickle==2.2.1
 cramjam==2.8.3
 crcmod==1.7
 cryptography==43.0.0
-Cython==0.29.37
+Cython==3.0.10
 deprecation==2.1.0
 dill==0.3.1.1
 dnspython==2.6.1

diff --git a/sdks/python/container/py39/base_image_requirements.txt b/sdks/python/container/py39/base_image_requirements.txt
@@ -36,7 +36,7 @@ cloudpickle==2.2.1
 cramjam==2.8.3
 crcmod==1.7
 cryptography==43.0.0
-Cython==0.29.37
+Cython==3.0.10
 deprecation==2.1.0
 dill==0.3.1.1
 dnspython==2.6.1

diff --git a/sdks/python/pyproject.toml b/sdks/python/pyproject.toml
@@ -28,7 +28,7 @@ requires = [
     # Numpy headers
     "numpy>=1.14.3,<1.27", # Update setup.py as well.
     # having cython here will create wheels that are platform dependent.
-    "cython==0.29.36",
+    "cython>=3.0,<4",
     ## deps for generating external transform wrappers:
     # also update PyYaml bounds in sdks:python:generateExternalTransformsConfig
     'pyyaml>=3.12,<7.0.0',

diff --git a/sdks/python/setup.py b/sdks/python/setup.py
@@ -113,7 +113,7 @@ def get_version():
   # `pipenv` package managers.
   pass
 
-REQUIRED_CYTHON_VERSION = '0.28.1'
+REQUIRED_CYTHON_VERSION = '3.0.0'
 try:
   _CYTHON_VERSION = distribution('cython').version
   if parse_version(_CYTHON_VERSION) < parse_version(REQUIRED_CYTHON_VERSION):