Skip to content

Commit 6e8c1b7

Browse files
authored
Drop Python 2.7 (dask#4919)
* Drop Python 2.7 Drops Python 2.7 from our `setup.py`, and from our test matrix. We don't drop any of the compatability fixes (yet), but won't be adding new ones. * fixup
1 parent 7a9cfaf commit 6e8c1b7

File tree

4 files changed

+5
-20
lines changed

4 files changed

+5
-20
lines changed

.travis.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,11 @@ jobs:
1717
fast_finish: true
1818
include:
1919
- env:
20-
- PYTHON=2.7
20+
- PYTHON=3.5
2121
- NUMPY=1.13.0
2222
- PANDAS=0.21.1
2323
- *test_and_lint
2424
- *no_coverage
25-
- *optimize
26-
- *no_imports
27-
28-
- env:
29-
- PYTHON=3.5
30-
- NUMPY=1.14.1
31-
- PANDAS=0.22.0
32-
- *test_and_lint
33-
- *no_coverage
3425
- *no_optimize
3526
- *no_imports
3627

continuous_integration/travis/install.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ if [[ $NUMPY > '1.13.0' ]]; then
8787
fi
8888
fi
8989

90-
if [[ $PYTHON == '2.7' ]]; then
91-
pip install --no-deps backports.lzma mock
92-
fi
93-
9490
pip install --upgrade --no-deps \
9591
cachey \
9692
graphviz \

dask/dataframe/io/tests/test_parquet.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import dask
1313
import dask.multiprocessing
1414
import dask.dataframe as dd
15-
from dask.dataframe.utils import assert_eq
15+
from dask.dataframe.utils import assert_eq, PANDAS_VERSION
1616
from dask.dataframe.io.parquet import _parse_pandas_metadata
1717
from dask.utils import natural_sort_key
1818

@@ -476,8 +476,8 @@ def test_optimize(tmpdir, c):
476476
assert all(v[4] == c for v in dsk.values())
477477

478478

479-
@pytest.mark.skipif(not hasattr(pd.DataFrame, 'to_parquet'),
480-
reason="no to_parquet method")
479+
@pytest.mark.skipif(PANDAS_VERSION < '0.22.0',
480+
reason="new pyarrow assumes new-ish pandas versions")
481481
@write_read_engines()
482482
def test_roundtrip_from_pandas(tmpdir, write_engine, read_engine):
483483
fn = str(tmpdir.join('test.parquet'))

setup.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,14 @@
3939
license='BSD',
4040
keywords='task-scheduling parallel numpy pandas pydata',
4141
classifiers=[
42-
"Programming Language :: Python :: 2",
43-
"Programming Language :: Python :: 2.7",
4442
"Programming Language :: Python :: 3",
4543
"Programming Language :: Python :: 3.5",
4644
"Programming Language :: Python :: 3.6",
4745
"Programming Language :: Python :: 3.7",
4846
],
4947
packages=packages + tests,
5048
long_description=open('README.rst').read() if exists('README.rst') else '',
51-
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
49+
python_requires=">=3.5",
5250
setup_requires=setup_requires,
5351
tests_require=['pytest'],
5452
extras_require=extras_require,

0 commit comments

Comments
 (0)