fix #521: support develop mode

uqfoundation · Jul 2, 2022 · 3881a2b · 3881a2b
1 parent 4220929
commit 3881a2b
Show file tree

Hide file tree

Showing 31 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,8 +40,8 @@ install:
     - python -m pip install .
 
 script:
-    - for test in tests/__init__.py; do echo $test ; if [[ $COVERAGE == "true" ]]; then coverage run -a $test > /dev/null; else python $test > /dev/null; fi ; done
-    - for test in tests/test_*.py; do echo $test ; if [[ $COVERAGE == "true" ]]; then coverage run -a $test > /dev/null; else python $test > /dev/null; fi ; done
+    - for test in dill/tests/__init__.py; do echo $test ; if [[ $COVERAGE == "true" ]]; then coverage run -a $test > /dev/null; else python $test > /dev/null; fi ; done
+    - for test in dill/tests/test_*.py; do echo $test ; if [[ $COVERAGE == "true" ]]; then coverage run -a $test > /dev/null; else python $test > /dev/null; fi ; done
 
 after_success:
     - if [[ $COVERAGE == "true" ]]; then bash <(curl -s https://codecov.io/bash); else echo ''; fi

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,7 +4,6 @@ include MANIFEST.in
 include pyproject.toml
 include tox.ini
 include scripts/*
-include tests/*py
 recursive-include docs *
 include .*
 prune .git

diff --git a/tests/__init__.py → dill/tests/__init__.py b/tests/__init__.py → dill/tests/__init__.py
diff --git a/tests/__main__.py → dill/tests/__main__.py b/tests/__main__.py → dill/tests/__main__.py
diff --git a/tests/test_check.py → dill/tests/test_check.py b/tests/test_check.py → dill/tests/test_check.py
diff --git a/tests/test_classdef.py → dill/tests/test_classdef.py b/tests/test_classdef.py → dill/tests/test_classdef.py
diff --git a/tests/test_detect.py → dill/tests/test_detect.py b/tests/test_detect.py → dill/tests/test_detect.py
diff --git a/tests/test_dictviews.py → dill/tests/test_dictviews.py b/tests/test_dictviews.py → dill/tests/test_dictviews.py
diff --git a/tests/test_diff.py → dill/tests/test_diff.py b/tests/test_diff.py → dill/tests/test_diff.py
diff --git a/tests/test_extendpickle.py → dill/tests/test_extendpickle.py b/tests/test_extendpickle.py → dill/tests/test_extendpickle.py
diff --git a/tests/test_fglobals.py → dill/tests/test_fglobals.py b/tests/test_fglobals.py → dill/tests/test_fglobals.py
diff --git a/tests/test_file.py → dill/tests/test_file.py b/tests/test_file.py → dill/tests/test_file.py
diff --git a/tests/test_functions.py → dill/tests/test_functions.py b/tests/test_functions.py → dill/tests/test_functions.py
diff --git a/tests/test_functors.py → dill/tests/test_functors.py b/tests/test_functors.py → dill/tests/test_functors.py
diff --git a/tests/test_logger.py → dill/tests/test_logger.py b/tests/test_logger.py → dill/tests/test_logger.py
diff --git a/tests/test_mixins.py → dill/tests/test_mixins.py b/tests/test_mixins.py → dill/tests/test_mixins.py
diff --git a/tests/test_module.py → dill/tests/test_module.py b/tests/test_module.py → dill/tests/test_module.py
diff --git a/tests/test_moduledict.py → dill/tests/test_moduledict.py b/tests/test_moduledict.py → dill/tests/test_moduledict.py
diff --git a/tests/test_nested.py → dill/tests/test_nested.py b/tests/test_nested.py → dill/tests/test_nested.py
diff --git a/tests/test_objects.py → dill/tests/test_objects.py b/tests/test_objects.py → dill/tests/test_objects.py
diff --git a/tests/test_properties.py → dill/tests/test_properties.py b/tests/test_properties.py → dill/tests/test_properties.py
diff --git a/tests/test_pycapsule.py → dill/tests/test_pycapsule.py b/tests/test_pycapsule.py → dill/tests/test_pycapsule.py
diff --git a/tests/test_recursive.py → dill/tests/test_recursive.py b/tests/test_recursive.py → dill/tests/test_recursive.py
diff --git a/tests/test_restricted.py → dill/tests/test_restricted.py b/tests/test_restricted.py → dill/tests/test_restricted.py
diff --git a/tests/test_selected.py → dill/tests/test_selected.py b/tests/test_selected.py → dill/tests/test_selected.py
diff --git a/tests/test_session.py → dill/tests/test_session.py b/tests/test_session.py → dill/tests/test_session.py
diff --git a/tests/test_source.py → dill/tests/test_source.py b/tests/test_source.py → dill/tests/test_source.py
diff --git a/tests/test_temp.py → dill/tests/test_temp.py b/tests/test_temp.py → dill/tests/test_temp.py
diff --git a/tests/test_weakref.py → dill/tests/test_weakref.py b/tests/test_weakref.py → dill/tests/test_weakref.py
diff --git a/setup.py b/setup.py
@@ -97,7 +97,7 @@
         'Topic :: Software Development',
     ],
     packages = ['dill','dill.tests'],
-    package_dir = {'dill':'dill', 'dill.tests':'tests'},
+    package_dir = {'dill':'dill', 'dill.tests':'dill/tests'},
     scripts=['scripts/undill','scripts/get_objgraph'],
 )
 

diff --git a/tox.ini b/tox.ini
@@ -18,5 +18,5 @@ whitelist_externals =
     bash
 commands =
     {envpython} -m pip install .
-    bash -c "failed=0; for test in tests/__main__.py; do echo $test; \
+    bash -c "failed=0; for test in dill/tests/__main__.py; do echo $test; \
              {envpython} $test || failed=1; done; exit $failed"