BLD: fix the sdist and manage the version in one place

Author: Joe Jevnik

MANIFEST.in

@@ -1,3 +1,11 @@
+include Makefile
+include etc/detect-compiler.cc
+include etc/build-and-run
+include etc/ext_suffix.py
+include etc/asan-path
+include etc/python-version.py
+include version
+
 include LICENSE
 include libpy/libpy.so
 include libpy/_build-and-run

Makefile

@@ -7,18 +7,21 @@ PYTHON ?= python
 PYTEST ?= pytest
 EXTRA_INCLUDE_DIRS ?=
 
-MAJOR_VERSION := 1
-MINOR_VERSION := 0
-MICRO_VERSION := 0
+CLANG_TIDY ?= clang-tidy
+CLANG_FORMAT ?= clang-format
+GTEST_BREAK ?= 1
+
+# not using $(file <version) because it was added in GNU Make 4.2 which is
+# newer that what is on macos and our github actions workers
+VERSION_PARTS := $(subst ., ,$(shell cat version))
+MAJOR_VERSION := $(word 1,$(VERSION_PARTS))
+MINOR_VERSION := $(word 2,$(VERSION_PARTS))
+MICRO_VERSION := $(word 3,$(VERSION_PARTS))
 
 PY_VERSION := $(shell $(PYTHON) etc/python_version.py)
 PY_MAJOR_VERSION := $(word 1,$(PY_VERSION))
 PY_MINOR_VERSION := $(word 2,$(PY_VERSION))
 
-CLANG_TIDY ?= clang-tidy
-CLANG_FORMAT ?= clang-format
-GTEST_BREAK ?= 1
-
 COMPILER := $(shell CXX=$(CXX) ./etc/build-and-run etc/detect-compiler.cc)
 ifeq ($(COMPILER),UNKNOWN)
 	$(warning Could not detect which compiler is being used, assuming gcc.)
@@ -49,7 +52,10 @@ BASE_CXXFLAGS = -std=gnu++17 -g -O$(OPTLEVEL) \
 	-fvisibility=hidden \
 	$(WARNINGS) \
 	-DPY_MAJOR_VERSION=$(PY_MAJOR_VERSION) \
-	-DPY_MINOR_VERSION=$(PY_MINOR_VERSION)
+	-DPY_MINOR_VERSION=$(PY_MINOR_VERSION) \
+	-DLIBPY_MAJOR_VERSION=$(MAJOR_VERSION) \
+	-DLIBPY_MINOR_VERSION=$(MINOR_VERSION) \
+	-DLIBPY_MICRO_VERSION=$(MICRO_VERSION)
 GCC_FLAGS = -fmax-errors=$(MAX_ERRORS)
 CLANG_FLAGS = -ferror-limit=$(MAX_ERRORS)
 CXXFLAGS = $(BASE_CXXFLAGS) $($(COMPILER)_FLAGS)
@@ -222,7 +228,7 @@ tests/%.o: tests/%.cc .make/all-flags
 
 $(TEST_MODULE): gtest.a $(TEST_OBJECTS) libpy/libpy.so
 	$(CXX) -shared -o $@ $(TEST_OBJECTS) gtest.a $(TEST_INCLUDE) \
-            	-Wl,-rpath,`pwd` -lpthread -L. $(SONAME) $(LDFLAGS)
+		-Wl,-rpath,`pwd` -lpthread -L. $(SONAME) $(LDFLAGS)
 
 gtest.o: $(GTEST_SRCS) .make/all-flags
 	$(CXX) $(filter-out $(WARNINGS),$(CXXFLAGS)) -I $(GTEST_DIR) \

include/libpy/abi.h

@@ -17,7 +17,9 @@ struct abi_version {
 LIBPY_EXPORT std::ostream& operator<<(std::ostream&, abi_version);
 
 namespace detail {
-constexpr abi_version header_libpy_abi_version{0, 2, 0};
+constexpr abi_version header_libpy_abi_version{LIBPY_MAJOR_VERSION,
+                                               LIBPY_MINOR_VERSION,
+                                               LIBPY_MICRO_VERSION};
 }  // namespace detail
 
 /** The version of the libpy shared object.

setup.py

@@ -30,19 +30,21 @@ class BuildFailed(Exception):
 setup(
     name='libpy',
     url='https://github.com/quantopian/libpy',
-    version='0.1.0',
+    version=open('version').read().strip(),
     author='Quantopian Inc.',
     author_email='[email protected]',
-    packages=find_packages(),
+    packages=['libpy'],
     license='Apache 2.0',
     classifiers=[
         'Development Status :: 4 - Beta',
         'License :: OSI Approved :: Apache Software License',
         'Natural Language :: English',
         'Topic :: Software Development',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: C++',
         'Operating System :: POSIX',

version

@@ -0,0 +1 @@
+0.2.0