Merge pull request #252 from mbrobbel/release-0.0.13

mbrobbel · web-flow · commit 2160d34b3602 · 2020-11-12T19:07:20.000+01:00
Release 0.0.13
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/codegen/cpp/fletchgen/CMakeLists.txt b/codegen/cpp/fletchgen/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-project(fletchgen VERSION 0.0.12 LANGUAGES CXX)
+project(fletchgen VERSION 0.0.13 LANGUAGES CXX)
 
 find_package(Arrow 1.0 CONFIG REQUIRED)
 
@@ -21,7 +21,7 @@ FetchContent_MakeAvailable(cmake-modules)
 
 FetchContent_Declare(cerata
     GIT_REPOSITORY  https://github.com/abs-tudelft/cerata.git
-    GIT_TAG         develop
+    GIT_TAG         0.0.11
 )
 FetchContent_GetProperties(cerata)
 if(NOT cerata_POPULATED)
diff --git a/codegen/python/setup.py b/codegen/python/setup.py
@@ -21,14 +21,18 @@
 from distutils.command.clean import clean as _clean
 from distutils.command.sdist import sdist as _sdist
 
-import os, platform, shutil
+import os
+import platform
+import shutil
 import numpy as np
 import pyarrow as pa
 
+
 def read(fname):
     with open(os.path.join(os.path.dirname(__file__), fname)) as f:
         return f.read()
 
+
 target_dir = os.getcwd() + "/build"
 output_dir = target_dir + "/install"
 include_dir = output_dir + "/include"
@@ -38,15 +42,18 @@ def read(fname):
 py_build_dir = py_target_dir + "/build"
 py_dist_dir = target_dir + "/dist"
 
+
 class clean(_clean):
     def run(self):
         _clean.run(self)
         try:
-            [os.remove('pyfletchgen/lib' + x) for x in ['.cpp', '.h', '_api.h']]
+            [os.remove('pyfletchgen/lib' + x)
+             for x in ['.cpp', '.h', '_api.h']]
         except:
             pass
         shutil.rmtree(target_dir)
 
+
 class build(_build):
     def initialize_options(self):
         _build.initialize_options(self)
@@ -63,37 +70,38 @@ def run(self):
             except ImportError:
                 # TODO: download cmake 3.14 and extract in build dir
                 raise ImportError('CMake or make not found')
-            cmake['../../cpp/fletchgen']\
-                 ['-DBUILD_FLETCHGEN_LIB=On']\
-                 ['-DBUILD_FLETCHGEN=Off']\
-                 ['-DCMAKE_BUILD_TYPE=Release']\
-                 ['-DCMAKE_INSTALL_PREFIX={}'.format(output_dir)] & FG
+            cmake['../../cpp/fletchgen']['-DBUILD_FLETCHGEN_LIB=On']['-DBUILD_FLETCHGEN=Off'][
+                '-DCMAKE_BUILD_TYPE=Release']['-DCMAKE_INSTALL_PREFIX={}'.format(output_dir)] & FG
             make['-j4'] & FG
             make['install'] & FG
         _build.run(self)
 
+
 class bdist(_bdist):
     def finalize_options(self):
         _bdist.finalize_options(self)
         self.dist_dir = py_dist_dir
 
+
 class sdist(_sdist):
     def finalize_options(self):
         _sdist.finalize_options(self)
         self.dist_dir = py_dist_dir
 
+
 class egg_info(_egg_info):
     def initialize_options(self):
         _egg_info.initialize_options(self)
         self.egg_base = py_target_dir
 
