From 785297cf48fff620bcce7edbf95b9c6f41131570 Mon Sep 17 00:00:00 2001 From: Adam Theisen Date: Wed, 14 Apr 2021 17:05:19 -0500 Subject: [PATCH 1/5] ENH: Update for conda errors --- act/tests/test_io.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act/tests/test_io.py b/act/tests/test_io.py index 18a9ae3596..e9a0ecf1df 100644 --- a/act/tests/test_io.py +++ b/act/tests/test_io.py @@ -46,7 +46,7 @@ def test_io_csv(): anl_ds.close() files = glob.glob(act.tests.EXAMPLE_MET_CSV) - obj = act.io.csvfiles.read_csv(files[0]) + obj = act.io.csvfiles.read_csv(files) assert 'date_time' in obj assert '_datastream' in obj.attrs From b57c6bdbb3e2b1c99b5d41616e20356e573a2f00 Mon Sep 17 00:00:00 2001 From: Adam Theisen Date: Wed, 14 Apr 2021 17:58:22 -0500 Subject: [PATCH 2/5] ENH: Changing back --- act/tests/test_io.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act/tests/test_io.py b/act/tests/test_io.py index e9a0ecf1df..18a9ae3596 100644 --- a/act/tests/test_io.py +++ b/act/tests/test_io.py @@ -46,7 +46,7 @@ def test_io_csv(): anl_ds.close() files = glob.glob(act.tests.EXAMPLE_MET_CSV) - obj = act.io.csvfiles.read_csv(files) + obj = act.io.csvfiles.read_csv(files[0]) assert 'date_time' in obj assert '_datastream' in obj.attrs From 09583d81ac27274c7c0ed7d515685dbd5baf3c39 Mon Sep 17 00:00:00 2001 From: Adam Theisen Date: Wed, 14 Apr 2021 20:09:30 -0500 Subject: [PATCH 3/5] ENH: Adding CSV to MANIFEST.in --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 32dffd3417..f94a802df2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -10,7 +10,7 @@ recursive-exclude * *.py[co] recursive-include act/plotting *.txt recursive-include docs *.rst conf.py Makefile make.bat -recursive-include act/tests/data *.cdf *.nc *.data +recursive-include act/tests/data *.cdf *.nc *.data *.csv include versioneer.py include act/_version.py From 058bb73fa2411c9cb96052a532785eaf4e465787 Mon Sep 17 00:00:00 2001 From: Adam Theisen Date: Wed, 14 Apr 2021 20:13:03 -0500 Subject: [PATCH 4/5] ENH: Keeping tests and adding csv to MANIFEST --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9c997783d9..e340c380e3 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ author="Adam Theisen", author_email='atheisen@anl.gov', url='https://github.com/ARM-DOE/ACT', - packages=find_packages(exclude=['docs', 'tests']), + packages=find_packages(exclude=['docs']), entry_points={'console_scripts': []}, include_package_data=True, package_data={'act': []}, From 452ac08c461cd4f6bcbe0e9b358d013cd407b880 Mon Sep 17 00:00:00 2001 From: Adam Theisen Date: Wed, 14 Apr 2021 20:25:42 -0500 Subject: [PATCH 5/5] ENH: Adding additional data types --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index f94a802df2..5c14c69070 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -10,7 +10,7 @@ recursive-exclude * *.py[co] recursive-include act/plotting *.txt recursive-include docs *.rst conf.py Makefile make.bat -recursive-include act/tests/data *.cdf *.nc *.data *.csv +recursive-include act/tests/data *.cdf *.nc *.data *.csv *bi *txt include versioneer.py include act/_version.py