Richcomp may be implemented by pyo3 v 0.20

nyx-space · Nov 17, 2023 · 3857594 · 3857594
1 parent 3235e59
commit 3857594
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -28,14 +28,17 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           args: --release --out dist --find-interpreter -F python
           sccache: 'true'
           manylinux: auto
+          before-script-linux: |
+            sudo apt-get update
+            sudo apt-get install -y libclang-dev
       - name: Upload wheels
         uses: actions/upload-artifact@v3
         with:
@@ -74,7 +77,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
           architecture: ${{ matrix.target }}
       - name: Build wheels
         uses: PyO3/maturin-action@v1
@@ -105,7 +108,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:

diff --git a/src/duration.rs b/src/duration.rs
@@ -729,18 +729,6 @@ impl Duration {
         *self == other
     }
 
-    #[cfg(feature = "python")]
-    fn __richcmp__(&self, other: Self, op: CompareOp) -> bool {
-        match op {
-            CompareOp::Lt => *self < other,
-            CompareOp::Le => *self <= other,
-            CompareOp::Eq => *self == other,
-            CompareOp::Ne => *self != other,
-            CompareOp::Gt => *self > other,
-            CompareOp::Ge => *self >= other,
-        }
-    }
-
     // Python constructors
 
     #[cfg(feature = "python")]

diff --git a/tests/python/test_epoch.py b/tests/python/test_epoch.py
@@ -1,4 +1,4 @@
-from hifitime import Epoch, TimeSeries, Unit
+from hifitime import Epoch, TimeSeries, Unit, Duration
 from datetime import datetime
 
 
@@ -44,3 +44,14 @@ def test_time_series():
         print(f"#{num}:\t{epoch}")
 
     assert num == 10
+
+def test_duration_eq():
+    """
+    Checks that Duration comparisons work
+    """
+
+    assert Unit.Second * 0.0 == Duration("0 ns")
+    assert Unit.Second * 1.0 >= Duration("0 ns")
+    assert Unit.Second * 1.0 > Duration("0 ns")
+    assert Duration("0 ns") <= Unit.Second * 1.0
+    assert Duration("0 ns") < Unit.Second * 1.0