appotry · pull · Jan 18, 2023 · Jan 18, 2023 · Jan 19, 2023 · Jan 20, 2023
diff --git a/setup.cfg → .flake8 b/setup.cfg → .flake8
@@ -1,27 +1,6 @@
-[global]
-;command_packages = distcmds
-
-[bdist_rpm]
-release = 1
-packager = Bastian Kleineidam <bastian.kleineidam@web.de>
-doc_files = doc/examples/
-    cgi-bin/lconline/
-provides = linkchecker
-group = Applications/Internet
-install_script = install-rpm.sh
-python = python
-
-[bdist_wheel]
-universal = 0
-
-[check-manifest]
-ignore-bad-ideas = *.mo
-ignore = *.rej
-
 [flake8]
 filename =
     *.py
-    ./linkchecker
 extend-exclude =
     build/
     _LinkChecker_configdata.py
@@ -36,8 +15,6 @@ per-file-ignores =
 # In several files imports intentionally cause:
 # E402: module level import not at top of file
 # F401: module imported but unused
-    linkchecker: E402
-    setup.py: E402
     doc/src/conf.py: E402,F821
     linkcheck/__init__.py: E402,F401
     linkcheck/checker/httpurl.py: E402
@@ -47,11 +24,14 @@ per-file-ignores =
 # E501: line too long
     linkcheck/ftpparse.py: E501
     linkcheck/checker/unknownurl.py: E501
+    linkcheck/command/arg_parser.py: E501
     scripts/update_iana_uri_schemes.py: E501
     tests/test_ftpparse.py: E501
 # F821 undefined name
 # https://github.com/PyCQA/pyflakes/issues/548
     linkcheck/logger/__init__.py: F821
+# F824 name is never assigned in scope
+    linkcheck/strformat.py: F824
 extend-ignore =
 # https://pep8.readthedocs.org/en/latest/intro.html#error-codes
 # these are ignored by default:

diff --git a/.git_archival.txt b/.git_archival.txt
@@ -0,0 +1,3 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,3 @@
+.git_archival.txt export-subst
 .gitattributes export-ignore  
 .gitignore export-ignore
-/doc/web export-ignore
-.travis.yml export-ignore
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -11,6 +11,9 @@
  2. 
  3. 
 
+<!-- Reporting a minimal example that reproduces the problem in the text of
+the issue can increase the chance of a solution significantly. -->
+
 ## Actual result
 
 ## Expected result
@@ -23,16 +26,18 @@
  * Linkchecker version: <!-- linkchecker --version -->
  * Python version: <!-- python --version -->
  * Install method: <!-- distribution package, PyPI, from source tarball, from git, etc -->
- * Site URL: <!-- e.g. https://example.com/... -->
 
-## Configuration file
+## Configuration
 
-<!-- include full contents of your configuration file, ~/.linkchecker/linkcheckerrc -->
+<!-- Include the output of `linkchecker -Dcmdline -q -f <FILENAME>` inline, not as an attachment, -->
+<!-- you may want to substitute any sensitive strings, make sure any substitutions are consistent -->
+<!-- in the reported result and logs. -->
+<!-- (if you don't use -f/--config when reproducing the problem omit that option here). -->
 
 ## Logs
 
-<!-- Include full log of the linkchecker run, with --verbose -->
-<!-- Also include the exact commandline used -->
+<!-- The exact command line used -->
+<!-- Rerun with -Dall and include all relevant lines -->
 <!-- If a Traceback happened include it in full as well -->
 
 ## Other notes

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/.github/workflows/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/branch-man.yml b/.github/workflows/branch-man.yml
@@ -0,0 +1,57 @@
+name: Create a branch with updated man pages and application translations
+
+on: workflow_dispatch
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          repository: linkchecker/linkchecker
+          ref: master
+          # Needed for hatch-vcs to extract LinkChecker version from tag
+          # https://github.com/actions/checkout/issues/249
+          fetch-depth: 0
+
+      - name: Install Ubuntu packages
+        run: sudo apt install gettext git
+
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.x"
+
+      - name: Install Python packages
+        run: >
+            pip3 install dnspython beautifulsoup4 requests \
+                         hatchling hatch-vcs sphinx sphinx_epytext \
+                         sphinx_rtd_theme sphinx-sitemap sphinx-intl
+
+      - name: Prepare git environment
+        run: |
+            git config user.email "linkchecker@linkchecker.github.io"
+            git config user.name "LinkChecker"
+            git checkout -b man-updates
+            git remote add local ${{ github.server_url }}/${{ github.repository }}
+
+      - name: Build man pages
+        run: |
+            python3 -m hatchling build -t sdist --hooks-only
+            make -C doc locale
+            git commit -a -m "Update doc translation catalogs"
+            make -C doc man
+            git commit -a -m "Update man pages"
+
+      - name: Build application translations catalogs
+        run: |
+            rm -f po/linkchecker.pot
+            make -C po
+            git commit -a -m "Update application translation catalogs"
+
+      - name: Push changes
+        run: >
+            git push --set-upstream local man-updates
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,5 +1,7 @@
 # NB: this name is used in the status badge, where we want to see "build: passing"
 name: build
+permissions:
+  contents: read
 
 on:
   push:
@@ -20,59 +22,73 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.6"
-          - "3.7"
-          - "3.8"
-          - "3.9"
-          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
+          - "3.14"
+        toxenv: [py]
+        include:
+          - python-version: "3.10"
+            toxenv: minreqs
+
+    services:
+      httpbin:
+        image: ghcr.io/psf/httpbin:0.10.2
+        ports:
+          - 8080:8080
 
     steps:
       - name: Install OS dependencies
         run: |
-          sudo apt install -y clamav-daemon geoip-database libgeoip-dev gettext
-
-      - name: Download the ClamAV signature database
-        run: |
-          sudo service clamav-freshclam stop
-          sudo freshclam
-          sudo service clamav-daemon restart
-          sudo service clamav-daemon status
+          sudo apt-get update
+          sudo apt-get install -y geoip-database libgeoip-dev gettext
 
       - name: Git clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
+        with:
+          show-progress: false
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
           python-version: "${{ matrix.python-version }}"
+          allow-prereleases: true
 
       - name: Pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('tox.ini', 'setup.py') }}
