Merge pull request #75 from azmeuk/new-macos

bump to libfaketime 0.9.10

.github/workflows/tests.yaml

@@ -6,11 +6,16 @@ on:
 
 jobs:
   tests:
-    name: ${{ matrix.python }}
-    runs-on: ubuntu-latest
+    name: ${{ matrix.os }} - python${{ matrix.python }} - ${{ matrix.tz }}
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - ubuntu-22.04
+          - macos-14
+          - macos-13
+          - macos-12
         python:
           - '3.12'
           - '3.11'
@@ -21,15 +26,18 @@ jobs:
           - 'utc'
           - 'cest'
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: pip|${{ hashFiles('setup.py') }}|${{ hashFiles('setup.cfg') }}
       - run: pip install tox
-      - run: git submodule update --init
+      - run: git submodule update --init --force
+      - run: env FAKETIME_COMPILE_CFLAGS="-UFAKE_STAT -UFAKE_UTIME -UFAKE_SLEEP" make -C libfaketime/vendor/libfaketime
+        if: runner.os == 'Linux'
       - run: make -C libfaketime/vendor/libfaketime
-      - run: tox -e ${{ matrix.python }}-${{ matrix.tz }}
+        if: runner.os == 'macOS'
+      - run: tox -e ${{ matrix.python }}-${{ matrix.tz }} --recreate

.gitmodules

@@ -1,8 +1,4 @@
 [submodule "vendor/libfaketime"]
 	path = libfaketime/vendor/libfaketime
-	url = https://github.com/simon-weber/libfaketime.git
+	url = https://github.com/wolfcw/libfaketime.git
 	branch = python-libfaketime
-[submodule "vendor/libfaketime-pre_sierra"]
-	path = libfaketime/vendor/libfaketime-pre_sierra
-	url = https://github.com/simon-weber/libfaketime.git
-	branch = python-libfaketime-pre_sierra

MANIFEST.in

@@ -5,8 +5,3 @@ include libfaketime/vendor/libfaketime/src/Makefile
 include libfaketime/vendor/libfaketime/src/Makefile.OSX
 include libfaketime/vendor/libfaketime/COPYING
 recursive-include libfaketime/vendor/libfaketime/src *.c *.h *.map
-include libfaketime/vendor/libfaketime-pre_sierra/Makefile
-include libfaketime/vendor/libfaketime-pre_sierra/src/Makefile
-include libfaketime/vendor/libfaketime-pre_sierra/src/Makefile.OSX
-include libfaketime/vendor/libfaketime-pre_sierra/COPYING
-recursive-include libfaketime/vendor/libfaketime-pre_sierra/src *.c *.h *.map

README.md

@@ -147,6 +147,7 @@ In some cases - especially when your tests start other processes - re-execing ca
 $ python-libfaketime
 export LD_PRELOAD="/home/foo/<snip>/vendor/libfaketime/src/libfaketime.so.1"
 export DONT_FAKE_MONOTONIC="1"
+export FAKETIME_NO_CACHE="1"
 export FAKETIME_DID_REEXEC=true
 ```
 
@@ -163,7 +164,11 @@ Contributing and testing
 Contributions are welcome! You should compile libfaketime before running tests:
 
 ```bash
