Add build-native CI step

Author: Schamper

.github/workflows/dissect-ci.yml

@@ -10,9 +10,10 @@ on:
 
 jobs:
   ci:
-    uses: fox-it/dissect-workflow-templates/.github/workflows/dissect-ci-template.yml@main
+    uses: fox-it/dissect-workflow-templates/.github/workflows/dissect-ci-template.yml@build-native
     secrets: inherit
     with:
+      build-native: true
       run-benchmarks: true
 
   publish:
@@ -25,7 +26,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: packages
+          pattern: packages-*
           path: dist/
       # According to the documentation, it automatically looks inside the `dist/` folder for packages.
       - name: Publish package distributions to Pypi

dissect/util/ts.py

@@ -1,10 +1,15 @@
 from __future__ import annotations
 
 import struct
-import sys
 from datetime import datetime, timedelta, timezone
 
-if sys.platform in ("win32", "emscripten"):
+try:
+    datetime.fromtimestamp(-6969696969, tz=timezone.utc)
+
+    def _calculate_timestamp(ts: float) -> datetime:
+        """Calculate timestamps normally."""
+        return datetime.fromtimestamp(ts, tz=timezone.utc)
+except (OSError, OverflowError):
     _EPOCH = datetime(1970, 1, 1, tzinfo=timezone.utc)
 
     def _calculate_timestamp(ts: float) -> datetime:
@@ -16,12 +21,6 @@ def _calculate_timestamp(ts: float) -> datetime:
         """
         return _EPOCH + timedelta(seconds=ts)
 
-else:
-
-    def _calculate_timestamp(ts: float) -> datetime:
-        """Calculate timestamps normally."""
-        return datetime.fromtimestamp(ts, tz=timezone.utc)
-
 
 def now() -> datetime:
     """Return an aware datetime object of the current time in UTC."""

tests/conftest.py

@@ -3,17 +3,40 @@
 import pytest
 
 
+def pytest_addoption(parser: pytest.Parser) -> None:
+    parser.addoption(
+        "--force-native", action="store_true", default=False, help="run native tests, not allowing fallbacks"
+    )
+
+
 @pytest.fixture(scope="session", params=[True, False], ids=["native", "python"])
-def lz4(request: pytest.FixtureRequest) -> ModuleType:
+def _native(request: pytest.FixtureRequest, pytestconfig: pytest.Config) -> ModuleType:
     if request.param:
-        return pytest.importorskip("dissect.util._native", reason="_native module is unavailable").compression.lz4
+        try:
+            import dissect.util._native
+        except ImportError:
+            (pytest.fail if pytestconfig.getoption("--force-native") else pytest.skip)("_native module is unavailable")
+        else:
+            return dissect.util._native
 
-    return pytest.importorskip("dissect.util.compression.lz4")
+    return None
 
 
-@pytest.fixture(scope="session", params=[True, False], ids=["native", "python"])
-def lzo(request: pytest.FixtureRequest) -> ModuleType:
-    if request.param:
-        return pytest.importorskip("dissect.util._native", reason="_native module is unavailable").compression.lzo
+@pytest.fixture(scope="session")
+def lz4(_native: ModuleType) -> ModuleType:
+    if _native:
+        return _native.compression.lz4
+
+    import dissect.util.compression.lz4
+
+    return dissect.util.compression.lz4
+
+
+@pytest.fixture(scope="session")
+def lzo(_native: ModuleType) -> ModuleType:
+    if _native:
+        return _native.compression.lzo
+
+    import dissect.util.compression.lzo
 
-    return pytest.importorskip("dissect.util.compression.lzo")
+    return dissect.util.compression.lzo

tests/test_ts.py

@@ -1,18 +1,27 @@
-import platform
 from datetime import datetime, timedelta, timezone
 from importlib import reload
 from types import ModuleType
+from typing import NoReturn
 from unittest.mock import patch
 
 import pytest
 
 
-@pytest.fixture(params=["windows", "emscripten", "linux"])
+@pytest.fixture(params=[True, False])
 def imported_ts(request: pytest.FixtureRequest) -> ModuleType:
-    with patch.object(platform, "system", return_value=request.param):
-        from dissect.util import ts
+    from dissect.util import ts
+
+    if request.param:
+
+        class MockDatetime(datetime):
+            @classmethod
+            def fromtimestamp(cls, *args, **kwargs) -> NoReturn:
+                raise OverflowError("Mock overflow error")
 
-        return reload(ts)
+        with patch("datetime.datetime", MockDatetime):
+            return reload(ts)
+
+    return reload(ts)
 
 
 @pytest.fixture
@@ -32,32 +41,32 @@ def test_now(ts: ModuleType) -> None:
     assert ts_now.tzinfo == timezone.utc
 
 
-def test_unix_now(imported_ts: ModuleType) -> None:
-    timestamp = imported_ts.unix_now()
+def test_unix_now(ts: ModuleType) -> None:
+    timestamp = ts.unix_now()
 
     assert isinstance(timestamp, int)
     assert datetime.fromtimestamp(timestamp, tz=timezone.utc).microsecond == 0
 
 
-def test_unix_now_ms(imported_ts: ModuleType) -> None:
-    timestamp = imported_ts.unix_now_ms()
+def test_unix_now_ms(ts: ModuleType) -> None:
+    timestamp = ts.unix_now_ms()
 
     assert isinstance(timestamp, int)
-    assert imported_ts.from_unix_ms(timestamp).microsecond == (timestamp % 1e3) * 1000
+    assert ts.from_unix_ms(timestamp).microsecond == (timestamp % 1e3) * 1000
 
 
-def test_unix_now_us(imported_ts: ModuleType) -> None:
-    timestamp = imported_ts.unix_now_us()
+def test_unix_now_us(ts: ModuleType) -> None:
+    timestamp = ts.unix_now_us()
 
     assert isinstance(timestamp, int)
-    assert imported_ts.from_unix_us(timestamp).microsecond == timestamp % 1e6
+    assert ts.from_unix_us(timestamp).microsecond == timestamp % 1e6
 
 
-def test_unix_now_ns(imported_ts: ModuleType) -> None:
-    timestamp = imported_ts.unix_now_ns()
+def test_unix_now_ns(ts: ModuleType) -> None:
+    timestamp = ts.unix_now_ns()
 
     assert isinstance(timestamp, int)
-    assert imported_ts.from_unix_ns(timestamp).microsecond == int((timestamp // 1000) % 1e6)
+    assert ts.from_unix_ns(timestamp).microsecond == int((timestamp // 1000) % 1e6)
 
 
 def test_to_unix(ts: ModuleType) -> None:

tox.ini

@@ -17,7 +17,6 @@ deps =
 config_settings_build_wheel = --build-option=--py-limited-api=cp39
 
 [testenv]
-package = wheel
 deps =
     pytest
     pytest-cov
@@ -27,6 +26,13 @@ commands =
     coverage report
     coverage xml
 
+[testenv:native]
+package = wheel
+deps =
+    pytest
+commands =
+    pytest --basetemp="{envtmpdir}" --import-mode="append" --force-native {posargs:--color=yes -v tests}
+
 [testenv:benchmark]
 deps =
     pytest
@@ -35,7 +41,7 @@ deps =
 passenv =
     CODSPEED_ENV
 commands =
-    pytest --basetemp="{envtmpdir}" {posargs:--color=yes -v tests}
+    pytest --basetemp="{envtmpdir}" --import-mode="append" {posargs:--color=yes -v tests}
 
 [testenv:build]
 package = skip