Use VERSION file in pygribjump

ecmwf · Oct 18, 2024 · 5c52026 · 5c52026
1 parent 83dfc9d
commit 5c52026
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ CMakeFiles/
 CMakeCache.txt
 *.bak
 .vim
+*.egg-info
diff --git a/pygribjump/src/pygribjump/pygribjump.py b/pygribjump/src/pygribjump/pygribjump.py
@@ -16,7 +16,6 @@
 import numpy as np
 import cffi
 import os
-from pkg_resources import parse_version
 import findlibs
 
 ffi = cffi.FFI()
@@ -58,11 +57,8 @@ def __init__(self):
                 print("Error retrieving attribute", f, "from library")
 
         # Initialise the library, and set it up for python-appropriate behaviour
-
         self.gribjump_initialise()
 
-        # TODO <see pyfdb version checking here.>
-
     def __read_header(self, hdr_path):
         with open(hdr_path, 'r') as f:
             return f.read()

diff --git a/pygribjump/src/pygribjump/version.py b/pygribjump/src/pygribjump/version.py
diff --git a/setup.py b/setup.py
@@ -3,9 +3,8 @@
 
 from setuptools import find_packages, setup
 
-__version__ = re.search(
-    r'__version__\s*=\s*[\'"]([^\'"]*)[\'"]', io.open("pygribjump/src/pygribjump/version.py", encoding="utf_8_sig").read()
-).group(1)
+with open("VERSION", "r") as f:
+    __version__ = f.read().strip()
 
 setup(
     name="pygribjump",
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,4 @@ CMakeFiles/ @@
     CMakeCache.txt
     *.bak
     .vim
+    *.egg-info