-make -C libfaketime/vendor/libfaketime
+git submodule init --update
+# For Linux:
+env FAKETIME_COMPILE_CFLAGS="-UFAKE_STAT -UFAKE_UTIME -UFAKE_SLEEP" make -C libfaketime/vendor/libfaketime
+# For macOS
+env make -C libfaketime/vendor/libfaketime
 ```
 
 Then you can install requirements with ``pip install -r requirements.txt`` and use ``pytest`` and ``tox`` to run the tests.

libfaketime/__init__.py

@@ -6,7 +6,6 @@
 import functools
 import inspect
 import os
-import platform
 import sys
 import threading
 import time
@@ -21,24 +20,17 @@
     basestring = (str, bytes)
 
 
-SIERRA_VERSION_TUPLE = (10, 12)
 
 # When using reexec_if_needed, remove_vars=True and a test loader that purges sys.modules
 # (like nose), it can be tough to run reexec_if_needed only once.
 # This env var is set by reexec to ensure we don't reload more than once.
 
 _DID_REEXEC_VAR = 'FAKETIME_DID_REEXEC'
-
+_FAKETIME_FMT = '%Y-%m-%d %T.%f'
 
 def _get_lib_path():
     vendor_dir = 'libfaketime'
 
-    if sys.platform == "darwin":
-        version_tuple = tuple(int(x) for x in platform.mac_ver()[0].split('.'))
-        pre_sierra = version_tuple < SIERRA_VERSION_TUPLE
-        if pre_sierra:
-            vendor_dir = 'libfaketime-pre_sierra'
-
     return os.path.join(
         os.path.dirname(__file__),
         os.path.join('vendor', vendor_dir, 'src'))
@@ -71,10 +63,12 @@ def _setup_ld_preload(soname):
 _other_additions = {
     'linux': {
         'DONT_FAKE_MONOTONIC': '1',
+        'FAKETIME_NO_CACHE': '1',
     },
     'darwi': {
         'DONT_FAKE_MONOTONIC': '1',
         'DYLD_FORCE_FLAT_NAMESPACE': '1',
+        'FAKETIME_NO_CACHE': '1',
     },
 }
 
@@ -168,7 +162,7 @@ def _should_patch_uuid(self):
         return None
 
     def _format_datetime(self, _datetime):
-        return _datetime.strftime('%Y-%m-%d %T %f')
+        return _datetime.strftime(_FAKETIME_FMT)
 
     def tick(self, delta=datetime.timedelta(seconds=1)):
         self.time_to_freeze += delta
@@ -179,11 +173,13 @@ def __enter__(self):
             begin_callback(self)
             self._prev_spec = os.environ.get('FAKETIME')
             self._prev_tz = os.environ.get('TZ')
+            self._prev_fmt = os.environ.get('FAKETIME_FMT')
 
             os.environ['TZ'] = self.timezone_str
 
             time.tzset()
             os.environ['FAKETIME'] = self._format_datetime(self.time_to_freeze)
+            os.environ['FAKETIME_FMT'] = _FAKETIME_FMT
 
         func_name = self._should_patch_uuid()
         if func_name:
@@ -208,7 +204,13 @@ def __exit__(self, *exc):
                 os.environ['FAKETIME'] = self._prev_spec
             else:
                 del os.environ['FAKETIME']
-                end_callback(self)
+
+            if self._prev_fmt is not None:
+                os.environ['FAKETIME_FMT'] = self._prev_spec
+            else:
+                del os.environ['FAKETIME_FMT']
+
+            end_callback(self)
 
         return False
 

setup.py

@@ -1,19 +1,13 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 import os
-import platform
 import re
 from setuptools import setup, find_packages
 from setuptools.command.install import install
 import subprocess
 import sys
 
 
-# libfaketime broke compatibility with osx before sierra.
-# We keep a separate submodule for each and choose between them dynamically.
-SIERRA_VERSION_TUPLE = (10, 12)
-
 # This hack is from http://stackoverflow.com/a/7071358/1231454;
 # the version is kept in a seperate file and gets parsed - this
 # way, setup.py doesn't have to import the package.
@@ -35,13 +29,6 @@
 elif sys.platform == "darwin":
     libname = 'libfaketime.1.dylib'
 
-    version_tuple = tuple(int(x) for x in platform.mac_ver()[0].split('.'))
-    pre_sierra = version_tuple < SIERRA_VERSION_TUPLE
-    if pre_sierra:
-        _vendor_path = 'libfaketime/vendor/libfaketime-pre_sierra'
-
-    print("OSX version is %s-sierra: %r" % ('pre' if pre_sierra else 'post', version_tuple))
-
 else:
     raise RuntimeError("libfaketime does not support platform %s" % sys.platform)
 
@@ -51,7 +38,10 @@
 class CustomInstall(install):
     def run(self):
         self.my_outputs = []
-        subprocess.check_call(['make', '-C', _vendor_path])
+        if sys.platform in ("linux", "linux2"):
+            subprocess.check_call(['env', 'FAKETIME_COMPILE_CFLAGS=-UFAKE_STAT -UFAKE_UTIME -UFAKE_SLEEP', 'make', '-C', _vendor_path])
+        elif sys.platform == "darwin":
+            subprocess.check_call(['make', '-C', _vendor_path])
 
         dest = os.path.join(self.install_purelib, os.path.dirname(faketime_lib))
         try: