Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: '3.11'
python-version: '3.14'
- uses: pre-commit/action@v3.0.0
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- uses: actions/checkout@v6

- uses: actions/setup-python@v4
- uses: actions/setup-python@v6
with:
python-version: '3.8'
python-version: '3.14'

- name: Install pypa/build
run: python -m pip install build
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:

matrix:
os: [ubuntu-latest, macos-latest]
pyv: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
pyv: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: actions/setup-python@v4
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.pyv }}

Expand All @@ -38,7 +38,7 @@ jobs:
run: python -m pytest --cov-report=xml --cov=.

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1.0.13
uses: codecov/codecov-action@v5
with:
file: ./coverage.xml
files: ./coverage.xml
fail_ci_if_error: false
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 26.1.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-isort
rev: v5.5.0
rev: v5.10.1
hooks:
- id: isort
additional_dependencies: [toml]
- repo: https://github.com/executablebooks/mdformat/
rev: 0.7.5
rev: 1.0.0
hooks:
- id: mdformat
additional_dependencies:
- mdformat-black
- mdformat_tables
- mdformat_gfm
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
rev: v2.4.1
hooks:
- id: codespell
additional_dependencies:
Expand Down
59 changes: 52 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,61 @@
[build-system]
requires = ["setuptools>=48", "setuptools_scm[toml]>=6.3.1"]
requires = ["setuptools>=77", "setuptools_scm[toml]>=8"]
build-backend = "setuptools.build_meta"

[project]
name = "sshfs"
description = "SSH Filesystem -- Async SSH/SFTP backend for fsspec"
readme = "README.md"
license = "Apache-2.0"
license-files = ["LICENSE"]
requires-python = ">=3.9"
classifiers = [
"Development Status :: 4 - Beta",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
]
dynamic = ["version"]

dependencies = [
"fsspec>=2021.8.1",
"asyncssh>=2.11.0,<3",
]

[project.optional-dependencies]
bcrypt = ["asyncssh[bcrypt]"]
fido2 = ["asyncssh[fido2]"]
gssapi = ["asyncssh[gssapi]"]
libnacl = ["asyncssh[libnacl]"]
pkcs11 = ["asyncssh[python-pkcs11]"]
pyopenssl = ["asyncssh[pyOpenSSL]"]
pywin32 = ["asyncssh[pywin32]"]

[project.urls]
Issues = "https://github.com/fsspec/sshfs/issues"
Source = "https://github.com/fsspec/sshfs"

[project.entry-points."fsspec.specs"]
ssh = "sshfs.spec:SSHFileSystem"
sftp = "sshfs.spec:SSHFileSystem"

[tool.setuptools.packages.find]
exclude = ["tests", "tests.*"]
namespaces = false

[tool.setuptools_scm]

[tool.black]
line-length = 79
target-version = ['py38']
target-version = ['py39']

[tool.isort]
atomic=true
force_grid_wrap=0
include_trailing_comma=true
multi_line_output=3
use_parentheses=true
atomic = true
force_grid_wrap = 0
include_trailing_comma = true
multi_line_output = 3
use_parentheses = true
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pytest
pytest-asyncio
pytest-cov
mock-ssh-server @ git+https://github.com/skshetry/mock-ssh-server.git@command-queue-race
mock-ssh-server
importlib-metadata >= 6.0.0
36 changes: 0 additions & 36 deletions setup.cfg

This file was deleted.

3 changes: 0 additions & 3 deletions setup.py

This file was deleted.

3 changes: 1 addition & 2 deletions sshfs/pools/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ async def _maybe_new_channel(self):
async def get(self):
raise NotImplementedError

async def _cleanup(self):
...
async def _cleanup(self): ...

async def close(self):
if self.active_channels and not self.unsafe_terminate:
Expand Down