8000 cleanup: · alixdamman/larray@a72786c · GitHub
[go: up one dir, main page]
Skip to content

Commit a72786c

Browse files
alixdammanalixdamman
committed
cleanup:
- removed remaining references to Python 3.5 (which is no longer supported) - removed needs_python35 and needs_python36 decorators
1 parent 84d7432 commit a72786c

File tree

6 files changed

+5
-21
lines changed

6 files changed

+5
-21
lines changed

‎condarecipe/larray/conda_build_config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
python:
2-
- 3.5
32
- 3.6
43
- 3.7

‎larray/core/metadata.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ class Metadata(AttributeDict):
3333
3434
Add metadata at array initialization
3535
36-
>>> # Python 3.5-
37-
>>> arr = ndtest((3, 3), meta=[('title', 'the title'), ('author', 'John Smith')])
38-
>>> # Python 3.6+
39-
>>> arr = ndtest((3, 3), meta=Metadata(title='the title', author='John Smith')) # doctest: +SKIP
36+
>>> arr = ndtest((3, 3), meta=Metadata(title='the title', author='John Smith'))
4037
4138
Add metadata after array initialization
4239

‎larray/core/session.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ class Session(object):
5757
>>> ses = Session([('i', i), ('s', s), ('a', a), ('b', b), ('a01', a01),
5858
... ('arr1', arr1), ('arr2', arr2)])
5959
60-
create a Session using keyword arguments (but you lose order on Python < 3.6)
60+
create a Session using keyword arguments
6161
6262
>>> ses = Session(i=i, s=s, a=a, b=b, a01=a01, arr1=arr1, arr2=arr2)
6363
64-
create a Session by passing a dictionary (but you lose order on Python < 3.6)
64+
create a Session by passing a dictionary
6565
6666
>>> ses = Session({'i': i, 's': s, 'a': a, 'b': b, 'a01': a01, 'arr1': arr1, 'arr2': arr2})
6767
@@ -71,13 +71,7 @@ class Session(object):
7171
7272
create a session with metadata
7373
74-
>>> # Python 3.5-
75-
>>> ses = Session([('arr1', arr1), ('arr2', arr2)], meta=[('title', 'my title'), ('author', 'John Smith')])
76-
>>> ses.meta
77-
title: my title
78-
author: John Smith
79-
>>> # Python 3.6+
80-
>>> ses = Session(arr1=arr1, arr2=arr2, meta=Metadata(title='my title', author='John Smith')) # doctest: +SKIP
74+
>>> ses = Session(arr1=arr1, arr2=arr2, meta=Metadata(title='my title', author='John Smith'))
8175
>>> ses.meta
8276
title: my title
8377
author: John Smith

‎larray/tests/common.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,4 @@ def meta():
148148
needs_xlrd = pytest.mark.skipif(xlrd is None, reason="xlrd is required for this test")
149149
needs_xlsxwriter = pytest.mark.skipif(xlsxwriter is None, reason="xlsxwriter is required for this test")
150150

151-
needs_pyt 8000 hon35 = pytest.mark.skipif(sys.version_info < (3, 5), reason="Python 3.5 is required for this test")
152-
needs_python36 = pytest.mark.skipif(sys.version_info < (3, 6), reason="Python 3.6 is required for this test")
153151
needs_python37 = pytest.mark.skipif(sys.version_info < (3, 7), reason="Python 3.7 is required for this test")

‎larray/tests/test_array.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from larray.tests.common import (inputpath, tmp_path, meta,
1313
assert_array_equal, assert_array_nan_equal, assert_larray_equiv, assert_larray_equal,
1414
needs_xlwings, needs_pytables, needs_xlsxwriter, needs_xlrd,
15-
needs_python35, needs_python36, needs_python37)
15+
needs_python37)
1616
from larray import (Array, LArray, Axis, LGroup, union, zeros, zeros_like, ndtest, empty, ones, eye, diag, stack,
1717
clip, exp, where, X, mean, isnan, round, read_hdf, read_csv, read_eurostat, read_excel,
1818
from_lists, from_string, open_excel, from_frame, sequence, nan, IGroup)
@@ -4557,7 +4557,6 @@ def test_diag():
45574557
assert d.i[1] == 1.0
45584558

45594559

4560-
@needs_python35
45614560
def test_matmul():
45624561
# 2D / anonymous axes
45634562
a1 = ndtest([Axis(3), Axis(3)])
@@ -4712,7 +4711,6 @@ def test_matmul():
47124711
assert_array_equal(arr2d @ arr4d, res)
47134712

47144713

4715-
@needs_python35
47164714
def test_rmatmul():
47174715
a1 = eye(3) * 2
47184716
a2 = ndtest([Axis(3), Axis(3)])
@@ -5070,7 +5068,6 @@ def test_stack():
50705068
assert_array_equal(res, expected)
50715069

50725070

5073-
@needs_python36
50745071
def test_stack_kwargs_no_axis_labels():
50755072
# these tests rely on kwargs ordering, hence python 3.6
50765073

‎setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ def readlocal(fname):
3131
'Intended Audience :: Developers',
3232
'Programming Language :: Python',
3333
'Programming Language :: Python :: 3',
34-
'Programming Language :: Python :: 3.5',
3534
'Programming Language :: Python :: 3.6',
3635
'Programming Language :: Python :: 3.7',
3736
'Topic :: Scientific/Engineering',

0 commit comments

Comments
 (0)
0