summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorROUVREAU Vincent <vincent.rouvreau@inria.fr>2020-05-31 10:36:47 +0200
committerROUVREAU Vincent <vincent.rouvreau@inria.fr>2020-05-31 10:36:47 +0200
commit433a8cdaa111ebb777450fc1ee2e316480e4b46a (patch)
tree4278495a708ec60a4f8097459ea1f43cb5954e34
parentbe25848cb28a4f7bde1d21afef1bbb6fe0ba4a5b (diff)
Add introduction to pypi description and new release version
-rw-r--r--CMakeGUDHIVersion.txt2
-rw-r--r--src/python/CMakeLists.txt3
-rw-r--r--src/python/setup.py.in14
3 files changed, 14 insertions, 5 deletions
diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt
index 59226274..3d8be42d 100644
--- a/CMakeGUDHIVersion.txt
+++ b/CMakeGUDHIVersion.txt
@@ -1,6 +1,6 @@
set (GUDHI_MAJOR_VERSION 3)
set (GUDHI_MINOR_VERSION 2)
-set (GUDHI_PATCH_VERSION 0a0)
+set (GUDHI_PATCH_VERSION 0a1)
set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION})
message(STATUS "GUDHI version : ${GUDHI_VERSION}")
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index ab08cd6d..d4cb7477 100644
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -235,6 +235,9 @@ if(PYTHONINTERP_FOUND)
file(COPY "gudhi/point_cloud" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi")
file(COPY "gudhi/weighted_rips_complex.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi")
+ # Other .py files
+ file(COPY "introduction.md" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+
add_custom_command(
OUTPUT gudhi.so
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/python/setup.py.in b/src/python/setup.py.in
index 55d2b604..ff000a2c 100644
--- a/src/python/setup.py.in
+++ b/src/python/setup.py.in
@@ -13,6 +13,7 @@ from Cython.Build import cythonize
from numpy import get_include as numpy_get_include
import sys
import pybind11
+from os import path
__author__ = "Vincent Rouvreau"
__copyright__ = "Copyright (C) 2016 Inria"
@@ -62,6 +63,11 @@ for module in pybind11_modules:
runtime_library_dirs=runtime_library_dirs,
))
+# read the contents of introduction.md
+this_directory = path.abspath(path.dirname(__file__))
+with open(path.join(this_directory, 'introduction.md'), encoding='utf-8') as f:
+ long_description = f.read()
+
setup(
name = 'gudhi',
packages=find_packages(), # find_namespace_packages(include=["gudhi*"])
@@ -75,10 +81,10 @@ setup(
'Source Code': 'https://github.com/GUDHI/gudhi-devel',
'License': 'https://gudhi.inria.fr/licensing/'
},
- description='The Gudhi library is an open source library for Computational Topology and Topological Data ' \
- 'Analysis (TDA). It offers state-of-the-art algorithms to construct various types of simplicial complexes, ' \
- 'data structures to represent them, and algorithms to compute geometric approximations of shapes and ' \
- 'persistent homology.',
+ description='The Gudhi library is an open source library for ' \
+ 'Computational Topology and Topological Data Analysis (TDA).',
+ long_description=long_description,
+ long_description_content_type='text/markdown',
ext_modules = ext_modules,
install_requires = ['cython','numpy >= 1.9',],
setup_requires = ['numpy >= 1.9','pybind11',],