fixes

johanneskoester · johanneskoester · commit dbff081f706a · 2024-08-28T14:43:44.000+02:00
diff --git a/setup.py b/setup.py
@@ -1,15 +1,21 @@
 import os
+from pathlib import Path
 import sys
 
 from setuptools import setup
 
 # ensure the current directory is on sys.path so versioneer can be imported
 # when pip uses PEP 517/518 build rules.
 # https://github.com/python-versioneer/python-versioneer/issues/193
-sys.path.append(os.path.dirname(__file__))
 
+
+sys.path.append(str(Path(__file__).parent))
 import versioneer  # noqa: E402
-from snakemake.assets import Assets
+
+# import Assets, while avoiding that the rest of snakemake is imported here before
+# setup has been called.
+sys.path.append(str(Path(__file__).parent / "snakemake"))
+from assets import Assets
 
 # download online assets
 Assets.deploy()
diff --git a/snakemake/__init__.py b/snakemake/__init__.py
@@ -4,7 +4,13 @@
 __license__ = "MIT"
 
 import sys
-from snakemake.common import __version__, PIP_DEPLOYMENTS_PATH
+
+from snakemake._version import get_versions
+
+__version__ = get_versions()["version"]
+del get_versions
+
+PIP_DEPLOYMENTS_PATH = ".snakemake/pip-deployments"
 
 sys.path.append(PIP_DEPLOYMENTS_PATH)
 
diff --git a/snakemake/common/__init__.py b/snakemake/common/__init__.py
@@ -17,13 +17,9 @@
 import collections
 from pathlib import Path
 
-from snakemake._version import get_versions
-
+from snakemake import __version__
 from snakemake_interface_common.exceptions import WorkflowError
 
-__version__ = get_versions()["version"]
-del get_versions
-
 
 MIN_PY_VERSION = (3, 7)
 UUID_NAMESPACE = uuid.uuid5(uuid.NAMESPACE_URL, "https://snakemake.readthedocs.io")
@@ -46,7 +42,6 @@
         ),
     )
 )
-PIP_DEPLOYMENTS_PATH = ".snakemake/pip-deployments"
 
 
 def get_snakemake_searchpaths():
