From af0e0b5db2c035cc47a4adb23b6685c7b8229b06 Mon Sep 17 00:00:00 2001 From: Matheus Boni Vicari Date: Wed, 20 Feb 2019 11:42:49 +0000 Subject: [PATCH] V1.0.1 Added missing MANIFEST.in --- CHANGELOG.rst | 5 +++++ MANIFEST.in | 5 +++++ pc2graph/__init__.py | 6 +++--- pc2graph/downsampling.py | 2 +- pc2graph/examples/example_batch.py | 2 +- pc2graph/examples/example_plot_gif.py | 7 ++----- pc2graph/examples/example_single.py | 2 +- pc2graph/shortpath.py | 2 +- requirements.txt | 7 +++---- setup.py | 6 +++--- 10 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 MANIFEST.in diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c0c5a35..978b7ec 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,8 @@ +v1.0.1 +------ +- Fixed installation by adding MANIFEST.in to include requirements.txt. +- MANIFEST.in now also includes examples and test data. + v1.0 ---- - Generated setup files to install package. diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..6c30b43 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,5 @@ +include LICENSE README.rst CHANGELOG.rst contributors.txt requirements.txt +include data/point_cloud_example.txt +include data/output_point_cloud.txt +include data/test_gif/test.gif +include data/batch/files.txt diff --git a/pc2graph/__init__.py b/pc2graph/__init__.py index 555253c..eea28f5 100644 --- a/pc2graph/__init__.py +++ b/pc2graph/__init__.py @@ -19,7 +19,7 @@ __copyright__ = "Copyright 2018-2019" __credits__ = ["Matheus Boni Vicari"] __license__ = "GPL3" -__version__ = "1.0" +__version__ = "1.0.1" __maintainer__ = "Matheus Boni Vicari" __email__ = "matheus.boni.vicari@gmail.com" __status__ = "Development" @@ -27,6 +27,6 @@ __all__ = ['downsampling', 'shortpath'] -import downsampling -import shortpath +from downsampling import downsample_cloud, upsample_cloud +from shortpath import array_to_graph, extract_path_info diff --git a/pc2graph/downsampling.py b/pc2graph/downsampling.py index b7d21d7..acff5dc 100644 --- a/pc2graph/downsampling.py +++ b/pc2graph/downsampling.py @@ -19,7 +19,7 @@ __copyright__ = "Copyright 2018-2019" __credits__ = ["Matheus Boni Vicari"] __license__ = "GPL3" -__version__ = "1.0" +__version__ = "1.0.1" __maintainer__ = "Matheus Boni Vicari" __email__ = "matheus.boni.vicari@gmail.com" __status__ = "Development" diff --git a/pc2graph/examples/example_batch.py b/pc2graph/examples/example_batch.py index 1a75dad..ecd58a9 100644 --- a/pc2graph/examples/example_batch.py +++ b/pc2graph/examples/example_batch.py @@ -19,7 +19,7 @@ __copyright__ = "Copyright 2018-2019" __credits__ = ["Matheus Boni Vicari"] __license__ = "GPL3" -__version__ = "1.0" +__version__ = "1.0.1" __maintainer__ = "Matheus Boni Vicari" __email__ = "matheus.boni.vicari@gmail.com" __status__ = "Development" diff --git a/pc2graph/examples/example_plot_gif.py b/pc2graph/examples/example_plot_gif.py index daaa3a4..c27afea 100644 --- a/pc2graph/examples/example_plot_gif.py +++ b/pc2graph/examples/example_plot_gif.py @@ -19,7 +19,7 @@ __copyright__ = "Copyright 2018-2019" __credits__ = ["Matheus Boni Vicari"] __license__ = "GPL3" -__version__ = "1.0" +__version__ = "1.0.1" __maintainer__ = "Matheus Boni Vicari" __email__ = "matheus.boni.vicari@gmail.com" __status__ = "Development" @@ -30,9 +30,6 @@ import glob import os - - - if __name__ == '__main__': try: @@ -96,4 +93,4 @@ except: print('Mayavi not installed, this example cannot run!') - \ No newline at end of file + diff --git a/pc2graph/examples/example_single.py b/pc2graph/examples/example_single.py index 0adf33c..74a8ce1 100644 --- a/pc2graph/examples/example_single.py +++ b/pc2graph/examples/example_single.py @@ -19,7 +19,7 @@ __copyright__ = "Copyright 2018-2019" __credits__ = ["Matheus Boni Vicari"] __license__ = "GPL3" -__version__ = "1.0" +__version__ = "1.0.1" __maintainer__ = "Matheus Boni Vicari" __email__ = "matheus.boni.vicari@gmail.com" __status__ = "Development" diff --git a/pc2graph/shortpath.py b/pc2graph/shortpath.py index 2474f2a..f867852 100644 --- a/pc2graph/shortpath.py +++ b/pc2graph/shortpath.py @@ -19,7 +19,7 @@ __copyright__ = "Copyright 2018-2019" __credits__ = ["Matheus Boni Vicari"] __license__ = "GPL3" -__version__ = "1.0" +__version__ = "1.0.1" __maintainer__ = "Matheus Boni Vicari" __email__ = "matheus.boni.vicari@gmail.com" __status__ = "Development" diff --git a/requirements.txt b/requirements.txt index f974178..119a2bd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -numpy >= 1.11.3 -scikit-learn >= 0.19.1 -networkx >= 1.11 -sys \ No newline at end of file +numpy>=1.11.3 +scikit-learn>=0.19.1 +networkx>=1.11 diff --git a/setup.py b/setup.py index a787300..bd80202 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ __copyright__ = "Copyright 2018-2019, pc2graph" __credits__ = ["Matheus Boni Vicari"] __license__ = "GPL3" -__version__ = "1.0" +__version__ = "1.0.1" __maintainer__ = "Matheus Boni Vicari" __email__ = "matheus.boni.vicari@gmail.com" __status__ = "Development" @@ -32,12 +32,12 @@ def readme(): with open('README.rst') as f: return f.read() -with open('requirements.txt') as f: +with open('requirements.txt', 'r') as f: required = f.read().splitlines() setup( name="pc2graph", - version="1.0", + version="1.0.1", author='Matheus Boni Vicari', author_email='matheus.boni.vicari@gmail.com', packages=find_packages(),