From 5e6c468a2adaaffefa634d55788c8e6fcdead5ac Mon Sep 17 00:00:00 2001 From: adelosa Date: Mon, 3 Oct 2016 15:54:20 +1000 Subject: [PATCH 1/3] Fix warning with MANIFEST.in for param file. Added directory. --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 491f4fe..d74c450 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -10,6 +10,6 @@ recursive-exclude * *.py[co] recursive-include docs *.rst conf.py Makefile make.bat -recursive-include *.yml +recursive-include mciutil *.yml include versioneer.py include mciutil/_version.py From 4b193e59a53717c80c6835374048ba71c5bfa208 Mon Sep 17 00:00:00 2001 From: adelosa Date: Mon, 3 Oct 2016 15:56:38 +1000 Subject: [PATCH 2/3] Check that mideu package config exists (assumes that home and current dir do not have config present) --- tests/test_cli_common.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tests/test_cli_common.py diff --git a/tests/test_cli_common.py b/tests/test_cli_common.py new file mode 100644 index 0000000..7a8dfa4 --- /dev/null +++ b/tests/test_cli_common.py @@ -0,0 +1,19 @@ +from __future__ import absolute_import +import unittest +import os + +from mciutil.cli.common import get_config_filename + + +class CliCommonTests(unittest.TestCase): + def test_get_config_filename(self): + """ + check that package default config exists, otherwise fail + this will show up on remote build when package is installed + rather than pointing to development environment + """ + filename = get_config_filename('mideu.yml') + self.assertTrue(os.path.exists(filename)) + +if __name__ == '__main__': + unittest.main() From c509ac53036ec04bf2840076ea93319c74a33a13 Mon Sep 17 00:00:00 2001 From: adelosa Date: Mon, 3 Oct 2016 19:42:17 +1000 Subject: [PATCH 3/3] Additional check if not a git repo - check that folder contains "site-packages", meaning that the package has the mideu file. --- tests/test_cli_common.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/test_cli_common.py b/tests/test_cli_common.py index 7a8dfa4..8873c7c 100644 --- a/tests/test_cli_common.py +++ b/tests/test_cli_common.py @@ -15,5 +15,10 @@ def test_get_config_filename(self): filename = get_config_filename('mideu.yml') self.assertTrue(os.path.exists(filename)) + print("config filename={0}".format(filename)) + if not os.path.isdir(".git"): + print("Checking that config from site-packages") + self.assertNotEqual(filename.find("site-packages"), -1) + if __name__ == '__main__': unittest.main()