From 35dde80b79e8d60d80bd2921ee046f5185a498e8 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 31 Jan 2020 17:12:44 +0100 Subject: Move version.py --- MANIFEST.in | 1 - ishtar_common/serializers_utils.py | 2 +- ishtar_common/version.py | 10 +++++++++- setup.py | 2 +- version.py | 9 --------- 5 files changed, 11 insertions(+), 13 deletions(-) mode change 120000 => 100644 ishtar_common/version.py delete mode 100644 version.py diff --git a/MANIFEST.in b/MANIFEST.in index 214e1601c..48c63af71 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,7 +8,6 @@ recursive-include install * recursive-include pot * include README.md recursive-include scripts * -include version.py recursive-include ishtar_common/static * recursive-include ishtar_common/templates * recursive-include archaeological_files/templates * diff --git a/ishtar_common/serializers_utils.py b/ishtar_common/serializers_utils.py index e3b132ae0..74ffbe176 100644 --- a/ishtar_common/serializers_utils.py +++ b/ishtar_common/serializers_utils.py @@ -10,7 +10,7 @@ from zipfile import ZipFile from django.contrib.sites.models import Site from django.core.serializers import serialize -from version import get_version +from ishtar_common.version import get_version from . import models diff --git a/ishtar_common/version.py b/ishtar_common/version.py deleted file mode 120000 index a508b60d3..000000000 --- a/ishtar_common/version.py +++ /dev/null @@ -1 +0,0 @@ -../version.py \ No newline at end of file diff --git a/ishtar_common/version.py b/ishtar_common/version.py new file mode 100644 index 000000000..190e0d575 --- /dev/null +++ b/ishtar_common/version.py @@ -0,0 +1,9 @@ +# 3.0.3 +VERSION = (3, 0, 3) + + +def get_version(): + return u'.'.join((str(num) for num in VERSION)) + + +__version__ = get_version() diff --git a/setup.py b/setup.py index 66121e1ef..f197aea0a 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import os from setuptools import setup # , find_packages -import version +from ishtar_common import version try: reqs = open(os.path.join(os.path.dirname(__file__), diff --git a/version.py b/version.py deleted file mode 100644 index 190e0d575..000000000 --- a/version.py +++ /dev/null @@ -1,9 +0,0 @@ -# 3.0.3 -VERSION = (3, 0, 3) - - -def get_version(): - return u'.'.join((str(num) for num in VERSION)) - - -__version__ = get_version() -- cgit v1.2.3