浏览代码

Merge branch 'master' into master

pull/47/head
Andrew Senetar 2 个月前
committed by GitHub
父节点
当前提交
f64c69f905
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 5 个文件被更改,包括 16 次插入12 次删除
  1. +7
    -4
      .travis.yml
  2. +1
    -1
      README.rst
  3. +2
    -3
      send2trash/plat_other.py
  4. +5
    -3
      setup.py
  5. +1
    -1
      tox.ini

+ 7
- 4
.travis.yml 查看文件

@@ -17,12 +17,15 @@ matrix:
- python: "3.4"
- python: "3.5"
- python: "3.6"
# Obtain Python 3.7 from xenial as per https://github.com/travis-ci/travis-ci/issues/9815
- python: "3.7"
dist: xenial
- python: "3.8"
- python: "3.9"
- python: "nightly" # 3.10
before_script:
- export TOXENV=py310
install:
- pip install tox
- python -m pip install tox
before_script:
- export TOXENV=$(echo py$TRAVIS_PYTHON_VERSION | tr -d .)
script:
- tox
- python -m tox

+ 1
- 1
README.rst 查看文件

@@ -24,7 +24,7 @@ Installation

You can download it with pip::

pip install Send2Trash
python -m pip install -U send2trash

or you can download the source from http://github.com/arsenetar/send2trash and install it with::



+ 2
- 3
send2trash/plat_other.py 查看文件

@@ -111,9 +111,8 @@ def trash_move(src, dst, topdir=None):
check_create(filespath)
check_create(infopath)
f = open(op.join(infopath, destname + INFO_SUFFIX), "w")
f.write(info_for(src, topdir))
f.close()
with open(op.join(infopath, destname + INFO_SUFFIX), "w") as f:
f.write(info_for(src, topdir))
os.rename(src, op.join(filespath, destname))




+ 5
- 3
setup.py 查看文件

@@ -14,12 +14,13 @@ CLASSIFIERS = [
"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",
"Topic :: Desktop Environment :: File Managers",
]

LONG_DESCRIPTION = (
open("README.rst", "rt").read() + "\n\n" + open("CHANGES.rst", "rt").read()
)
with open("README.rst", "rt") as f1, open("CHANGES.rst", "rt") as f2:
LONG_DESCRIPTION = f1.read() + "\n\n" + f2.read()

setup(
name="Send2Trash",
@@ -36,4 +37,5 @@ setup(
classifiers=CLASSIFIERS,
extras_require={"win32": ["pywin32"]},
project_urls={"Bug Reports": "https://github.com/arsenetar/send2trash/issues"},
entry_points={"console_scripts": ["send2trash=send2trash.__main__:main"]},
)

+ 1
- 1
tox.ini 查看文件

@@ -1,5 +1,5 @@
[tox]
envlist = py27,py34,py35,py36,py3-win
envlist = py{27,34,35,36,37,38,39,310,3-win}
skip_missing_interpreters = True

[testenv]


正在加载...
取消
保存