summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-01-31 17:12:44 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2020-07-01 18:02:28 +0200
commit35dde80b79e8d60d80bd2921ee046f5185a498e8 (patch)
tree287e9db8634cae3e155d752a2a311aefc3bd0159
parent8481e06e8e809a90ae19f8bfeb2153080793d2de (diff)
downloadIshtar-35dde80b79e8d60d80bd2921ee046f5185a498e8.tar.bz2
Ishtar-35dde80b79e8d60d80bd2921ee046f5185a498e8.zip
Move version.py
-rw-r--r--MANIFEST.in1
-rw-r--r--ishtar_common/serializers_utils.py2
-rw-r--r--[l---------]ishtar_common/version.py10
-rw-r--r--setup.py2
-rw-r--r--version.py9
5 files changed, 11 insertions, 13 deletions
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
index a508b60d3..190e0d575 120000..100644
--- a/ishtar_common/version.py
+++ b/ishtar_common/version.py
@@ -1 +1,9 @@
-../version.py \ No newline at end of file
+# 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()