mirror of
https://github.com/arsenetar/send2trash.git
synced 2025-05-08 09:49:52 +00:00
Compare commits
No commits in common. "0244f53e2e5da6642599acc5e9329669f1caf145" and "0ef9b3294ac4f68fdb5fff0a599fa734348286de" have entirely different histories.
0244f53e2e
...
0ef9b3294a
58
.github/workflows/codeql-analysis.yml
vendored
58
.github/workflows/codeql-analysis.yml
vendored
@ -13,12 +13,12 @@ name: "CodeQL"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
branches: [ master ]
|
||||
pull_request:
|
||||
# The branches below must be a subset of the branches above
|
||||
branches: [master]
|
||||
branches: [ master ]
|
||||
schedule:
|
||||
- cron: "25 5 * * 4"
|
||||
- cron: '25 5 * * 4'
|
||||
|
||||
jobs:
|
||||
analyze:
|
||||
@ -32,40 +32,40 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
language: ["python"]
|
||||
language: [ 'python' ]
|
||||
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
|
||||
# Learn more:
|
||||
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v2
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||
# By default, queries listed here will override any specified in a config file.
|
||||
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v1
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||
# By default, queries listed here will override any specified in a config file.
|
||||
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
||||
|
||||
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
|
||||
# If this step fails, then you should remove it and run the build manually (see below)
|
||||
- name: Autobuild
|
||||
uses: github/codeql-action/autobuild@v2
|
||||
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
|
||||
# If this step fails, then you should remove it and run the build manually (see below)
|
||||
- name: Autobuild
|
||||
uses: github/codeql-action/autobuild@v1
|
||||
|
||||
# ℹ️ Command-line programs to run using the OS shell.
|
||||
# 📚 https://git.io/JvXDl
|
||||
# ℹ️ Command-line programs to run using the OS shell.
|
||||
# 📚 https://git.io/JvXDl
|
||||
|
||||
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
|
||||
# and modify them (or add more) to build your code if your project
|
||||
# uses a compiled language
|
||||
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
|
||||
# and modify them (or add more) to build your code if your project
|
||||
# uses a compiled language
|
||||
|
||||
#- run: |
|
||||
# make bootstrap
|
||||
# make release
|
||||
#- run: |
|
||||
# make bootstrap
|
||||
# make release
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v2
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v1
|
||||
|
||||
80
.github/workflows/default.yml
vendored
80
.github/workflows/default.yml
vendored
@ -4,26 +4,26 @@ name: Default CI/CD
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
branches: [ master ]
|
||||
pull_request:
|
||||
branches: [master]
|
||||
branches: [ master ]
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Set up Python 3.x
|
||||
uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: 3.x
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install flake8
|
||||
- name: Lint with flake8
|
||||
run: |
|
||||
flake8 .
|
||||
- uses: actions/checkout@v2
|
||||
- name: Set up Python 3.x
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: 3.x
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install flake8
|
||||
- name: Lint with flake8
|
||||
run: |
|
||||
flake8 .
|
||||
test:
|
||||
needs: lint
|
||||
runs-on: ${{ matrix.os }}
|
||||
@ -31,52 +31,50 @@ jobs:
|
||||
matrix:
|
||||
include:
|
||||
- os: ubuntu-latest
|
||||
python-version: 3.11
|
||||
- os: ubuntu-latest
|
||||
python-version: "3.10"
|
||||
python-version: 3.10.0-alpha - 3.10.0
|
||||
- os: ubuntu-latest
|
||||
python-version: 3.9
|
||||
- os: ubuntu-latest
|
||||
python-version: 3.8
|
||||
- os: ubuntu-latest
|
||||
python-version: 3.7
|
||||
- os: ubuntu-20.04
|
||||
- os: ubuntu-latest
|
||||
python-version: 3.6
|
||||
- os: ubuntu-20.04
|
||||
- os: ubuntu-latest
|
||||
python-version: 3.5
|
||||
- os: ubuntu-latest
|
||||
python-version: 2.7
|
||||
# - os: macos-latest
|
||||
# python-version: 3.11
|
||||
# python-version: 3.9
|
||||
# - os: macos-latest
|
||||
# python-version: 3.8
|
||||
# - os: macos-latest
|
||||
# python-version: 2.7
|
||||
- os: windows-latest
|
||||
python-version: 3.11
|
||||
python-version: 3.9
|
||||
- os: windows-latest
|
||||
python-version: 3.8
|
||||
- os: windows-latest
|
||||
python-version: 2.7
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Set up Python ${{ matrix.python-version }}
|
||||
uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest
|
||||
- name: Install windows dependencies
|
||||
if: ${{ matrix.os == 'windows-latest' }}
|
||||
run: |
|
||||
pip install pywin32
|
||||
- name: Install macOS dependencies
|
||||
if: ${{ matrix.os == 'macos-latest' }}
|
||||
run: |
|
||||
pip install pyobjc-framework-Cocoa
|
||||
- name: Run tests
|
||||
run: |
|
||||
pytest
|
||||
- uses: actions/checkout@v2
|
||||
- name: Set up Python ${{ matrix.python-version }}
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install pytest
|
||||
- name: Install windows dependencies
|
||||
if: ${{ matrix.os == 'windows-latest' }}
|
||||
run: |
|
||||
pip install pywin32
|
||||
- name: Install macOS dependencies
|
||||
if: ${{ matrix.os == 'macos-latest' }}
|
||||
run: |
|
||||
pip install pyobjc-framework-Cocoa
|
||||
- name: Run tests
|
||||
run: |
|
||||
pytest
|
||||
|
||||
19
.travis.yml
Normal file
19
.travis.yml
Normal file
@ -0,0 +1,19 @@
|
||||
language: python
|
||||
matrix:
|
||||
include:
|
||||
- python: "2.7"
|
||||
arch: ppc64le
|
||||
- python: "3.6"
|
||||
arch: ppc64le
|
||||
- python: "3.7"
|
||||
arch: ppc64le
|
||||
- python: "3.8"
|
||||
arch: ppc64le
|
||||
- python: "3.9"
|
||||
arch: ppc64le
|
||||
install:
|
||||
- python -m pip install tox
|
||||
before_script:
|
||||
- export TOXENV=$(echo py$TRAVIS_PYTHON_VERSION | tr -d .)
|
||||
script:
|
||||
- python -m tox
|
||||
@ -1,15 +1,9 @@
|
||||
Changes
|
||||
=======
|
||||
|
||||
Version 1.8.2 -- 2023/04/27
|
||||
---------------------------
|
||||
* win/legacy: tiny logic simplification by @BoboTiG in https://github.com/arsenetar/send2trash/pull/77
|
||||
* TravisCI is not used anymore by @sobolevn in https://github.com/arsenetar/send2trash/pull/73
|
||||
* fix(ci): Update to latest actions, fix python versions by @arsenetar in https://github.com/arsenetar/send2trash/pull/78
|
||||
|
||||
Version 1.8.1b0 -- 2021/09/20
|
||||
-----------------------------
|
||||
* Add fallback to HOMETRASH when cross device errors happen in plat_other (#26, #41, #63)
|
||||
* Add fallback to HOMETRASH when cross device errors happen in plat_other (#26, $41, #63)
|
||||
|
||||
Version 1.8.0 -- 2021/08/08
|
||||
---------------------------
|
||||
|
||||
@ -86,7 +86,10 @@ def convert_sh_file_opt_result(result):
|
||||
0x10074: 0x57, # DE_ROOTDIR | ERRORONDEST -> ERROR_INVALID_PARAMETER
|
||||
}
|
||||
|
||||
return results.get(result, result)
|
||||
if result in results.keys():
|
||||
return results[result]
|
||||
else:
|
||||
return result
|
||||
|
||||
|
||||
def prefix_and_path(path):
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[metadata]
|
||||
name = Send2Trash
|
||||
version = 1.8.2
|
||||
version = 1.8.1b0
|
||||
url = https://github.com/arsenetar/send2trash
|
||||
project_urls =
|
||||
Bug Reports = https://github.com/arsenetar/send2trash/issues
|
||||
@ -26,7 +26,6 @@ classifiers =
|
||||
Programming Language :: Python :: 3.8
|
||||
Programming Language :: Python :: 3.9
|
||||
Programming Language :: Python :: 3.10
|
||||
Programming Language :: Python :: 3.11
|
||||
Topic :: Desktop Environment :: File Managers
|
||||
|
||||
[options]
|
||||
@ -39,10 +38,8 @@ include=
|
||||
send2trash*
|
||||
|
||||
[options.extras_require]
|
||||
win32 =
|
||||
pywin32; sys_platform == "win32"
|
||||
objc =
|
||||
pyobjc-framework-Cocoa; sys_platform == "darwin"
|
||||
win32 = pywin32; sys_platform == "win32"
|
||||
objc = pyobjc-framework-Cocoa; sys_platform == "darwin"
|
||||
nativeLib =
|
||||
pywin32; sys_platform == "win32"
|
||||
pyobjc-framework-Cocoa; sys_platform == "darwin"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user