From 1e07464976c5d6cdeb683d637ae70f1f8153547c Mon Sep 17 00:00:00 2001 From: Jonas Haag Date: Sat, 12 Mar 2022 22:15:42 +0100 Subject: [PATCH] Fix #46: Add __version__ --- src/snappy/__init__.py | 20 +++++++++++--------- src/snappy/snappymodule.cc | 5 ----- test_snappy.py | 9 +++++++++ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/snappy/__init__.py b/src/snappy/__init__.py index ad444e7..d502af9 100644 --- a/src/snappy/__init__.py +++ b/src/snappy/__init__.py @@ -1,18 +1,20 @@ from __future__ import absolute_import from .snappy import ( - compress, - decompress, - uncompress, - stream_compress, - stream_decompress, - StreamCompressor, - StreamDecompressor, - UncompressError, - isValidCompressed, + compress, + decompress, + uncompress, + stream_compress, + stream_decompress, + StreamCompressor, + StreamDecompressor, + UncompressError, + isValidCompressed, ) from .hadoop_snappy import ( stream_compress as hadoop_stream_compress, stream_decompress as hadoop_stream_decompress, ) + +__version__ = '0.6.1' diff --git a/src/snappy/snappymodule.cc b/src/snappy/snappymodule.cc index 5319ace..5847ab1 100644 --- a/src/snappy/snappymodule.cc +++ b/src/snappy/snappymodule.cc @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "crc32c.h" -#define MODULE_VERSION "0.4.1" #define RESIZE_TOLERATION 0.75 struct module_state { @@ -306,10 +305,6 @@ init_snappy(void) SnappyInvalidCompressedInputError); PyModule_AddObject(m, "CompressedLengthError", SnappyCompressedLengthError); - /* Version = MODULE_VERSION */ - if (PyModule_AddStringConstant(m, "__version__", MODULE_VERSION)) - INITERROR; - #if PY_MAJOR_VERSION >= 3 return m; #endif diff --git a/test_snappy.py b/test_snappy.py index e198b52..4c943e7 100644 --- a/test_snappy.py +++ b/test_snappy.py @@ -35,6 +35,15 @@ from unittest import TestCase +class SnappyModuleTest(TestCase): + def test_version(self): + assert tuple(map(int, snappy.__version__.split("."))) >= (0, 6, 1) + # Make sure that __version__ is identical to the version defined in setup.py + with open(os.path.join(os.path.dirname(__file__), "setup.py")) as f: + version_line, = (l for l in f.read().splitlines() if l.startswith("version")) + assert version_line.split("=")[1].strip(" '\"") == snappy.__version__ + + class SnappyCompressionTest(TestCase): def test_simple_compress(self): text = "hello world!".encode('utf-8')