Skip to content

Commit

Permalink
CLEANUP: remove py3xiv2 (wip)
Browse files Browse the repository at this point in the history
  • Loading branch information
jcjgraf committed Feb 25, 2022
1 parent ffccaa5 commit 62576fa
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 13 deletions.
1 change: 0 additions & 1 deletion misc/requirements/requirements_pyexiv2.txt

This file was deleted.

1 change: 0 additions & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ markers =
imageformats: Require retrieving images from the web to test additional formats
exif: Require exif support
piexif: Require piexif
pyexiv2: Require pyexiv2
noexif: Requires exif support NOT to be available
ci: Run test only on ci
ci_skip: Skip test on ci
6 changes: 0 additions & 6 deletions tests/unit/test_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,10 @@ def test_no_svg_support_info(no_svg_support):
assert "svg support: false" in version.info().lower()


@pytest.mark.pyexiv2
def test_pyexiv2_info():
assert exif.pyexiv2.__version__ in version.info()


@pytest.mark.piexif
def test_piexif_info():
assert exif.piexif.VERSION in version.info()


def test_no_exif_support_info(noexif):
assert "piexif: none" in version.info().lower()
assert "pyexiv2: none" in version.info().lower()
4 changes: 0 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ passenv = PYTHONPATH CI USER HOME XDG_* DISPLAY
basepython = {env:PYTHON:python3}
deps =
-r{toxinidir}/misc/requirements/requirements_tests.txt
-r{toxinidir}/misc/requirements/requirements_pyexiv2.txt
-r{toxinidir}/misc/requirements/requirements_piexif.txt
pyqt: -r{toxinidir}/misc/requirements/requirements.txt
pyqt511: PyQt5==5.11.3
Expand Down Expand Up @@ -40,7 +39,6 @@ deps =
ignore_errors = true
deps =
-r{toxinidir}/misc/requirements/requirements.txt
-r{toxinidir}/misc/requirements/requirements_pyexiv2.txt
-r{toxinidir}/misc/requirements/requirements_lint.txt
commands =
pylint vimiv scripts/pylint_checkers
Expand All @@ -62,7 +60,6 @@ commands =
passenv = PYTHONPATH CI TERM
deps =
-r{toxinidir}/misc/requirements/requirements.txt
-r{toxinidir}/misc/requirements/requirements_pyexiv2.txt
-r{toxinidir}/misc/requirements/requirements_piexif.txt
-r{toxinidir}/misc/requirements/requirements_mypy.txt
commands = mypy vimiv
Expand All @@ -73,7 +70,6 @@ envdir = {toxinidir}/.venv
usedevelop = true
deps =
-r{toxinidir}/misc/requirements/requirements.txt
-r{toxinidir}/misc/requirements/requirements_pyexiv2.txt
commands = {envpython} -c ""

# Create a virtual environment to build the documentation
Expand Down
1 change: 0 additions & 1 deletion vimiv/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ def info() -> str:
f"Qt: {QT_VERSION_STR}\n"
f"PyQt: {PYQT_VERSION_STR}\n\n"
f"Svg Support: {bool(QtSvg)}\n"
f"Pyexiv2: {exif.pyexiv2.__version__ if exif.pyexiv2 is not None else None}\n"
f"Piexif: {exif.piexif.VERSION if exif.piexif is not None else None}"
)

Expand Down

0 comments on commit 62576fa

Please sign in to comment.