From 6a12993ae531aea958d36ff380aa0aa16412378a Mon Sep 17 00:00:00 2001
From: Lindsey Gray <lindsey.gray@gmail.com>
Date: Fri, 2 Aug 2019 09:49:10 -0500
Subject: [PATCH] enable spark tests in python 2.7

---
 .travis.yml                              | 7 +++----
 coffea/processor/spark/detail.py         | 6 +++++-
 coffea/processor/spark/spark_executor.py | 2 +-
 coffea/version.py                        | 2 +-
 tests/test_spark.py                      | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 466a9890e..1b41340e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ addons:
     - python-setuptools
     - pandoc
 script:
-- pip list
 - python setup.py flake8
 - coverage run --source=coffea/ setup.py pytest
 before_install:
@@ -31,12 +30,12 @@ install:
 - pip -q install codecov
 - PY_MAJ=`python -c 'import sys; print(sys.version_info[0])'`
 - PY_MIN=`python -c 'import sys; print(sys.version_info[1])'`
-- if [ $PY_MAJ -eq 3 ]; then pip -q install pandas pyarrow cloudpickle lz4 jinja2; fi
-- if [ $PY_MAJ -eq 3 ]; then pip -q install https://github.com/Parsl/parsl/zipball/master; fi
-- if [ $PY_MAJ -eq 3 ] && [ $PY_MIN -ge 6 ]; then  pip -q install pyspark; fi
 - pip -q install numpy scipy numba tqdm matplotlib pytest pytest-runner flake8 --upgrade
+- pip -q install pandas pyarrow cloudpickle lz4 jinja2 pyspark --upgrade
+- if [ $PY_MAJ -eq 3 ]; then pip -q install https://github.com/Parsl/parsl/zipball/master; fi
 - pip -q install ${AWKWARD}
 - pip -q install uproot 
+- pip list
 branches:
   only:
   - master
diff --git a/coffea/processor/spark/detail.py b/coffea/processor/spark/detail.py
index 90c5ec407..fcb6f45c6 100644
--- a/coffea/processor/spark/detail.py
+++ b/coffea/processor/spark/detail.py
@@ -4,7 +4,11 @@
 import pyspark.sql
 import pyspark.sql.functions as fn
 from pyarrow.compat import guid
-from collections.abc import Sequence
+
+try:
+    from collections.abc import Sequence
+except ImportError:
+    from collections import Sequence
 
 from ..executor import futures_handler
 
diff --git a/coffea/processor/spark/spark_executor.py b/coffea/processor/spark/spark_executor.py
index 21ddd853b..0104621cd 100644
--- a/coffea/processor/spark/spark_executor.py
+++ b/coffea/processor/spark/spark_executor.py
@@ -3,7 +3,7 @@
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
 from tqdm import tqdm
-import _pickle as pkl
+import pickle as pkl
 import lz4.frame as lz4f
 import numpy as np
 import pandas as pd
diff --git a/coffea/version.py b/coffea/version.py
index 674c18f3d..b3ea80ff6 100644
--- a/coffea/version.py
+++ b/coffea/version.py
@@ -30,7 +30,7 @@
 
 import re
 
-__version__ = "0.6.7"
+__version__ = "0.6.8"
 version = __version__
 version_info = tuple(re.split(r"[-\.]", __version__))
 
diff --git a/tests/test_spark.py b/tests/test_spark.py
index c961642bb..701731d9c 100644
--- a/tests/test_spark.py
+++ b/tests/test_spark.py
@@ -66,7 +66,7 @@ def test_spark_hist_adders():
     pyspark = pytest.importorskip("pyspark", minversion="2.4.1")
     
     import pandas as pd
-    import _pickle as pkl
+    import pickle as pkl
     import lz4.frame as lz4f
 
     from coffea.util import numpy as np