Merge pull request #91 from arsenetar/as/misc-fixes

chore: Upgrade version to 1.8.3, bump CI
fix(ci): Use alternative setup-python to allow 2.7
2024-04-06 18:53:45 -05:00 · 2024-04-06 16:51:34 -07:00 · 2024-04-06 16:36:23 -07:00 · 2024-03-28 01:17:37 -05:00 · 2024-03-23 05:37:21 +05:30
5 changed files with 18 additions and 16 deletions
--- a/.github/workflows/default.yml
+++ b/.github/workflows/default.yml
@ -12,9 +12,9 @@ jobs:
  lint:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Set up Python 3.x
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
        with:
          python-version: 3.x
      - name: Install dependencies
@ -30,6 +30,8 @@ jobs:
    strategy:
      matrix:
        include:
+          - os: ubuntu-latest
+            python-version: 3.12
          - os: ubuntu-latest
            python-version: 3.11
          - os: ubuntu-latest
@ -40,29 +42,25 @@ jobs:
            python-version: 3.8
          - os: ubuntu-latest
            python-version: 3.7
-          - os: ubuntu-20.04
-            python-version: 3.6
-          - os: ubuntu-20.04
-            python-version: 3.5
          - os: ubuntu-latest
            python-version: 2.7
          # - os: macos-latest
          #   python-version: 3.11
-          # - os: macos-latest
+          # - os: macos-latestgit push
          #   python-version: 3.8
          # - os: macos-latest
          #   python-version: 2.7
          - os: windows-latest
-            python-version: 3.11
+            python-version: 3.12
          - os: windows-latest
            python-version: 3.8
          - os: windows-latest
            python-version: 2.7

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: LizardByte/setup-python-action@master
        with:
          python-version: ${{ matrix.python-version }}
      - name: Install dependencies
--- a/CHANGES.rst
+++ b/CHANGES.rst
@ -1,6 +1,11 @@
 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
 ---------------------------
 * win/legacy: tiny logic simplification by @BoboTiG in https://github.com/arsenetar/send2trash/pull/77
--- a/send2trash/compat.py
+++ b/send2trash/compat.py
@ -22,4 +22,4 @@ else:
 try:
    from collections.abc import Iterable as iterable_type
 except ImportError:
-    from collections import Iterable as iterable_type
+    from collections import Iterable as iterable_type  # noqa: F401
--- a/send2trash/plat_other.py
+++ b/send2trash/plat_other.py
@ -115,7 +115,7 @@ def trash_move(src, dst, topdir=None, cross_dev=False):
        f.write(info_for(src, topdir))
    destpath = op.join(filespath, destname)
    if cross_dev:
-        shutil.move(src, destpath)
+        shutil.move(fsdecode(src), fsdecode(destpath))
    else:
        os.rename(src, destpath)

--- a/setup.cfg
+++ b/setup.cfg
@ -1,6 +1,6 @@
 [metadata]
 name = Send2Trash
-version = 1.8.2
+version = 1.8.3
 url = https://github.com/arsenetar/send2trash
 project_urls = 
    Bug Reports = https://github.com/arsenetar/send2trash/issues
@ -20,19 +20,18 @@ classifiers =
    Operating System :: POSIX
    Programming Language :: Python :: 2.7
    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
    Programming Language :: Python :: 3.7
    Programming Language :: Python :: 3.8
    Programming Language :: Python :: 3.9
    Programming Language :: Python :: 3.10
    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
    Topic :: Desktop Environment :: File Managers

 [options]
 packages = find:
 tests_require = pytest
-python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
+python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*

 [options.packages.find]
 include=
Author	SHA1	Message	Date
Andrew Senetar	91d0698967	Merge pull request #91 from arsenetar/as/misc-fixes chore: Upgrade version to 1.8.3, bump CI	2024-04-06 18:53:45 -05:00
Andrew Senetar	5c47eb063c	fix(ci): Use alternative setup-python to allow 2.7 The setup python action has removed 2.7, we want to keep it for the moment. Using an alternative action that supports 2.7.	2024-04-06 16:51:34 -07:00
Andrew Senetar	c7a23884a9	chore: Upgrade version to 1.8.3, bump CI - Upgrade version to 1.8.3, add changelog entry - Fix minor flake8 error that can be ignored - Update CI workflow to use newer actions and python versions	2024-04-06 16:36:23 -07:00
Andrew Senetar	78fa300cac	Merge pull request #90 from yogeshiitm/master Fix bug when source and destination directories are on different file systems	2024-03-28 01:17:37 -05:00
Yogesh Agarwala	baeb9e59f9	Fix bug in send2trash: Use os.fsdecode() in shutil.move() `shutil.move()` function expects string paths, not byte paths. This bug is leading to failure when src and dst are on on the different file system.	2024-03-23 05:37:21 +05:30