Merge pull request #225 from martindurant/pytest_dep

Move pytest imports to tests/ remove requirememnt

fastparquet/benchmarks/columns.py

@@ -1,5 +1,4 @@
 from contextlib import contextmanager
-import datetime
 import os
 import numpy as np
 import pandas as pd

fastparquet/test/test_api.py

@@ -6,7 +6,7 @@
 import pandas as pd
 import pytest
 
-from fastparquet.util import tempdir
+from fastparquet.test.util import tempdir
 from fastparquet import write, ParquetFile
 from fastparquet.api import statistics, sorted_partitioned_columns
 

fastparquet/test/test_aroundtrips.py

@@ -13,8 +13,7 @@
 import fastparquet
 from fastparquet import write
 from fastparquet.compression import compressions
-from fastparquet.test.util import sql, s3, TEST_DATA
-from fastparquet.util import tempdir, default_mkdirs
+from fastparquet.test.util import sql, s3, tempdir, TEST_DATA
 
 
 def test_map_array(sql):

fastparquet/test/test_output.py

@@ -10,12 +10,9 @@
 from fastparquet import write, parquet_thrift
 from fastparquet import writer, encoding
 import pytest
-import shutil
-import tempfile
 
-from fastparquet.util import tempdir, default_mkdirs
-from fastparquet.test.util import s3, sql
-from fastparquet.compression import compressions
+from fastparquet.util import default_mkdirs
+from fastparquet.test.util import s3, tempdir, sql
 
 TEST_DATA = "test-data"
 

fastparquet/test/test_partition_filters_specialstrings.py

@@ -5,7 +5,7 @@
 import numpy as np
 import pandas as pd
 from pandas.tslib import Timestamp
-from fastparquet.util import tempdir
+from fastparquet.test.util import tempdir
 from fastparquet import write, ParquetFile
 import datetime as dt
 import string

fastparquet/test/test_read.py

@@ -8,24 +8,14 @@
 from itertools import product
 import numpy as np
 import os
-import shutil
-import tempfile
 
 import pandas as pd
 import pytest
 
 import fastparquet
 from fastparquet import writer, core
 
-from fastparquet.test.util import TEST_DATA, s3
-
-
-@pytest.yield_fixture()
-def tempdir():
-    d = tempfile.mkdtemp()
-    yield d
-    if os.path.exists(d):
-        shutil.rmtree(d, ignore_errors=True)
+from fastparquet.test.util import TEST_DATA, s3, tempdir
 
 
 def test_header_magic_bytes(tempdir):

fastparquet/test/util.py

@@ -1,6 +1,8 @@
 from itertools import product
 import os
 import pytest
+import tempfile
+import shutil
 
 TEST_DATA = "test-data"
 
@@ -41,3 +43,11 @@ def sql():
     sc = pyspark.SparkContext.getOrCreate()
     sql = pyspark.SQLContext(sc)
     return sql
+
+
+@pytest.yield_fixture()
+def tempdir():
+    d = tempfile.mkdtemp()
+    yield d
+    if os.path.exists(d):
+        shutil.rmtree(d, ignore_errors=True)

fastparquet/util.py

@@ -1,11 +1,8 @@
 import ast
 import os
 import os.path
-import shutil
 import pandas as pd
-import pytest
 import re
-import tempfile
 import six
 
 from .thrift_structures import thrift_copy
@@ -67,13 +64,6 @@ def val_to_num(x):
         return x
 
 
-@pytest.yield_fixture()
-def tempdir():
-    d = tempfile.mkdtemp()
-    yield d
-    if os.path.exists(d):
-        shutil.rmtree(d, ignore_errors=True)
-
 if PY2:
     def ensure_bytes(s):
         return s.encode('utf-8') if isinstance(s, unicode) else s

requirements.txt

@@ -2,6 +2,5 @@ pandas
 numba>=0.28
 numpy>=1.11
 thrift>=0.10.0
-pytest
 six
 cython