+
 setup(
     name="pyfletchgen",
-    version="0.0.12",
+    version="0.0.13",
     author="Accelerated Big Data Systems, Delft University of Technology",
     packages=find_packages(),
     url="https://github.com/abs-tudelft/fletcher",
-    project_urls = {
+    project_urls={
         "Bug Tracker": "https://github.com/abs-tudelft/fletcher/issues",
         "Documentation": "https://abs-tudelft.github.io/fletcher/",
         "Source Code": "https://github.com/abs-tudelft/fletcher/",
@@ -115,7 +123,7 @@ def initialize_options(self):
             extra_link_args=["-std=c++11"]
         )
     ],
-    entry_points = {'console_scripts': ['fletchgen=pyfletchgen:_run']},
+    entry_points={'console_scripts': ['fletchgen=pyfletchgen:_run']},
     install_requires=[
         'numpy >= 1.14',
         'pandas',
@@ -134,13 +142,13 @@ def initialize_options(self):
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: POSIX :: Linux"
     ],
-    cmdclass = {
+    cmdclass={
         'bdist': bdist,
         'build': build,
         'clean': clean,
         'egg_info': egg_info,
         'sdist': sdist,
     },
     license='Apache License, Version 2.0',
-    zip_safe = False,
+    zip_safe=False,
 )
diff --git a/runtime/cpp/CMakeLists.txt b/runtime/cpp/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-project(fletcher VERSION 0.0.12 LANGUAGES CXX)
+project(fletcher VERSION 0.0.13 LANGUAGES CXX)
 
 find_package(Arrow 1.0 CONFIG REQUIRED)
 
diff --git a/runtime/python/setup.py b/runtime/python/setup.py
@@ -21,14 +21,19 @@
 from distutils.command.clean import clean as _clean
 from distutils.command.sdist import sdist as _sdist
 
-import os, platform, shutil, glob
+import os
+import platform
+import shutil
+import glob
 import numpy as np
 import pyarrow as pa
 
+
 def read(fname):
     with open(os.path.join(os.path.dirname(__file__), fname)) as f:
         return f.read()
 
+
 target_dir = os.getcwd() + "/build"
 output_dir = target_dir + "/install"
 include_dir = output_dir + "/include"
@@ -38,6 +43,7 @@ def read(fname):
 py_build_dir = py_target_dir + "/build"
 py_dist_dir = target_dir + "/dist"
 
+
 class clean(_clean):
     def run(self):
         _clean.run(self)
@@ -47,6 +53,7 @@ def run(self):
             pass
         shutil.rmtree(target_dir)
 
+
 class build(_build):
     def initialize_options(self):
         _build.initialize_options(self)
@@ -63,40 +70,41 @@ def run(self):
             except ImportError:
                 # TODO: download cmake 3.14 and extract in build dir
                 raise ImportError('CMake or make not found')
-            cmake['../../..']\
-                 ['-DFLETCHER_BUILD_ECHO=ON']\
-                 ['-DCMAKE_BUILD_TYPE=Release']\
-                 ['-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0']\
-                 ['-DCMAKE_INSTALL_PREFIX={}'.format(output_dir)] & FG
+            cmake['../../..']['-DFLETCHER_BUILD_ECHO=ON']['-DCMAKE_BUILD_TYPE=Release'][
+                '-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0']['-DCMAKE_INSTALL_PREFIX={}'.format(output_dir)] & FG
             make['-j4'] & FG
             make['install'] & FG
         _build.run(self)
 
+
 class bdist(_bdist):
     def finalize_options(self):
         _bdist.finalize_options(self)
         self.dist_dir = py_dist_dir
 
+
 class sdist(_sdist):
     def finalize_options(self):
         _sdist.finalize_options(self)
         self.dist_dir = py_dist_dir
 
+
 class egg_info(_egg_info):
     def initialize_options(self):
         _egg_info.initialize_options(self)
         self.egg_base = os.path.relpath(py_target_dir)
 
+
 setup(
     name="pyfletcher",
-    version="0.0.12",
+    version="0.0.13",
     author="Accelerated Big Data Systems, Delft University of Technology",
     packages=find_packages(),
     description="A Python wrapper for the Fletcher runtime library",
     long_description=read('README.md'),
     long_description_content_type='text/markdown',
     url="https://github.com/abs-tudelft/fletcher",
-    project_urls = {
+    project_urls={
         "Bug Tracker": "https://github.com/abs-tudelft/fletcher/issues",
         "Documentation": "https://abs-tudelft.github.io/fletcher/",
         "Source Code": "https://github.com/abs-tudelft/fletcher/",
@@ -143,16 +151,17 @@ def initialize_options(self):
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: POSIX :: Linux"
     ],
-    cmdclass = {
+    cmdclass={
         'bdist': bdist,
         'build': build,
         'clean': clean,
         'egg_info': egg_info,
         'sdist': sdist,
     },
     license='Apache License, Version 2.0',
-    zip_safe = False,
-    data_files= [
-        ('lib', [output_dir + '/lib64/libfletcher_echo.so'] if 'AUDITWHEEL_PLAT' in os.environ else []),
+    zip_safe=False,
+    data_files=[
+        ('lib', [output_dir + '/lib64/libfletcher_echo.so']
+         if 'AUDITWHEEL_PLAT' in os.environ else []),
     ],
 )
