Merge branch 'master' into dependabot/pip/sphinx-8.0.2

aio-libs · Sep 10, 2024 · b7b81f2 · b7b81f2
2 parents 76f27a9 + 9cd7e6b
commit b7b81f2
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 17 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -7,6 +7,8 @@ codecov:
 
   require_ci_to_pass: false
 
+  token: 796e466d-bf08-4b98-8d5b-0e9c442aef06  # repo-scoped
+
 comment:
   require_changes: true
 

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -360,8 +360,9 @@ jobs:
         coverage xml
       shell: bash
     - name: Send coverage data to Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
+        fail_ci_if_error: true
         files: coverage.xml
         flags: >-
           CI-GHA,

diff --git a/.github/workflows/reusable-linters.yml b/.github/workflows/reusable-linters.yml
@@ -61,7 +61,7 @@ jobs:
       run: |
         make lint
     - name: Send coverage data to Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.codecov-token }}
         files: >-
@@ -72,7 +72,7 @@ jobs:
         flags: >-
           CI-GHA,
           MyPy
-        fail_ci_if_error: false
+        fail_ci_if_error: true
     - name: Install spell checker
       run: |
         sudo apt install libenchant-2-dev

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -155,8 +155,8 @@ repos:
     additional_dependencies:
     - types-docutils
     - lxml  # dep of `--txt-report`, `--cobertura-xml-report` & `--html-report`
-    - pytest < 8
-    - Sphinx >= 5.3.0, < 6
+    - pytest
+    - Sphinx >= 5.3.0
     args:
     - --python-version=3.8
     - --txt-report=.tox/.tmp/.mypy/python-3.8

diff --git a/CHANGES/.TEMPLATE.rst b/CHANGES/.TEMPLATE.rst
@@ -12,9 +12,11 @@
 
 {% if definitions[category]['showcontent'] %}
 {% for text, change_note_refs in sections[section][category].items() %}
-- {{ text + '\n' }}
+- {{ text }}
 
-  {#
+  {{- '\n' * 2 -}}
+
+  {#-
       NOTE: Replacing 'e' with 'f' is a hack that prevents Jinja's `int`
       NOTE: filter internal implementation from treating the input as an
       NOTE: infinite float when it looks like a scientific notation (with a
@@ -45,20 +47,23 @@
     {%- endfor -%}
   {%- endwith -%}
 
-  {% if pr_issue_numbers -%}
+  {% if pr_issue_numbers %}
   *Related issues and pull requests on GitHub:*
   :issue:`{{ pr_issue_numbers | join('`, :issue:`') }}`.
-  {% endif %}
+  {{- '\n' * 2 -}}
+  {%- endif -%}
 
-  {% if commit_refs -%}
+  {% if commit_refs %}
   *Related commits on GitHub:*
   :commit:`{{ commit_refs | join('`, :commit:`') }}`.
-  {% endif %}
+  {{- '\n' * 2 -}}
+  {%- endif -%}
 
-  {% if arbitrary_refs -%}
+  {% if arbitrary_refs %}
   *Unlinked references:*
-  {{ arbitrary_refs | join(', ') }}`.
-  {% endif %}
+  {{ arbitrary_refs | join(', ') }}.
+  {{- '\n' * 2 -}}
+  {%- endif -%}
 
 {% endfor %}
 {% else %}

diff --git a/docs/conf.py b/docs/conf.py
@@ -37,7 +37,7 @@
 )
 if IS_RELEASE_ON_RTD:
     tags: set[str]
-    tags.add("is_release")
+    tags.add("is_release")  # noqa: F821
 
 
 _docs_path = Path(__file__).parent

diff --git a/pytest.ini b/pytest.ini
@@ -26,8 +26,8 @@ addopts =
 
   # `pytest-cov`:
   --cov
-  --cov-context=test
   --cov-config=.coveragerc
+  --cov-context=test
 
   # Fail on config parsing warnings:
   # --strict-config
@@ -80,3 +80,5 @@ norecursedirs =
   *.egg
 
 testpaths = tests/
+
+xfail_strict = true
diff --git a/requirements/pytest.txt b/requirements/pytest.txt
@@ -1,2 +1,2 @@
-pytest==8.3.2; python_version >= "3.8"
+pytest==8.3.2
 pytest-cov==5.0.0