From 3eb87025ba4d46dba5723d71b87f83678529abdb Mon Sep 17 00:00:00 2001
From: GD <gd.dev@libertymail.net>
Date: Wed, 9 Mar 2022 10:23:12 +0100
Subject: [PATCH] re-include test and data files in the installation following
setuptools recommandation (c.f.
https://setuptools.pypa.io/en/latest/userguide/datafiles.html)
---
MANIFEST.in | 4 ++--
README.md | 4 ++--
setup.py | 3 +++
{data => spams/data}/boat.png | Bin
{data => spams/data}/lena.png | Bin
{tests => spams/tests}/test_decomp.py | 0
{tests => spams/tests}/test_dictLearn.py | 0
{tests => spams/tests}/test_linalg.py | 0
{tests => spams/tests}/test_prox.py | 0
{tests => spams/tests}/test_spams.py | 0
{tests => spams/tests}/test_utils.py | 0
11 files changed, 7 insertions(+), 4 deletions(-)
rename {data => spams/data}/boat.png (100%)
rename {data => spams/data}/lena.png (100%)
rename {tests => spams/tests}/test_decomp.py (100%)
rename {tests => spams/tests}/test_dictLearn.py (100%)
rename {tests => spams/tests}/test_linalg.py (100%)
rename {tests => spams/tests}/test_prox.py (100%)
rename {tests => spams/tests}/test_spams.py (100%)
rename {tests => spams/tests}/test_utils.py (100%)
diff --git a/MANIFEST.in b/MANIFEST.in
index 944ebba..6eb3dd9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,6 +5,6 @@ include version
recursive-include spams_wrap *.h
recursive-include spams_wrap *.cpp
-recursive-include tests *.py
-recursive-include data *.png
+recursive-include spams/tests *.py
+recursive-include spams/data *.png
recursive-include doc *
diff --git a/README.md b/README.md
index a04c1b8..ca55eac 100644
--- a/README.md
+++ b/README.md
@@ -50,8 +50,8 @@ Manipulated objects are imported from numpy and scipy. Matrices should be stored
### Testing the interface
```bash
-python tests/test_spams.py -h # to get help
-python tests/test_spams.py # will run all the tests
+python spams/tests/test_spams.py -h # to get help
+python spams/tests/test_spams.py # will run all the tests
```
---
diff --git a/setup.py b/setup.py
index 6c96b2a..9c2991f 100644
--- a/setup.py
+++ b/setup.py
@@ -196,6 +196,9 @@ opts = dict(
packages=find_packages(),
cmdclass={'build_ext': CustomBuildExtCommand},
ext_modules=get_extension(),
+ package_data={
+ "spams": ["data/*.png", "tests/*.py"]
+ },
zip_safe=True
)
diff --git a/data/boat.png b/spams/data/boat.png
similarity index 100%
rename from data/boat.png
rename to spams/data/boat.png
diff --git a/data/lena.png b/spams/data/lena.png
similarity index 100%
rename from data/lena.png
rename to spams/data/lena.png
diff --git a/tests/test_decomp.py b/spams/tests/test_decomp.py
similarity index 100%
rename from tests/test_decomp.py
rename to spams/tests/test_decomp.py
diff --git a/tests/test_dictLearn.py b/spams/tests/test_dictLearn.py
similarity index 100%
rename from tests/test_dictLearn.py
rename to spams/tests/test_dictLearn.py
diff --git a/tests/test_linalg.py b/spams/tests/test_linalg.py
similarity index 100%
rename from tests/test_linalg.py
rename to spams/tests/test_linalg.py
diff --git a/tests/test_prox.py b/spams/tests/test_prox.py
similarity index 100%
rename from tests/test_prox.py
rename to spams/tests/test_prox.py
diff --git a/tests/test_spams.py b/spams/tests/test_spams.py
similarity index 100%
rename from tests/test_spams.py
rename to spams/tests/test_spams.py
diff --git a/tests/test_utils.py b/spams/tests/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to spams/tests/test_utils.py
--
GitLab