Skip to content

Commit 2ec7ad2

Browse files
authored
Merge pull request #85 from datalad/update
Update Python and DataLad versions
2 parents 24727b8 + 0780747 commit 2ec7ad2

File tree

8 files changed

+15
-17
lines changed

8 files changed

+15
-17
lines changed

.github/workflows/benchmark.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Set up Python
2929
uses: actions/setup-python@v4
3030
with:
31-
python-version: 3.6
31+
python-version: 3.7
3232

3333
- name: Install dependencies
3434
run: |
@@ -52,13 +52,13 @@ jobs:
5252
git update-ref refs/bm/merge-target HEAD^1
5353
5454
- name: Run benchmarks on newest code
55-
run: asv run --strict --show-stderr --python 3.6 HEAD^-1
55+
run: asv run --strict --show-stderr --python 3.7 HEAD^-1
5656

5757
- name: Check out previous code
5858
run: git checkout --force refs/bm/merge-target
5959

6060
- name: Run benchmarks on previous code
61-
run: asv run --strict --show-stderr --python 3.6 HEAD^-1
61+
run: asv run --strict --show-stderr --python 3.7 HEAD^-1
6262

6363
- name: Compare benchmarks on previous & newest code
6464
run: asv compare refs/bm/merge-target refs/bm/pr

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Python
1717
uses: actions/setup-python@v4
1818
with:
19-
python-version: '3.6'
19+
python-version: '3.7'
2020

2121
- name: Install dependencies
2222
run: |

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Python
2626
uses: actions/setup-python@v4
2727
with:
28-
python-version: '^3.6'
28+
python-version: '^3.7'
2929

3030
- name: Install Python dependencies
3131
run: python -m pip install build twine

.github/workflows/test-libfuse.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
2828
- uses: actions/checkout@v3
2929

30-
- name: Set up Python 3.6
30+
- name: Set up Python 3.7
3131
uses: actions/setup-python@v4
3232
with:
33-
python-version: 3.6
33+
python-version: 3.7
3434

3535
- name: Install dependencies
3636
run: |

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
git config --global user.email "[email protected]"
2525
git config --global user.name "GitHub Almighty"
2626
- uses: actions/checkout@v3
27-
- name: Set up Python 3.6
27+
- name: Set up Python 3.7
2828
uses: actions/setup-python@v4
2929
with:
30-
python-version: 3.6
30+
python-version: 3.7
3131
- name: Install dependencies
3232
run: |
3333
python -m pip install --upgrade pip

datalad_fuse/tests/test_fsspec_head.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import subprocess
33

44
from datalad.api import Dataset
5-
from datalad.tests.utils import assert_in_results
5+
from datalad.tests.utils_pytest import assert_in_results
66
from linesep import split_terminated
77
import pytest
88

setup.cfg

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ classifiers =
1212
Programming Language :: Python :: 3
1313

1414
[options]
15-
python_requires = >= 3.6
15+
python_requires = >= 3.7
1616
install_requires =
17-
datalad >= 0.13.0
17+
datalad >= 0.17.0
1818
fsspec[fuse,http] >= 2022.1.0, != 2022.10.0
1919
methodtools ~= 0.4.5
2020
packages = find_namespace:
@@ -26,10 +26,8 @@ include = datalad_fuse*
2626
[options.extras_require]
2727
test =
2828
coverage~=6.0
29-
dataclasses; python_version < "3.7"
30-
datalad[tests]
3129
linesep~=0.2
32-
pytest~=6.0
30+
pytest
3331
requests~=2.20
3432

3533
[options.entry_points]

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ commands =
1717
[testenv:lint]
1818
skip_install = True
1919
deps =
20-
flake8~=3.7
20+
flake8
2121
flake8-bugbear
22-
flake8-builtins~=1.4
22+
flake8-builtins
2323
flake8-unused-arguments
2424
commands =
2525
flake8 --config=tox.ini datalad_fuse

0 commit comments

Comments
 (0)