1
0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-05-08 17:59:50 +00:00

Compare commits

..

No commits in common. "fdc8a17d261cf6d37b75e30a41976da6a5c509a0" and "c51a82a2ce4e49f21830a00f4f51d59dea5d0221" have entirely different histories.

4 changed files with 54 additions and 36 deletions

View File

@ -1,27 +1,27 @@
sudo: false sudo: false
language: python language: python
install: install:
- pip3 install -r requirements.txt -r requirements-extra.txt - pip3 install -r requirements.txt -r requirements-extra.txt
script: tox script: tox
matrix: matrix:
include: include:
- os: "linux" - os: "linux"
dist: "xenial" dist: "xenial"
python: "3.6" python: "3.6"
- os: "linux" - os: "linux"
dist: "xenial" dist: "xenial"
python: "3.7" python: "3.7"
- os: "linux" - os: "linux"
dist: "focal" dist: "focal"
python: "3.8" python: "3.8"
- os: "linux" - os: "linux"
dist: "focal" dist: "focal"
python: "3.9" python: "3.9"
- os: "windows" - os: "windows"
language: shell language: shell
python: "3.9" python: "3.8"
env: "PATH=/c/python39:/c/python39/Scripts:$PATH" env: "PATH=/c/python38:/c/python38/Scripts:$PATH"
before_install: before_install:
- choco install python --version=3.9.6 - choco install python --version=3.8.6
- cp /c/python39/python.exe /c/python39/python3.exe - cp /c/python38/python.exe /c/python38/python3.exe
script: tox -e py39 script: tox -e py38

View File

@ -7,8 +7,10 @@
import os.path as op import os.path as op
import re import re
from distutils.version import LooseVersion
from pkg_resources import load_entry_point, get_distribution
from .build import read_changelog_file, filereplace from .build import read_changelog_file, filereplace
from sphinx.cmd.build import build_main as sphinx_build
CHANGELOG_FORMAT = """ CHANGELOG_FORMAT = """
{version} ({date}) {version} ({date})
@ -71,10 +73,26 @@ def gen(
if op.exists(confpath): if op.exists(confpath):
conf_out = op.join(basepath, "conf.py") conf_out = op.join(basepath, "conf.py")
filereplace(confpath, conf_out, **confrepl) filereplace(confpath, conf_out, **confrepl)
# Call the sphinx_build function, which is the same as doing sphinx-build from cli if LooseVersion(get_distribution("sphinx").version) >= LooseVersion("1.7.0"):
try: from sphinx.cmd.build import build_main as sphinx_build
sphinx_build([basepath, destpath])
except SystemExit: # Call the sphinx_build function, which is the same as doing sphinx-build from cli
print( try:
"Sphinx called sys.exit(), but we're cancelling it because we don't actually want to exit" sphinx_build([basepath, destpath])
) except SystemExit:
print(
"Sphinx called sys.exit(), but we're cancelling it because we don't actually want to exit"
)
else:
# We used to call sphinx-build with print_and_do(), but the problem was that the virtualenv
# of the calling python wasn't correctly considered and caused problems with documentation
# relying on autodoc (which tries to import the module to auto-document, but fail because of
# missing dependencies which are in the virtualenv). Here, we do exactly what is done when
# calling the command from bash.
cmd = load_entry_point("Sphinx", "console_scripts", "sphinx-build")
try:
cmd(["sphinx-build", basepath, destpath])
except SystemExit:
print(
"Sphinx called sys.exit(), but we're cancelling it because we don't actually want to exit"
)

View File

@ -1,5 +1,5 @@
pytest>=6,<7 pytest>=5,<6
flake8 flake8
tox-travis tox-travis
black black
pyinstaller>=4.5,<5.0; sys_platform != 'linux' pyinstaller>=4.0,<5.0; sys_platform != 'linux'

View File

@ -1,7 +1,7 @@
Send2Trash>=1.3.0 Send2Trash>=1.3.0
sphinx>=3.0.0 sphinx>=1.2.2
polib>=1.1.0 polib>=1.0.4
hsaudiotag3k>=1.1.3* hsaudiotag3k>=1.1.3*
distro>=1.5.0 distro>=1.5.0
PyQt5 >=5.14.1,<6.0; sys_platform != 'linux' PyQt5 >=5.4,<6.0; sys_platform != 'linux'
pywin32>=228; sys_platform == 'win32' pywin32>=200; sys_platform == 'win32'