1
0
mirror of https://github.com/arsenetar/send2trash.git synced 2025-05-07 17:29:50 +00:00

Compare commits

..

No commits in common. "91d06989678ecd78ec8878d527ba70f59b60a45b" and "0a48c26f689f4bd9dfd4e6345523319c27d437a3" have entirely different histories.

5 changed files with 16 additions and 18 deletions

View File

@ -12,9 +12,9 @@ jobs:
lint: lint:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v3
- name: Set up Python 3.x - name: Set up Python 3.x
uses: actions/setup-python@v5 uses: actions/setup-python@v3
with: with:
python-version: 3.x python-version: 3.x
- name: Install dependencies - name: Install dependencies
@ -30,8 +30,6 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- os: ubuntu-latest
python-version: 3.12
- os: ubuntu-latest - os: ubuntu-latest
python-version: 3.11 python-version: 3.11
- os: ubuntu-latest - os: ubuntu-latest
@ -42,25 +40,29 @@ jobs:
python-version: 3.8 python-version: 3.8
- os: ubuntu-latest - os: ubuntu-latest
python-version: 3.7 python-version: 3.7
- os: ubuntu-20.04
python-version: 3.6
- os: ubuntu-20.04
python-version: 3.5
- os: ubuntu-latest - os: ubuntu-latest
python-version: 2.7 python-version: 2.7
# - os: macos-latest # - os: macos-latest
# python-version: 3.11 # python-version: 3.11
# - os: macos-latestgit push # - os: macos-latest
# python-version: 3.8 # python-version: 3.8
# - os: macos-latest # - os: macos-latest
# python-version: 2.7 # python-version: 2.7
- os: windows-latest - os: windows-latest
python-version: 3.12 python-version: 3.11
- os: windows-latest - os: windows-latest
python-version: 3.8 python-version: 3.8
- os: windows-latest - os: windows-latest
python-version: 2.7 python-version: 2.7
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }} - name: Set up Python ${{ matrix.python-version }}
uses: LizardByte/setup-python-action@master uses: actions/setup-python@v3
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Install dependencies - name: Install dependencies

View File

@ -1,11 +1,6 @@
Changes Changes
======= =======
Version 1.8.3 -- 2024/04/06
---------------------------
* Add support for any iterable type as input by @PalmtopTiger in https://github.com/arsenetar/send2trash/pull/88
* fix: Use os.fsdecode() for arguments to shutil.move() by @yogeshiitm in https://github.com/arsenetar/send2trash/pull/90
Version 1.8.2 -- 2023/04/27 Version 1.8.2 -- 2023/04/27
--------------------------- ---------------------------
* win/legacy: tiny logic simplification by @BoboTiG in https://github.com/arsenetar/send2trash/pull/77 * win/legacy: tiny logic simplification by @BoboTiG in https://github.com/arsenetar/send2trash/pull/77

View File

@ -22,4 +22,4 @@ else:
try: try:
from collections.abc import Iterable as iterable_type from collections.abc import Iterable as iterable_type
except ImportError: except ImportError:
from collections import Iterable as iterable_type # noqa: F401 from collections import Iterable as iterable_type

View File

@ -115,7 +115,7 @@ def trash_move(src, dst, topdir=None, cross_dev=False):
f.write(info_for(src, topdir)) f.write(info_for(src, topdir))
destpath = op.join(filespath, destname) destpath = op.join(filespath, destname)
if cross_dev: if cross_dev:
shutil.move(fsdecode(src), fsdecode(destpath)) shutil.move(src, destpath)
else: else:
os.rename(src, destpath) os.rename(src, destpath)

View File

@ -1,6 +1,6 @@
[metadata] [metadata]
name = Send2Trash name = Send2Trash
version = 1.8.3 version = 1.8.2
url = https://github.com/arsenetar/send2trash url = https://github.com/arsenetar/send2trash
project_urls = project_urls =
Bug Reports = https://github.com/arsenetar/send2trash/issues Bug Reports = https://github.com/arsenetar/send2trash/issues
@ -20,18 +20,19 @@ classifiers =
Operating System :: POSIX Operating System :: POSIX
Programming Language :: Python :: 2.7 Programming Language :: Python :: 2.7
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Topic :: Desktop Environment :: File Managers Topic :: Desktop Environment :: File Managers
[options] [options]
packages = find: packages = find:
tests_require = pytest tests_require = pytest
python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.* python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
[options.packages.find] [options.packages.find]
include= include=