move version calculation inside papermerge.core.__init__ module.

Author: ciur

papermerge/core/__init__.py

@@ -1,4 +1,7 @@
-from .utils import get_version
+import functools
+import os
+import subprocess
+from datetime import datetime
 
 default_app_config = 'papermerge.core.apps.CoreConfig'
 
@@ -9,4 +12,75 @@
 
 VERSION = (2, 0, 0, FINAL, 0)
 
+
+def get_version(version=None):
+    """Return a PEP 440-compliant version number from VERSION."""
+    version = get_complete_version(version)
+
+    # Now build the two parts of the version number:
+    # main = X.Y[.Z]
+    # sub = .devN - for pre-alpha releases
+    #     | {a|b|rc}N - for alpha, beta, and rc releases
+
+    main = get_main_version(version)
+
+    sub = ''
+    if version[3] == 'alpha' and version[4] == 0:
+        git_changeset = get_git_changeset()
+        if git_changeset:
+            sub = '.dev%s' % git_changeset
+
+    elif version[3] != 'final':
+        mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'rc'}
+        sub = mapping[version[3]] + str(version[4])
+
+    return main + sub
+
+
+def get_main_version(version=None):
+    """Return main version (X.Y[.Z]) from VERSION."""
+    version = get_complete_version(version)
+    parts = 2 if version[2] == 0 else 3
+    return '.'.join(str(x) for x in version[:parts])
+
+
+def get_complete_version(version=None):
+    """
+    Return a tuple of the django version. If version argument is non-empty,
+    check for correctness of the tuple provided.
+    """
+    if version is None:
+        from django import VERSION as version
+    else:
+        assert len(version) == 5
+        assert version[3] in ('alpha', 'beta', 'rc', 'final')
+
+    return version
+
+
+@functools.lru_cache()
+def get_git_changeset():
+    """Return a numeric identifier of the latest git changeset.
+
+    The result is the UTC timestamp of the changeset in YYYYMMDDHHMMSS format.
+    This value isn't guaranteed to be unique, but collisions are very unlikely,
+    so it's sufficient for generating the development version numbers.
+    """
+    repo_dir = os.path.dirname(
+        os.path.dirname(
+            os.path.dirname(os.path.abspath(__file__))
+        )
+    )
+    git_log = subprocess.run(
+        ['git', 'log', '--pretty=format:%ct', '--quiet', '-1', 'HEAD'],
+        stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=repo_dir,
+    )
+    timestamp = git_log.stdout
+    try:
+        timestamp = datetime.utcfromtimestamp(int(timestamp))
+    except ValueError:
+        return None
+    return timestamp.strftime('%Y%m%d%H%M%S')
+
+
 __version__ = get_version(VERSION)

papermerge/core/utils.py

@@ -1,6 +1,3 @@
-import functools
-import os
-import subprocess
 import time
 import logging
 import re
@@ -119,76 +116,6 @@ def __str__(self):
         return f"{self.total:.2f}"
 
 
-def get_version(version=None):
-    """Return a PEP 440-compliant version number from VERSION."""
-    version = get_complete_version(version)
-
-    # Now build the two parts of the version number:
-    # main = X.Y[.Z]
-    # sub = .devN - for pre-alpha releases
-    #     | {a|b|rc}N - for alpha, beta, and rc releases
-
-    main = get_main_version(version)
-
-    sub = ''
-    if version[3] == 'alpha' and version[4] == 0:
-        git_changeset = get_git_changeset()
-        if git_changeset:
-            sub = '.dev%s' % git_changeset
-
-    elif version[3] != 'final':
-        mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'rc'}
-        sub = mapping[version[3]] + str(version[4])
-
-    return main + sub
-
-
-def get_main_version(version=None):
-    """Return main version (X.Y[.Z]) from VERSION."""
-    version = get_complete_version(version)
-    parts = 2 if version[2] == 0 else 3
-    return '.'.join(str(x) for x in version[:parts])
-
-
-def get_complete_version(version=None):
-    """
-    Return a tuple of the django version. If version argument is non-empty,
-    check for correctness of the tuple provided.
-    """
-    if version is None:
-        from django import VERSION as version
-    else:
-        assert len(version) == 5
-        assert version[3] in ('alpha', 'beta', 'rc', 'final')
-
-    return version
-
-
-@functools.lru_cache()
-def get_git_changeset():
-    """Return a numeric identifier of the latest git changeset.
-
-    The result is the UTC timestamp of the changeset in YYYYMMDDHHMMSS format.
-    This value isn't guaranteed to be unique, but collisions are very unlikely,
-    so it's sufficient for generating the development version numbers.
-    """
-    repo_dir = os.path.dirname(
-        os.path.dirname(
-            os.path.dirname(os.path.abspath(__file__))
-        )
-    )
-    git_log = subprocess.run(
-        ['git', 'log', '--pretty=format:%ct', '--quiet', '-1', 'HEAD'],
-        stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=repo_dir,
-    )
-    timestamp = git_log.stdout
-    try:
-        timestamp = datetime.utcfromtimestamp(int(timestamp))
-    except ValueError:
-        return None
-    return timestamp.strftime('%Y%m%d%H%M%S')
-
-
 def filter_node_id(value):
     """Invalid values of node id will be
     filtered out (return None).