Modernize the package. (#27)

Author: pre-commit-ci[bot]

.github/workflows/main.yml

@@ -27,18 +27,24 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
 
     steps:
       - uses: actions/checkout@v4
       - uses: r-lib/actions/setup-tinytex@v2
         if: runner.os != 'Windows'
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: mamba-org/setup-micromamba@v1
         with:
-          auto-update-conda: true
-          python-version: ${{ matrix.python-version }}
-          channels: conda-forge,nodefaults
-          miniforge-variant: Mambaforge
+          environment-name: gha-testing
+          condarc: |
+            channels:
+              - nodefaults
+              - conda-forge
+          create-args: >-
+            python=${{ matrix.python-version }}
+            mamba
+            tox-conda
+          cache-environment: true
 
       - name: Install MacOS dependencies.
         if: runner.os == 'macOS'
@@ -61,7 +67,7 @@ jobs:
         run: tox -e pytest -- src tests -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto
 
       - name: Upload coverage report for unit tests and doctests.
-        if: runner.os == 'Linux' && matrix.python-version == '3.9'
+        if: runner.os == 'Linux' && matrix.python-version == '3.10'
         shell: bash -l {0}
         run: bash <(curl -s https://codecov.io/bash) -F unit -c
 
@@ -70,6 +76,6 @@ jobs:
         run: tox -e pytest -- src tests -m end_to_end --cov=./ --cov-report=xml -n auto
 
       - name: Upload coverage reports of end-to-end tests.
-        if: runner.os == 'Linux' && matrix.python-version == '3.9'
+        if: runner.os == 'Linux' && matrix.python-version == '3.10'
         shell: bash -l {0}
         run: bash <(curl -s https://codecov.io/bash) -F end_to_end -c

.pre-commit-config.yaml

@@ -17,30 +17,30 @@ repos:
     -   id: python-no-log-warn
     -   id: python-use-type-annotations
     -   id: text-unicode-replacement-char
--   repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.9.0
+-   repo: https://github.com/asottile/reorder-python-imports
+    rev: v3.11.0
     hooks:
     -   id: reorder-python-imports
-        args: [--py37-plus, --add-import, 'from __future__ import annotations']
+        args: [--py38-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.2.0
+    rev: v2.4.0
     hooks:
     -   id: setup-cfg-fmt
 -   repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.9.1
     hooks:
     -   id: black
 -   repo: https://github.com/asottile/blacken-docs
-    rev: 1.13.0
+    rev: 1.16.0
     hooks:
     -   id: blacken-docs
         additional_dependencies: [black]
--   repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.241
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.0.291
     hooks:
       - id: ruff
 -   repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.16
+    rev: 0.7.17
     hooks:
     -   id: mdformat
         additional_dependencies: [
@@ -55,11 +55,11 @@ repos:
     -   id: interrogate
         args: [-v, --fail-under=40, src, tests]
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.2.2
+    rev: v2.2.5
     hooks:
     -   id: codespell
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v0.991'
+    rev: 'v1.5.1'
     hooks:
     -   id: mypy
         args: [

CHANGES.md

@@ -3,9 +3,10 @@
 This is a record of all past latex-dependency-scanner releases and what went into them
 in reverse chronological order. Releases follow [semantic versioning](https://semver.org/) and all releases are available on [PyPI](https://pypi.org/project/latex-dependency-scanner) and [Anaconda.org](https://anaconda.org/pytask/latex-dependency-scanner).
 
-## 0.1.2 - 2022-xx-xx
+## 0.1.2 - 2023-10-02
 
 - {pull}`21` updates the readme and other infrastructure files.
+- {pull}`27` modernizes the package and deprecates Python 3.7.
 
 ## 0.1.1 - 2022-02-08
 

environment.yml

@@ -5,7 +5,7 @@ channels:
   - nodefaults
 
 dependencies:
-  - python >=3.7
+  - python >=3.8
   - pip
   - setuptools-scm
   - toml

pyproject.toml

@@ -25,6 +25,7 @@ ignore_errors = true
 
 
 [tool.ruff]
+target-version = "py38"
 select = ["ALL"]
 fix = true
 extend-ignore = [

setup.cfg

@@ -7,7 +7,7 @@ url = https://github.com/pytask-dev/latex-dependency-scanner
 author = Tobias Raabe
 author_email = [email protected]
 license = MIT
-license_file = LICENSE
+license_files = LICENSE
 platforms = any
 classifiers =
     Development Status :: 3 - Alpha
@@ -23,7 +23,7 @@ project_urls =
 
 [options]
 packages = find:
-python_requires = >=3.7
+python_requires = >=3.8
 package_dir = =src
 zip_safe = False
 

src/latex_dependency_scanner/compile.py

@@ -26,7 +26,7 @@ def compile_pdf(
         raise RuntimeError("'latexmk' must be on PATH to compile a LaTeX document.")
 
     cmd = _prepare_cmd_options(latex_document, compiled_document, args)
-    return subprocess.run(cmd, check=True)
+    return subprocess.run(cmd, check=True)  # noqa: S603
 
 
 def _prepare_cmd_options(
@@ -67,7 +67,10 @@ def _prepare_cmd_options(
         os.path.relpath(compiled_document.parent, latex_document.parent)
     ).as_posix()
 
-    return ["latexmk", *args, *jobname] + [
+    return [
+        "latexmk",
+        *args,
+        *jobname,
         f"--output-directory={out_relative_to_latex_source}",
         latex_document.as_posix(),
     ]

src/latex_dependency_scanner/scanner.py

@@ -60,13 +60,12 @@ def scan(paths: Path | list[Path]) -> list[Path]:
 
     nodes: list[Path] = []
     for node in paths:
-        for node_ in yield_nodes_from_node(node, nodes):
-            nodes.append(node_)
+        nodes.extend(yield_nodes_from_node(node, nodes))
 
     return nodes
 
 
-def yield_nodes_from_node(  # noqa: C901
+def yield_nodes_from_node(  # noqa: C901, PLR0912
     node: Path,
     nodes: list[Path],
     relative_to: Path | None = None,
@@ -110,9 +109,13 @@ def yield_nodes_from_node(  # noqa: C901
         for path in match.group("file").split(","):
             if path:
                 if match.group("type") == "import":
-                    path = relative_to.joinpath(match.group("relative_to"), path)
+                    path = relative_to.joinpath(  # noqa: PLW2901
+                        match.group("relative_to"), path
+                    )
                 elif match.group("type") == "subimport":
-                    path = node.parent.joinpath(match.group("relative_to"), path)
+                    path = node.parent.joinpath(  # noqa: PLW2901
+                        match.group("relative_to"), path
+                    )
                     relative_to = path.parent
                 else:
                     pass
@@ -152,9 +155,8 @@ def yield_nodes_from_node(  # noqa: C901
                             yield from yield_nodes_from_node(
                                 path_w_ext, nodes, relative_to
                             )
-                        else:
-                            if path_w_ext not in nodes:
-                                yield path_w_ext
+                        elif path_w_ext not in nodes:
+                            yield path_w_ext
 
                         # Stop loop, if a file has been found.
                         break

tox.ini

@@ -15,18 +15,6 @@ conda_deps =
 commands =
     pytest {posargs}
 
-[flake8]
-docstring-convention = numpy
-ignore =
-    D     ; ignore missing docstrings.
-    E203  ; ignore whitespace around : which is enforced by Black.
-    W503  ; ignore linebreak before binary operator which is enforced by Black.
-    PT006 ; ignore that parametrizing tests with tuple argument names is preferred.
-    PT023 ; ignores parentheses at the end of markers.
-max-line-length = 88
-warn-symbols =
-    pytest.mark.wip = Remove 'wip' mark for tests.
-
 [pytest]
 testpaths =
     src