Test Python 3.13

MobileTeleSystems · Jul 27, 2024 · ad1d8bb · ad1d8bb
1 parent b657322
commit ad1d8bb
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 21 deletions.
diff --git a/.github/workflows/data/core/matrix.yml b/.github/workflows/data/core/matrix.yml
@@ -8,7 +8,7 @@ min: &min
 max: &max
   spark-version: 3.5.1
   pydantic-version: 2
-  python-version: '3.12'
+  python-version: '3.13.0-beta.4'
   java-version: 20
   os: ubuntu-latest
 

diff --git a/.github/workflows/data/ftp/matrix.yml b/.github/workflows/data/ftp/matrix.yml
@@ -5,7 +5,7 @@ min: &min
 
 max: &max
   pydantic-version: 2
-  python-version: '3.12'
+  python-version: '3.13.0-beta.4'
   os: ubuntu-latest
 
 latest: &latest

diff --git a/.github/workflows/data/ftps/matrix.yml b/.github/workflows/data/ftps/matrix.yml
@@ -5,7 +5,7 @@ min: &min
 
 max: &max
   pydantic-version: 2
-  python-version: '3.12'
+  python-version: '3.13.0-beta.4'
   os: ubuntu-latest
 
 latest: &latest

diff --git a/.github/workflows/data/hdfs/matrix.yml b/.github/workflows/data/hdfs/matrix.yml
@@ -10,7 +10,7 @@ max: &max
   hadoop-version: hadoop3-hdfs
   spark-version: 3.5.1
   pydantic-version: 2
-  python-version: '3.12'
+  python-version: '3.13.0-beta.4'
   java-version: 20
   os: ubuntu-latest
 

diff --git a/.github/workflows/data/s3/matrix.yml b/.github/workflows/data/s3/matrix.yml
@@ -12,7 +12,7 @@ max: &max
   minio-version: 2024.4.18
   spark-version: 3.5.1
   pydantic-version: 2
-  python-version: '3.12'
+  python-version: '3.13.0-beta.4'
   java-version: 20
   os: ubuntu-latest
 

diff --git a/.github/workflows/data/sftp/matrix.yml b/.github/workflows/data/sftp/matrix.yml
@@ -5,7 +5,7 @@ min: &min
 
 max: &max
   pydantic-version: 2
-  python-version: '3.12'
+  python-version: '3.13.0-beta.4'
   os: ubuntu-latest
 
 latest: &latest

diff --git a/.github/workflows/data/webdav/matrix.yml b/.github/workflows/data/webdav/matrix.yml
@@ -5,7 +5,7 @@ min: &min
 
 max: &max
   pydantic-version: 2
-  python-version: '3.12'
+  python-version: '3.13.0-beta.4'
   os: ubuntu-latest
 
 latest: &latest

diff --git a/onetl/strategy/incremental_strategy.py b/onetl/strategy/incremental_strategy.py
@@ -6,23 +6,11 @@
 
 from etl_entities.hwm import HWM
 
-from onetl.impl import BaseModel
 from onetl.strategy.batch_hwm_strategy import BatchHWMStrategy
 from onetl.strategy.hwm_strategy import HWMStrategy
 
 
-class OffsetMixin(BaseModel):
-    hwm: Optional[HWM] = None
-    offset: Any = None
-
-    def fetch_hwm(self) -> None:
-        super().fetch_hwm()
-
-        if self.hwm and self.hwm.value is not None and self.offset is not None:
-            self.hwm -= self.offset
-
-
-class IncrementalStrategy(OffsetMixin, HWMStrategy):
+class IncrementalStrategy(HWMStrategy):
     """Incremental strategy for :ref:`db-reader`/:ref:`file-downloader`.
 
     Used for fetching only new rows/files from a source
@@ -353,8 +341,17 @@ class IncrementalStrategy(OffsetMixin, HWMStrategy):
         # current run will download only files which were not downloaded in previous runs
     """
 
+    hwm: Optional[HWM] = None
+    offset: Any = None
+
+    def fetch_hwm(self) -> None:
+        super().fetch_hwm()
+
+        if self.hwm and self.hwm.value is not None and self.offset is not None:
+            self.hwm -= self.offset
 
-class IncrementalBatchStrategy(OffsetMixin, BatchHWMStrategy):
+
+class IncrementalBatchStrategy(BatchHWMStrategy):
     """Incremental batch strategy for :ref:`db-reader`.
 
     .. note::
@@ -669,6 +666,15 @@ class IncrementalBatchStrategy(OffsetMixin, BatchHWMStrategy):
 
     """
 
+    hwm: Optional[HWM] = None
+    offset: Any = None
+
+    def fetch_hwm(self) -> None:
+        super().fetch_hwm()
+
+        if self.hwm and self.hwm.value is not None and self.offset is not None:
+            self.hwm -= self.offset
+
     def __next__(self):
         self.save_hwm()
         return super().__next__()