Skip to content

Commit b1a2948

Browse files
partheagcf-owl-bot[bot]olavloite
authored
fix: move version module to django_spanner.version (#844)
* fix: move version module to * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Knut Olav Løite <[email protected]>
1 parent 9f7592d commit b1a2948

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

django_spanner/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from .functions import register_functions
2828
from .lookups import register_lookups
2929
from .utils import check_django_compatability
30+
from .version import __version__
3031

3132
# Monkey-patch google.DatetimeWithNanoseconds's __eq__ compare against
3233
# datetime.datetime.
@@ -47,8 +48,6 @@
4748
)
4849
from django.db.models import JSONField
4950

50-
__version__ = pkg_resources.get_distribution("django-google-spanner").version
51-
5251
USE_EMULATOR = os.getenv("SPANNER_EMULATOR_HOST") is not None
5352

5453
# Only active LTS django versions (3.2.*, 4.2.*) are supported by this library right now.
File renamed without changes.

setup.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import io
88
import os
9+
import re
910

1011
from setuptools import find_packages, setup
1112

@@ -27,16 +28,18 @@
2728
}
2829

2930
BASE_DIR = os.path.dirname(__file__)
30-
VERSION_FILENAME = os.path.join(BASE_DIR, "version.py")
31-
PACKAGE_INFO = {}
32-
with open(VERSION_FILENAME) as f:
33-
exec(f.read(), PACKAGE_INFO)
34-
version = PACKAGE_INFO["__version__"]
35-
36-
# Setup boilerplate below this line.
3731

3832
package_root = os.path.abspath(BASE_DIR)
3933

34+
version = None
35+
36+
with open(os.path.join(package_root, "django_spanner/version.py")) as fp:
37+
version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
38+
assert len(version_candidates) == 1
39+
version = version_candidates[0]
40+
41+
# Setup boilerplate below this line.
42+
4043
readme_filename = os.path.join(package_root, "README.rst")
4144
with io.open(readme_filename, encoding="utf-8") as readme_file:
4245
readme = readme_file.read()

0 commit comments

Comments
 (0)