+          key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('tox.ini', 'pyproject.toml') }}
           restore-keys: |
             ${{ runner.os }}-pip-${{ matrix.python-version }}-
             ${{ runner.os }}-pip-
 
       - name: Install Python dependencies
+        # coverage is required by coverallsapp/github-action
         run: |
           python -m pip install -U pip
-          python -m pip install -U setuptools wheel
-          python -m pip install -U tox coveralls
-
-      - name: Wait for ClamAV to be ready
-        run: |
-          while ! test -S /var/run/clamav/clamd.ctl; do printf "."; sleep 1; done
+          python -m pip install -U hatchling hatch-vcs polib
+          python -m pip install -U tox coverage
 
       - name: Run tests
-        run: python -m tox -e py
+        run: |
+            python -m hatchling build -t sdist --hooks-only
+            python -m tox -e ${{ matrix.toxenv }}-geoip
 
       - name: Report to coveralls
-        run: coveralls
-        env:
-          COVERALLS_SERVICE_NAME: github
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b  # v2.3.6
+        with:
+          parallel: true
+          flag-name: run-${{ matrix.python-version }}
+
+  finish:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Close coveralls parallel build
+        uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b  # v2.3.6
+        with:
+          parallel-finished: true
 
   docs:
     # there's some overlap with publish-pages.yml, but this one runs on pull
@@ -82,17 +98,21 @@ jobs:
 
     steps:
       - name: Git clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
+        with:
+          show-progress: false
 
       - name: Install Ubuntu packages
         run: |
-          sudo apt install -y graphviz mandoc
+          sudo apt-get install -y graphviz mandoc
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.x"
 
       - name: Pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-docs-${{ hashFiles('tox.ini') }}
@@ -102,12 +122,13 @@ jobs:
 
       - name: Install Python packages
         run: |
-          pip install -r requirements.txt Sphinx sphinx-epytext sphinx-intl sphinx-rtd-theme
+          pip install -U dnspython beautifulsoup4 requests \
+            hatchling hatch-vcs sphinx sphinx-epytext \
+            sphinx-intl sphinx-rtd-theme sphinx-sitemap
 
       - name: Build
         run: |
-          python3 setup.py build
-          make -C doc code
+          python3 -m hatchling build -t sdist --hooks-only
           make -C doc html
           make -C doc locale
           make -C doc man
@@ -121,18 +142,23 @@ jobs:
       matrix:
         toxenv:
           - flake8
-          - check-manifest
           - check-python-versions
+          - pylint
+          - yamllint
 
     steps:
       - name: Git clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
+        with:
+          show-progress: false
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.x"
 
       - name: Pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ matrix.toxenv }}-${{ hashFiles('tox.ini') }}
@@ -143,22 +169,8 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install -U pip
-          python -m pip install -U setuptools wheel
+          python -m pip install -U hatchling hatch-vcs polib
           python -m pip install -U tox
 
       - name: Run ${{ matrix.toxenv }}
         run: python -m tox -e ${{ matrix.toxenv }}
-
-  translations:
-    name: Check Translations
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Git clone
-        uses: actions/checkout@v2
-
-      - name: Install dependency
-        run: sudo apt install -y gettext
-
-      - name: Compile translations
-        run: for po in po/*.po; do msgfmt -cv --statistics -o - ${po} >/dev/null; done