From 978140597689da034bb7dd3129bebcd1d8fc453b Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:56:34 +0000 Subject: [PATCH 01/21] Updated files with 'repo_helper'. (#24) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/docs_test_action.yml | 2 +- .github/workflows/flake8.yml | 4 ++-- .github/workflows/mypy.yml | 4 ++-- .github/workflows/python_ci.yml | 8 ++++---- .github/workflows/python_ci_linux.yml | 16 ++++++++-------- .github/workflows/python_ci_macos.yml | 8 ++++---- .pre-commit-config.yaml | 12 ++++++------ .readthedocs.yml | 3 +++ README.rst | 2 +- doc-source/index.rst | 2 +- doc-source/requirements.txt | 2 +- tox.ini | 3 ++- 12 files changed, 35 insertions(+), 31 deletions(-) diff --git a/.github/workflows/docs_test_action.yml b/.github/workflows/docs_test_action.yml index b09bde3..8f60ba5 100644 --- a/.github/workflows/docs_test_action.yml +++ b/.github/workflows/docs_test_action.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files uses: dorny/paths-filter@v2 diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 8221173..0a8c0c3 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files uses: dorny/paths-filter@v2 @@ -33,7 +33,7 @@ jobs: - name: Setup Python 🐍 if: steps.changes.outputs.code == 'true' - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "3.8" diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 9b28b5f..10c6f30 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files uses: dorny/paths-filter@v2 @@ -38,7 +38,7 @@ jobs: - name: Setup Python 🐍 if: steps.changes.outputs.code == 'true' - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "3.8" diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index b6472e4..b2ba021 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.1' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3' strategy: fail-fast: False @@ -35,11 +35,11 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.1", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -54,7 +54,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "${{ matrix.config.python-version }}" diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 793eb05..d167920 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.1' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3' strategy: fail-fast: False @@ -36,11 +36,11 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.1", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -55,7 +55,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "${{ matrix.config.python-version }}" @@ -85,10 +85,10 @@ jobs: runs-on: "ubuntu-20.04" steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Setup Python 🐍 - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: 3.8 @@ -134,11 +134,11 @@ jobs: runs-on: "ubuntu-20.04" steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" if: startsWith(github.ref, 'refs/tags/') - name: Setup Python 🐍 - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" if: startsWith(github.ref, 'refs/tags/') with: python-version: 3.8 diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 603283a..614eb2f 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.1' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3' strategy: fail-fast: False @@ -35,11 +35,11 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.1", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -54,7 +54,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "${{ matrix.config.python-version }}" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 82c1cd2..5f94da1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.9.0 + rev: v0.9.1 hooks: - id: reformat-pyproject @@ -43,13 +43,13 @@ repos: - id: bind-requirements - repo: https://github.com/domdfcoding/flake8-dunder-all - rev: v0.3.0 + rev: v0.3.1 hooks: - id: ensure-dunder-all files: ^snippet_fmt/.*\.py$ - repo: https://github.com/domdfcoding/flake2lint - rev: v0.4.2 + rev: v0.4.3 hooks: - id: flake2lint @@ -76,18 +76,18 @@ repos: - id: forbid-crlf - repo: https://github.com/python-formate/snippet-fmt - rev: v0.1.4 + rev: v0.1.5 hooks: - id: snippet-fmt - repo: https://github.com/python-formate/formate - rev: v0.5.0 + rev: v0.7.0 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ - repo: https://github.com/domdfcoding/dep_checker - rev: v0.7.1 + rev: v0.8.0 hooks: - id: dep_checker args: diff --git a/.readthedocs.yml b/.readthedocs.yml index 4a2ec5f..e928b70 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -19,3 +19,6 @@ build: jobs: post_create_environment: - pip install . + post_install: + - pip install sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==2.0.1 + sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 diff --git a/README.rst b/README.rst index 57ca7c8..73a448d 100644 --- a/README.rst +++ b/README.rst @@ -99,7 +99,7 @@ snippet-fmt :target: https://github.com/python-formate/snippet-fmt/commit/master :alt: GitHub last commit -.. |maintained| image:: https://img.shields.io/maintenance/yes/2023 +.. |maintained| image:: https://img.shields.io/maintenance/yes/2024 :alt: Maintenance .. |pypi-downloads| image:: https://img.shields.io/pypi/dm/snippet-fmt diff --git a/doc-source/index.rst b/doc-source/index.rst index 686e48c..275d957 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -104,7 +104,7 @@ snippet-fmt :last-commit: :alt: GitHub last commit - .. |maintained| maintained-shield:: 2023 + .. |maintained| maintained-shield:: 2024 :alt: Maintenance .. |pypi-downloads| pypi-shield:: diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt index e76c14d..6c9404a 100644 --- a/doc-source/requirements.txt +++ b/doc-source/requirements.txt @@ -2,7 +2,7 @@ git+https://github.com/domdfcoding/sphinx-click.git git+https://github.com/sphinx-toolbox/sphinx-toolbox-experimental.git default-values>=0.6.0 extras-require>=0.5.0 -furo>=2020.11.19b18 +furo==2021.06.18b36 html-section>=0.3.0 seed-intersphinx-mapping>=1.2.2 sphinx>=3.0.3 diff --git a/tox.ini b/tox.ini index 90482e2..a888d6f 100644 --- a/tox.ini +++ b/tox.ini @@ -99,7 +99,8 @@ changedir = {toxinidir} deps = build[virtualenv]>=0.3.1 check-wheel-contents>=0.1.0 - twine>=3.2.0 + twine>=3.2.0; python_version < "3.13" + twine@git+https://github.com/pypa/twine; python_version >= "3.13" cryptography<40; implementation_name == "pypy" and python_version <= "3.7" commands = python -m build --sdist --wheel "{toxinidir}" From b2ee0a2069bbae4a9cb47f026317372ffde4edab Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 4 Mar 2024 17:18:23 +0000 Subject: [PATCH 02/21] Update tests to account for changed JSON error message in Python 3.13 --- tests/test_snippet_fmt.py | 23 ++- ..._rst_json_caps_indent_new_error_msg_0_.rst | 143 +++++++++++++++++ ..._rst_json_caps_indent_new_error_msg_0_.yml | 6 + ..._rst_json_caps_indent_new_error_msg_1_.rst | 143 +++++++++++++++++ ..._rst_json_caps_indent_new_error_msg_1_.yml | 4 + ..._rst_json_caps_indent_new_error_msg_2_.rst | 143 +++++++++++++++++ ..._rst_json_caps_indent_new_error_msg_2_.yml | 4 + ..._rst_json_caps_indent_new_error_msg_3_.rst | 143 +++++++++++++++++ ..._rst_json_caps_indent_new_error_msg_3_.yml | 4 + ..._rst_json_caps_indent_new_error_msg_4_.rst | 143 +++++++++++++++++ ..._rst_json_caps_indent_new_error_msg_4_.yml | 6 + ..._rst_json_caps_indent_new_error_msg_5_.rst | 143 +++++++++++++++++ ..._rst_json_caps_indent_new_error_msg_5_.yml | 6 + ..._rst_json_caps_indent_new_error_msg_6_.rst | 143 +++++++++++++++++ ..._rst_json_caps_indent_new_error_msg_6_.yml | 6 + ..._rst_json_caps_indent_new_error_msg_7_.rst | 143 +++++++++++++++++ ..._rst_json_caps_indent_new_error_msg_7_.yml | 6 + ...example_rst_json_caps_new_error_msg_0_.rst | 143 +++++++++++++++++ ...example_rst_json_caps_new_error_msg_0_.yml | 6 + ...example_rst_json_caps_new_error_msg_1_.rst | 143 +++++++++++++++++ ...example_rst_json_caps_new_error_msg_1_.yml | 4 + ...example_rst_json_caps_new_error_msg_2_.rst | 143 +++++++++++++++++ ...example_rst_json_caps_new_error_msg_2_.yml | 4 + ...example_rst_json_caps_new_error_msg_3_.rst | 143 +++++++++++++++++ ...example_rst_json_caps_new_error_msg_3_.yml | 4 + ...example_rst_json_caps_new_error_msg_4_.rst | 143 +++++++++++++++++ ...example_rst_json_caps_new_error_msg_4_.yml | 6 + ...example_rst_json_caps_new_error_msg_5_.rst | 143 +++++++++++++++++ ...example_rst_json_caps_new_error_msg_5_.yml | 6 + ...example_rst_json_caps_new_error_msg_6_.rst | 143 +++++++++++++++++ ...example_rst_json_caps_new_error_msg_6_.yml | 6 + ...example_rst_json_caps_new_error_msg_7_.rst | 143 +++++++++++++++++ ...example_rst_json_caps_new_error_msg_7_.yml | 6 + ...ample_rst_json_indent_new_error_msg_0_.rst | 149 ++++++++++++++++++ ...ample_rst_json_indent_new_error_msg_0_.yml | 32 ++++ ...ample_rst_json_indent_new_error_msg_1_.rst | 143 +++++++++++++++++ ...ample_rst_json_indent_new_error_msg_1_.yml | 4 + ...ample_rst_json_indent_new_error_msg_2_.rst | 143 +++++++++++++++++ ...ample_rst_json_indent_new_error_msg_2_.yml | 4 + ...ample_rst_json_indent_new_error_msg_3_.rst | 143 +++++++++++++++++ ...ample_rst_json_indent_new_error_msg_3_.yml | 4 + ...ample_rst_json_indent_new_error_msg_4_.rst | 149 ++++++++++++++++++ ...ample_rst_json_indent_new_error_msg_4_.yml | 32 ++++ ...ample_rst_json_indent_new_error_msg_5_.rst | 149 ++++++++++++++++++ ...ample_rst_json_indent_new_error_msg_5_.yml | 32 ++++ ...ample_rst_json_indent_new_error_msg_6_.rst | 149 ++++++++++++++++++ ...ample_rst_json_indent_new_error_msg_6_.yml | 32 ++++ ...ample_rst_json_indent_new_error_msg_7_.rst | 149 ++++++++++++++++++ ...ample_rst_json_indent_new_error_msg_7_.yml | 32 ++++ ..._fmt_example_rst_json_new_error_msg_0_.rst | 143 +++++++++++++++++ ..._fmt_example_rst_json_new_error_msg_0_.yml | 4 + ..._fmt_example_rst_json_new_error_msg_1_.rst | 143 +++++++++++++++++ ..._fmt_example_rst_json_new_error_msg_1_.yml | 4 + ..._fmt_example_rst_json_new_error_msg_2_.rst | 143 +++++++++++++++++ ..._fmt_example_rst_json_new_error_msg_2_.yml | 4 + ..._fmt_example_rst_json_new_error_msg_3_.rst | 143 +++++++++++++++++ ..._fmt_example_rst_json_new_error_msg_3_.yml | 4 + ..._fmt_example_rst_json_new_error_msg_4_.rst | 143 +++++++++++++++++ ..._fmt_example_rst_json_new_error_msg_4_.yml | 4 + ..._fmt_example_rst_json_new_error_msg_5_.rst | 143 +++++++++++++++++ ..._fmt_example_rst_json_new_error_msg_5_.yml | 4 + ..._fmt_example_rst_json_new_error_msg_6_.rst | 143 +++++++++++++++++ ..._fmt_example_rst_json_new_error_msg_6_.yml | 4 + ..._fmt_example_rst_json_new_error_msg_7_.rst | 143 +++++++++++++++++ ..._fmt_example_rst_json_new_error_msg_7_.yml | 4 + 65 files changed, 4915 insertions(+), 2 deletions(-) create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_0_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_0_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_1_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_1_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_2_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_2_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_3_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_3_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_4_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_4_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_5_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_5_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_6_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_6_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_7_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_7_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_0_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_0_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_1_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_1_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_2_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_2_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_3_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_3_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_4_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_4_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_5_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_5_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_6_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_6_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_7_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_7_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_0_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_0_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_1_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_1_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_2_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_2_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_3_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_3_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_4_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_4_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_5_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_5_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_6_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_6_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_7_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_7_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_0_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_0_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_1_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_1_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_2_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_2_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_3_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_3_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_4_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_4_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_5_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_5_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_6_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_6_.yml create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_7_.rst create mode 100644 tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_7_.yml diff --git a/tests/test_snippet_fmt.py b/tests/test_snippet_fmt.py index c4ff36c..e844883 100644 --- a/tests/test_snippet_fmt.py +++ b/tests/test_snippet_fmt.py @@ -7,6 +7,7 @@ from _pytest.capture import CaptureResult from coincidence import AdvancedDataRegressionFixture, AdvancedFileRegressionFixture from coincidence.params import param +from coincidence.selectors import max_version, min_version from consolekit.terminal_colours import strip_ansi from consolekit.testing import CliRunner, Result from domdf_python_tools.paths import PathPlus, TemporaryPathPlus, in_directory @@ -52,15 +53,33 @@ {"ini": {"reformat": True}, "python": {"reformat": False}}, id="ini_python_false", ), - pytest.param({"JSON": {"reformat": True}}, id="json_caps"), - pytest.param({"json": {"reformat": True}}, id="json"), + pytest.param({"JSON": {"reformat": True}}, id="json_caps", marks=max_version("3.12")), + pytest.param( + {"JSON": {"reformat": True}}, + id="json_caps_new_error_msg", + marks=min_version("3.13"), + ), + pytest.param({"json": {"reformat": True}}, id="json", marks=max_version("3.12")), + pytest.param({"json": {"reformat": True}}, id="json_new_error_msg", marks=min_version("3.13")), pytest.param( {"JSON": {"reformat": True, "indent": 2}, "json": {"reformat": True}}, id="json_caps_indent", + marks=max_version("3.12"), + ), + pytest.param( + {"JSON": {"reformat": True, "indent": 2}, "json": {"reformat": True}}, + id="json_caps_indent_new_error_msg", + marks=min_version("3.13"), ), pytest.param( {"json": {"reformat": True, "indent": 2}, "JSON": {"reformat": True}}, id="json_indent", + marks=max_version("3.12"), + ), + pytest.param( + {"json": {"reformat": True, "indent": 2}, "JSON": {"reformat": True}}, + id="json_indent_new_error_msg", + marks=min_version("3.13"), ), ] ) diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_0_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_0_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_0_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_0_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_0_.yml new file mode 100644 index 0000000..c8c826f --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_0_.yml @@ -0,0 +1,6 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_1_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_1_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_1_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_1_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_1_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_1_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_2_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_2_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_2_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_2_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_2_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_2_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_3_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_3_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_3_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_3_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_3_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_3_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_4_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_4_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_4_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_4_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_4_.yml new file mode 100644 index 0000000..c8c826f --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_4_.yml @@ -0,0 +1,6 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_5_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_5_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_5_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_5_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_5_.yml new file mode 100644 index 0000000..c8c826f --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_5_.yml @@ -0,0 +1,6 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_6_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_6_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_6_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_6_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_6_.yml new file mode 100644 index 0000000..c8c826f --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_6_.yml @@ -0,0 +1,6 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_7_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_7_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_7_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_7_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_7_.yml new file mode 100644 index 0000000..c8c826f --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_indent_new_error_msg_7_.yml @@ -0,0 +1,6 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_0_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_0_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_0_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_0_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_0_.yml new file mode 100644 index 0000000..c8c826f --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_0_.yml @@ -0,0 +1,6 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_1_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_1_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_1_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_1_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_1_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_1_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_2_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_2_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_2_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_2_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_2_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_2_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_3_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_3_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_3_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_3_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_3_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_3_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_4_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_4_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_4_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_4_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_4_.yml new file mode 100644 index 0000000..c8c826f --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_4_.yml @@ -0,0 +1,6 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_5_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_5_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_5_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_5_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_5_.yml new file mode 100644 index 0000000..c8c826f --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_5_.yml @@ -0,0 +1,6 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_6_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_6_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_6_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_6_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_6_.yml new file mode 100644 index 0000000..c8c826f --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_6_.yml @@ -0,0 +1,6 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_7_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_7_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_7_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_7_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_7_.yml new file mode 100644 index 0000000..c8c826f --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_caps_new_error_msg_7_.yml @@ -0,0 +1,6 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_0_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_0_.rst new file mode 100644 index 0000000..5ebbed8 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_0_.rst @@ -0,0 +1,149 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + { + "key": "value", + "key2": "value2" + } + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + { + "key": "value", + "key2": "value2" + } + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_0_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_0_.yml new file mode 100644 index 0000000..742b675 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_0_.yml @@ -0,0 +1,32 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- "--- .../example.rst\t(original)" +- "+++ .../example.rst\t(reformatted)" +- '@@ -118,7 +118,10 @@' +- '' +- ' .. code-block:: json' +- '' +- "-\t{\"key\": \"value\", \"key2\": \"value2\"}" +- "+\t{" +- "+\t \"key\": \"value\"," +- "+\t \"key2\": \"value2\"" +- "+\t}" +- '' +- '' +- ' .. code-block:: bash' +- '@@ -135,7 +138,10 @@' +- '' +- " \t.. code-block:: json" +- '' +- "-\t\t{\"key\": \"value\", \"key2\": \"value2\"}" +- "+\t\t{" +- "+\t\t \"key\": \"value\"," +- "+\t\t \"key2\": \"value2\"" +- "+\t\t}" +- '' +- " \t.. code-block:: bash" +- '' +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_1_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_1_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_1_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_1_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_1_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_1_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_2_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_2_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_2_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_2_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_2_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_2_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_3_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_3_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_3_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_3_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_3_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_3_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_4_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_4_.rst new file mode 100644 index 0000000..5ebbed8 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_4_.rst @@ -0,0 +1,149 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + { + "key": "value", + "key2": "value2" + } + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + { + "key": "value", + "key2": "value2" + } + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_4_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_4_.yml new file mode 100644 index 0000000..742b675 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_4_.yml @@ -0,0 +1,32 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- "--- .../example.rst\t(original)" +- "+++ .../example.rst\t(reformatted)" +- '@@ -118,7 +118,10 @@' +- '' +- ' .. code-block:: json' +- '' +- "-\t{\"key\": \"value\", \"key2\": \"value2\"}" +- "+\t{" +- "+\t \"key\": \"value\"," +- "+\t \"key2\": \"value2\"" +- "+\t}" +- '' +- '' +- ' .. code-block:: bash' +- '@@ -135,7 +138,10 @@' +- '' +- " \t.. code-block:: json" +- '' +- "-\t\t{\"key\": \"value\", \"key2\": \"value2\"}" +- "+\t\t{" +- "+\t\t \"key\": \"value\"," +- "+\t\t \"key2\": \"value2\"" +- "+\t\t}" +- '' +- " \t.. code-block:: bash" +- '' +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_5_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_5_.rst new file mode 100644 index 0000000..5ebbed8 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_5_.rst @@ -0,0 +1,149 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + { + "key": "value", + "key2": "value2" + } + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + { + "key": "value", + "key2": "value2" + } + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_5_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_5_.yml new file mode 100644 index 0000000..742b675 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_5_.yml @@ -0,0 +1,32 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- "--- .../example.rst\t(original)" +- "+++ .../example.rst\t(reformatted)" +- '@@ -118,7 +118,10 @@' +- '' +- ' .. code-block:: json' +- '' +- "-\t{\"key\": \"value\", \"key2\": \"value2\"}" +- "+\t{" +- "+\t \"key\": \"value\"," +- "+\t \"key2\": \"value2\"" +- "+\t}" +- '' +- '' +- ' .. code-block:: bash' +- '@@ -135,7 +138,10 @@' +- '' +- " \t.. code-block:: json" +- '' +- "-\t\t{\"key\": \"value\", \"key2\": \"value2\"}" +- "+\t\t{" +- "+\t\t \"key\": \"value\"," +- "+\t\t \"key2\": \"value2\"" +- "+\t\t}" +- '' +- " \t.. code-block:: bash" +- '' +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_6_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_6_.rst new file mode 100644 index 0000000..5ebbed8 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_6_.rst @@ -0,0 +1,149 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + { + "key": "value", + "key2": "value2" + } + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + { + "key": "value", + "key2": "value2" + } + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_6_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_6_.yml new file mode 100644 index 0000000..742b675 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_6_.yml @@ -0,0 +1,32 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- "--- .../example.rst\t(original)" +- "+++ .../example.rst\t(reformatted)" +- '@@ -118,7 +118,10 @@' +- '' +- ' .. code-block:: json' +- '' +- "-\t{\"key\": \"value\", \"key2\": \"value2\"}" +- "+\t{" +- "+\t \"key\": \"value\"," +- "+\t \"key2\": \"value2\"" +- "+\t}" +- '' +- '' +- ' .. code-block:: bash' +- '@@ -135,7 +138,10 @@' +- '' +- " \t.. code-block:: json" +- '' +- "-\t\t{\"key\": \"value\", \"key2\": \"value2\"}" +- "+\t\t{" +- "+\t\t \"key\": \"value\"," +- "+\t\t \"key2\": \"value2\"" +- "+\t\t}" +- '' +- " \t.. code-block:: bash" +- '' +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_7_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_7_.rst new file mode 100644 index 0000000..5ebbed8 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_7_.rst @@ -0,0 +1,149 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + { + "key": "value", + "key2": "value2" + } + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + { + "key": "value", + "key2": "value2" + } + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_7_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_7_.yml new file mode 100644 index 0000000..742b675 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_indent_new_error_msg_7_.yml @@ -0,0 +1,32 @@ +err: +- '.../example.rst:112: JSONDecodeError: Illegal trailing comma before end of object: + line 3 column 18 (char 36)' +- '' +out: +- "--- .../example.rst\t(original)" +- "+++ .../example.rst\t(reformatted)" +- '@@ -118,7 +118,10 @@' +- '' +- ' .. code-block:: json' +- '' +- "-\t{\"key\": \"value\", \"key2\": \"value2\"}" +- "+\t{" +- "+\t \"key\": \"value\"," +- "+\t \"key2\": \"value2\"" +- "+\t}" +- '' +- '' +- ' .. code-block:: bash' +- '@@ -135,7 +138,10 @@' +- '' +- " \t.. code-block:: json" +- '' +- "-\t\t{\"key\": \"value\", \"key2\": \"value2\"}" +- "+\t\t{" +- "+\t\t \"key\": \"value\"," +- "+\t\t \"key2\": \"value2\"" +- "+\t\t}" +- '' +- " \t.. code-block:: bash" +- '' +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_0_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_0_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_0_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_0_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_0_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_0_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_1_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_1_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_1_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_1_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_1_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_1_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_2_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_2_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_2_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_2_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_2_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_2_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_3_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_3_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_3_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_3_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_3_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_3_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_4_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_4_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_4_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_4_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_4_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_4_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_5_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_5_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_5_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_5_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_5_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_5_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_6_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_6_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_6_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_6_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_6_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_6_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_7_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_7_.rst new file mode 100644 index 0000000..ad841f6 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_7_.rst @@ -0,0 +1,143 @@ + +.. code-block:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: python3 + + for item in [a,b,c] : + if item: print(item) + + +.. code-cell:: python3 + :count: 1 + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. sourcecode:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. parsed-literal:: python + + print ( 'Hello World' + + ) + + for item in [a,b,c] : + if item: print(item) + + +.. code-block:: toml + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code-block:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = {file = "LICENSE"} + + +.. code:: TOML + + [project] + + + name = 'my-project' + + + version="1.2.3" + license = { + file = "LICENSE", + } + +.. sourcecode:: toml + + [project] + name = 'my-project + + +.. code-block:: JSON + + { + "key": "value", + "key2": "value2", + } + +.. code-block:: json + + {"key": "value", "key2": "value2"} + + +.. code-block:: bash + + echo "Hello World" + + +.. code:: YAML + + name: my-project + version: 1.2.3 + +.. a-directive:: + + .. code-block:: json + + {"key": "value", "key2": "value2"} + + .. code-block:: bash + + $ conda config --add channels https://conda.anaconda.org/conda-forge + $ conda config --add channels https://conda.anaconda.org/domdfcoding diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_7_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_7_.yml new file mode 100644 index 0000000..46fdb94 --- /dev/null +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_json_new_error_msg_7_.yml @@ -0,0 +1,4 @@ +err: +- '' +out: +- '' From 9086c6c9ad984ff066d99e53a75a9b9dbd220331 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:00:14 +0000 Subject: [PATCH 03/21] Updated files with 'repo_helper'. (#26) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 6 +++--- .github/workflows/python_ci_linux.yml | 10 +++++----- .github/workflows/python_ci_macos.yml | 6 +++--- formate.toml | 2 +- tox.ini | 3 +-- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index b2ba021..d1b59d8 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ @@ -71,7 +71,7 @@ jobs: run: python -m tox -e "${{ matrix.config.testenvs }}" -s false - name: "Upload Coverage 🚀" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() && steps.setup-python.outcome == 'success' }} with: name: "coverage-${{ matrix.config.python-version }}" diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index d167920..945f3a2 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ @@ -73,7 +73,7 @@ jobs: run: python -m tox -e "${{ matrix.config.testenvs }}" -s false - name: "Upload Coverage 🚀" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() && steps.setup-python.outcome == 'success' }} with: name: "coverage-${{ matrix.config.python-version }}" @@ -98,7 +98,7 @@ jobs: python -m pip install --upgrade "coveralls>=3.0.0" coverage_pyver_pragma - name: "Download Coverage 🪂" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: coverage @@ -116,7 +116,7 @@ jobs: - name: "Upload Combined Coverage Artefact 🚀" if: ${{ steps.show.outcome != 'failure' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "combined-coverage" path: .coverage diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 614eb2f..f2ff149 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ @@ -71,7 +71,7 @@ jobs: run: python -m tox -e "${{ matrix.config.testenvs }}" -s false - name: "Upload Coverage 🚀" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() && steps.setup-python.outcome == 'success' }} with: name: "coverage-${{ matrix.config.python-version }}" diff --git a/formate.toml b/formate.toml index ea929a4..6f150b0 100644 --- a/formate.toml +++ b/formate.toml @@ -48,4 +48,4 @@ known_third_party = [ "pytest_timeout", "typing_extensions", ] -known_first_party = "snippet_fmt" +known_first_party = [ "snippet_fmt",] diff --git a/tox.ini b/tox.ini index a888d6f..90482e2 100644 --- a/tox.ini +++ b/tox.ini @@ -99,8 +99,7 @@ changedir = {toxinidir} deps = build[virtualenv]>=0.3.1 check-wheel-contents>=0.1.0 - twine>=3.2.0; python_version < "3.13" - twine@git+https://github.com/pypa/twine; python_version >= "3.13" + twine>=3.2.0 cryptography<40; implementation_name == "pypy" and python_version <= "3.7" commands = python -m build --sdist --wheel "{toxinidir}" From c5ffd09f45fe182c207c9b6290e1508dde49cd05 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 13:54:54 +0000 Subject: [PATCH 04/21] [repo-helper] Configuration Update (#27) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .dependabot/config.yml | 9 --------- .github/dependabot.yml | 1 + .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- 5 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 .dependabot/config.yml diff --git a/.dependabot/config.yml b/.dependabot/config.yml deleted file mode 100644 index 4584924..0000000 --- a/.dependabot/config.yml +++ /dev/null @@ -1,9 +0,0 @@ -# This file is managed by 'repo_helper'. Don't edit it directly. ---- -version: 1 -update_configs: -- package_manager: python - directory: / - update_schedule: weekly - default_reviewers: - - domdfcoding diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e769ad3..454225a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,5 +6,6 @@ updates: directory: / schedule: interval: weekly + open-pull-requests-limit: 0 reviewers: - domdfcoding diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index d1b59d8..dfaa6c7 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 945f3a2..83856b6 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index f2ff149..858c6c4 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ From 06a6994d6da790a888108a38dd02ffbb4eb2b8eb Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 22:52:31 +0100 Subject: [PATCH 05/21] [repo-helper] Configuration Update (#28) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 90482e2..1551f1f 100644 --- a/tox.ini +++ b/tox.ini @@ -121,7 +121,7 @@ deps = flake8-github-actions>=0.1.0 flake8-noqa>=1.1.0,<=1.2.2 flake8-pyi>=20.10.0,<=22.8.0 - flake8-pytest-style>=1.3.0 + flake8-pytest-style>=1.3.0,<2 flake8-quotes>=3.3.0 flake8-slots>=0.1.0 flake8-sphinx-links>=0.0.4 @@ -216,8 +216,8 @@ exclude_lines = raise NotImplementedError if 0: if False: - if TYPE_CHECKING: - if typing.TYPE_CHECKING: + if TYPE_CHECKING + if typing.TYPE_CHECKING if __name__ == .__main__.: [check-wheel-contents] From e63a810a3f89ae11c6420fbff1379b9214584907 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 9 Apr 2024 10:32:04 +0100 Subject: [PATCH 06/21] Bump dom-toml * Update expected error messages (now coming from tomli not toml) * Update expected output (tomli puts small tables inline) --- requirements.txt | 2 +- ...ppet_fmt_example_rst_python3_toml_false_3_.yml | 3 +-- ...ppet_fmt_example_rst_python3_toml_false_6_.yml | 3 +-- .../test_snippet_fmt_example_rst_toml_0_.rst | 4 +--- .../test_snippet_fmt_example_rst_toml_0_.yml | 11 +++++------ .../test_snippet_fmt_example_rst_toml_3_.yml | 3 +-- .../test_snippet_fmt_example_rst_toml_4_.rst | 4 +--- .../test_snippet_fmt_example_rst_toml_4_.yml | 11 +++++------ .../test_snippet_fmt_example_rst_toml_5_.rst | 4 +--- .../test_snippet_fmt_example_rst_toml_5_.yml | 11 +++++------ .../test_snippet_fmt_example_rst_toml_6_.rst | 4 +--- .../test_snippet_fmt_example_rst_toml_6_.yml | 14 ++++++-------- .../test_snippet_fmt_example_rst_toml_7_.rst | 4 +--- .../test_snippet_fmt_example_rst_toml_7_.yml | 11 +++++------ .../test_snippet_fmt_example_rst_toml_caps_0_.rst | 4 +--- .../test_snippet_fmt_example_rst_toml_caps_0_.yml | 11 +++++------ .../test_snippet_fmt_example_rst_toml_caps_1_.yml | 4 ++-- .../test_snippet_fmt_example_rst_toml_caps_4_.rst | 4 +--- .../test_snippet_fmt_example_rst_toml_caps_4_.yml | 15 +++++++-------- .../test_snippet_fmt_example_rst_toml_caps_5_.rst | 4 +--- .../test_snippet_fmt_example_rst_toml_caps_5_.yml | 15 +++++++-------- .../test_snippet_fmt_example_rst_toml_caps_6_.rst | 4 +--- .../test_snippet_fmt_example_rst_toml_caps_6_.yml | 15 +++++++-------- .../test_snippet_fmt_example_rst_toml_caps_7_.rst | 4 +--- .../test_snippet_fmt_example_rst_toml_caps_7_.yml | 15 +++++++-------- ...ippet_fmt_example_rst_toml_python_false_0_.rst | 4 +--- ...ippet_fmt_example_rst_toml_python_false_0_.yml | 11 +++++------ ...ippet_fmt_example_rst_toml_python_false_3_.yml | 3 +-- ...ippet_fmt_example_rst_toml_python_false_4_.rst | 4 +--- ...ippet_fmt_example_rst_toml_python_false_4_.yml | 11 +++++------ ...ippet_fmt_example_rst_toml_python_false_5_.rst | 4 +--- ...ippet_fmt_example_rst_toml_python_false_5_.yml | 11 +++++------ ...ippet_fmt_example_rst_toml_python_false_6_.rst | 4 +--- ...ippet_fmt_example_rst_toml_python_false_6_.yml | 14 ++++++-------- ...ippet_fmt_example_rst_toml_python_false_7_.rst | 4 +--- ...ippet_fmt_example_rst_toml_python_false_7_.yml | 11 +++++------ 36 files changed, 107 insertions(+), 158 deletions(-) diff --git a/requirements.txt b/requirements.txt index c2c7180..c283f6a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ click>=8.0.1 consolekit>=1.2.3 -dom-toml>=0.5.0 +dom-toml>=2.0.0 domdf-python-tools>=3.0.0 entrypoints>=0.3 formate>=0.4.9 diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_python3_toml_false_3_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_python3_toml_false_3_.yml index 7c2bc50..f5719f3 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_python3_toml_false_3_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_python3_toml_false_3_.yml @@ -1,6 +1,5 @@ err: -- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char - 28)' +- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)' - '' out: - '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_python3_toml_false_6_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_python3_toml_false_6_.yml index d280688..d7c6905 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_python3_toml_false_6_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_python3_toml_false_6_.yml @@ -1,6 +1,5 @@ err: -- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char - 28)' +- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)' - '' out: - "--- .../example.rst\t(original)" diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_0_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_0_.rst index 25e85f2..c1474bc 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_0_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_0_.rst @@ -71,9 +71,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code-block:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_0_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_0_.yml index 81a7cc4..e00db4e 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_0_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_0_.yml @@ -3,21 +3,20 @@ err: out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -69,13 +69,11 @@' +- '@@ -69,13 +69,9 @@' - ' .. code-block:: toml' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code-block:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_3_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_3_.yml index 7c2bc50..f5719f3 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_3_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_3_.yml @@ -1,6 +1,5 @@ err: -- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char - 28)' +- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)' - '' out: - '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_4_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_4_.rst index 25e85f2..c1474bc 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_4_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_4_.rst @@ -71,9 +71,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code-block:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_4_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_4_.yml index 81a7cc4..e00db4e 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_4_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_4_.yml @@ -3,21 +3,20 @@ err: out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -69,13 +69,11 @@' +- '@@ -69,13 +69,9 @@' - ' .. code-block:: toml' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code-block:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_5_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_5_.rst index 25e85f2..c1474bc 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_5_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_5_.rst @@ -71,9 +71,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code-block:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_5_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_5_.yml index 81a7cc4..e00db4e 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_5_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_5_.yml @@ -3,21 +3,20 @@ err: out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -69,13 +69,11 @@' +- '@@ -69,13 +69,9 @@' - ' .. code-block:: toml' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code-block:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_6_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_6_.rst index 25e85f2..c1474bc 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_6_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_6_.rst @@ -71,9 +71,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code-block:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_6_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_6_.yml index 2557166..0c6281d 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_6_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_6_.yml @@ -1,25 +1,23 @@ err: -- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char - 28)' +- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)' - '' out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -69,13 +69,11 @@' +- '@@ -69,13 +69,9 @@' - ' .. code-block:: toml' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code-block:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_7_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_7_.rst index 25e85f2..c1474bc 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_7_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_7_.rst @@ -71,9 +71,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code-block:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_7_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_7_.yml index 81a7cc4..e00db4e 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_7_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_7_.yml @@ -3,21 +3,20 @@ err: out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -69,13 +69,11 @@' +- '@@ -69,13 +69,9 @@' - ' .. code-block:: toml' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code-block:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_0_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_0_.rst index bbc4ea4..aec9526 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_0_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_0_.rst @@ -83,9 +83,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_0_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_0_.yml index 2f8e848..4407458 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_0_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_0_.yml @@ -3,21 +3,20 @@ err: out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -81,13 +81,11 @@' +- '@@ -81,13 +81,9 @@' - ' .. code-block:: TOML' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_1_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_1_.yml index 3533983..42fb6b7 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_1_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_1_.yml @@ -1,6 +1,6 @@ err: -- '.../example.rst:93: TomlDecodeError: Key name found without value. Reached end - of line. (line 10 column 2 char 86)' +- '.../example.rst:93: TOMLDecodeError: Invalid initial character for a key part (at + line 8, column 12)' - '' out: - '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_4_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_4_.rst index bbc4ea4..aec9526 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_4_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_4_.rst @@ -83,9 +83,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_4_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_4_.yml index 3cce36a..9dc4395 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_4_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_4_.yml @@ -1,25 +1,24 @@ err: -- '.../example.rst:93: TomlDecodeError: Key name found without value. Reached end - of line. (line 10 column 2 char 86)' +- '.../example.rst:93: TOMLDecodeError: Invalid initial character for a key part (at + line 8, column 12)' - '' out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -81,13 +81,11 @@' +- '@@ -81,13 +81,9 @@' - ' .. code-block:: TOML' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_5_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_5_.rst index bbc4ea4..aec9526 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_5_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_5_.rst @@ -83,9 +83,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_5_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_5_.yml index 3cce36a..9dc4395 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_5_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_5_.yml @@ -1,25 +1,24 @@ err: -- '.../example.rst:93: TomlDecodeError: Key name found without value. Reached end - of line. (line 10 column 2 char 86)' +- '.../example.rst:93: TOMLDecodeError: Invalid initial character for a key part (at + line 8, column 12)' - '' out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -81,13 +81,11 @@' +- '@@ -81,13 +81,9 @@' - ' .. code-block:: TOML' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_6_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_6_.rst index bbc4ea4..aec9526 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_6_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_6_.rst @@ -83,9 +83,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_6_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_6_.yml index 3cce36a..9dc4395 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_6_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_6_.yml @@ -1,25 +1,24 @@ err: -- '.../example.rst:93: TomlDecodeError: Key name found without value. Reached end - of line. (line 10 column 2 char 86)' +- '.../example.rst:93: TOMLDecodeError: Invalid initial character for a key part (at + line 8, column 12)' - '' out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -81,13 +81,11 @@' +- '@@ -81,13 +81,9 @@' - ' .. code-block:: TOML' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_7_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_7_.rst index bbc4ea4..aec9526 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_7_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_7_.rst @@ -83,9 +83,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_7_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_7_.yml index 3cce36a..9dc4395 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_7_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_caps_7_.yml @@ -1,25 +1,24 @@ err: -- '.../example.rst:93: TomlDecodeError: Key name found without value. Reached end - of line. (line 10 column 2 char 86)' +- '.../example.rst:93: TOMLDecodeError: Invalid initial character for a key part (at + line 8, column 12)' - '' out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -81,13 +81,11 @@' +- '@@ -81,13 +81,9 @@' - ' .. code-block:: TOML' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_0_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_0_.rst index 25e85f2..c1474bc 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_0_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_0_.rst @@ -71,9 +71,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code-block:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_0_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_0_.yml index 81a7cc4..e00db4e 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_0_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_0_.yml @@ -3,21 +3,20 @@ err: out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -69,13 +69,11 @@' +- '@@ -69,13 +69,9 @@' - ' .. code-block:: toml' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code-block:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_3_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_3_.yml index 7c2bc50..f5719f3 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_3_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_3_.yml @@ -1,6 +1,5 @@ err: -- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char - 28)' +- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)' - '' out: - '' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_4_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_4_.rst index 25e85f2..c1474bc 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_4_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_4_.rst @@ -71,9 +71,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code-block:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_4_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_4_.yml index 81a7cc4..e00db4e 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_4_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_4_.yml @@ -3,21 +3,20 @@ err: out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -69,13 +69,11 @@' +- '@@ -69,13 +69,9 @@' - ' .. code-block:: toml' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code-block:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_5_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_5_.rst index 25e85f2..c1474bc 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_5_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_5_.rst @@ -71,9 +71,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code-block:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_5_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_5_.yml index 81a7cc4..e00db4e 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_5_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_5_.yml @@ -3,21 +3,20 @@ err: out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -69,13 +69,11 @@' +- '@@ -69,13 +69,9 @@' - ' .. code-block:: toml' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code-block:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_6_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_6_.rst index 25e85f2..c1474bc 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_6_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_6_.rst @@ -71,9 +71,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code-block:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_6_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_6_.yml index 2557166..0c6281d 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_6_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_6_.yml @@ -1,25 +1,23 @@ err: -- '.../example.rst:106: TomlDecodeError: Unbalanced quotes (line 2 column 19 char - 28)' +- '.../example.rst:106: TOMLDecodeError: Expected "''" (at end of document)' - '' out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -69,13 +69,11 @@' +- '@@ -69,13 +69,9 @@' - ' .. code-block:: toml' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code-block:: TOML' diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_7_.rst b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_7_.rst index 25e85f2..c1474bc 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_7_.rst +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_7_.rst @@ -71,9 +71,7 @@ [project] name = "my-project" version = "1.2.3" - - [project.license] - file = "LICENSE" + license = { file = "LICENSE" } .. code-block:: TOML diff --git a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_7_.yml b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_7_.yml index 81a7cc4..e00db4e 100644 --- a/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_7_.yml +++ b/tests/test_snippet_fmt_/test_snippet_fmt_example_rst_toml_python_false_7_.yml @@ -3,21 +3,20 @@ err: out: - "--- .../example.rst\t(original)" - "+++ .../example.rst\t(reformatted)" -- '@@ -69,13 +69,11 @@' +- '@@ -69,13 +69,9 @@' - ' .. code-block:: toml' - '' - " \t[project]" -- "+\tname = \"my-project\"" -- "+\tversion = \"1.2.3\"" -- '' +- '-' - '-' - "-\tname = 'my-project'" - '-' - '-' - "-\tversion=\"1.2.3\"" - "-\tlicense = {file = \"LICENSE\"}" -- "+\t[project.license]" -- "+\tfile = \"LICENSE\"" +- "+\tname = \"my-project\"" +- "+\tversion = \"1.2.3\"" +- "+\tlicense = { file = \"LICENSE\" }" - '' - '' - ' .. code-block:: TOML' From 2fab56298c6ce0cdc628b1399927f4ac5f0b96e8 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:37:54 +0100 Subject: [PATCH 07/21] [repo-helper] Configuration Update (#29) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- doc-source/conf.py | 6 ++++++ formate.toml | 16 ++++++++-------- pyproject.toml | 25 +++++++++++-------------- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5f94da1..7d9df46 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.9.1 + rev: v0.11.0 hooks: - id: reformat-pyproject diff --git a/doc-source/conf.py b/doc-source/conf.py index 57852a5..3a85007 100644 --- a/doc-source/conf.py +++ b/doc-source/conf.py @@ -74,8 +74,14 @@ def setup(app): # 3rd party from sphinx_toolbox.latex import better_header_layout + from sphinxemoji import sphinxemoji app.connect("config-inited", lambda app, config: better_header_layout(config)) + app.connect("build-finished", sphinxemoji.copy_asset_files) + app.add_js_file("https://unpkg.com/twemoji@latest/dist/twemoji.min.js") + app.add_js_file("twemoji.js") + app.add_css_file("twemoji.css") + app.add_transform(sphinxemoji.EmojiSubstitutions) nitpicky = True diff --git a/formate.toml b/formate.toml index 6f150b0..f7412f2 100644 --- a/formate.toml +++ b/formate.toml @@ -6,21 +6,17 @@ noqa-reformat = 60 ellipsis-reformat = 70 squish_stubs = 80 -[config] -indent = "\t" -line_length = 115 - [hooks.yapf] priority = 30 -[hooks.isort] -priority = 50 - [hooks.yapf.kwargs] yapf_style = ".style.yapf" +[hooks.isort] +priority = 50 + [hooks.isort.kwargs] -indent = "\t\t" +indent = " " multi_line_output = 8 import_heading_stdlib = "stdlib" import_heading_thirdparty = "3rd party" @@ -49,3 +45,7 @@ known_third_party = [ "typing_extensions", ] known_first_party = [ "snippet_fmt",] + +[config] +indent = " " +line_length = 115 diff --git a/pyproject.toml b/pyproject.toml index 7a70bbf..8e035b9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,6 @@ dynamic = [ "requires-python", "classifiers", "dependencies",] name = "Dominic Davis-Foster" email = "dominic@davis-foster.co.uk" - [project.license] file = "LICENSE" @@ -61,7 +60,6 @@ extensions = [ "sphinx.ext.mathjax", "sphinxcontrib.extras_require", "sphinx.ext.todo", - "sphinxemoji.sphinxemoji", "notfound.extension", "sphinx_copybutton", "sphinxcontrib.default_values", @@ -77,7 +75,6 @@ extensions = [ "sphinx_toolbox_experimental.missing_xref", "sphinx_packaging", ] -sphinxemoji_style = "twemoji" gitstamp_fmt = "%d %b %Y" templates_path = [ "_templates",] html_static_path = [ "_static",] @@ -137,17 +134,6 @@ show_error_codes = true [tool.snippet-fmt] directives = [ "code-block",] -[tool.dependency-dash."requirements.txt"] -order = 10 - -[tool.dependency-dash."tests/requirements.txt"] -order = 20 -include = false - -[tool.dependency-dash."doc-source/requirements.txt"] -order = 30 -include = false - [tool.snippet-fmt.languages.toml] reformat = true @@ -160,3 +146,14 @@ reformat = true [tool.snippet-fmt.languages.ini] [tool.snippet-fmt.languages.json] + +[tool.dependency-dash."requirements.txt"] +order = 10 + +[tool.dependency-dash."tests/requirements.txt"] +order = 20 +include = false + +[tool.dependency-dash."doc-source/requirements.txt"] +order = 30 +include = false From 052ca157b8219290e79ee3b26f178558ef719be7 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 16:20:19 +0000 Subject: [PATCH 08/21] Bump Python 3.13 alpha (#30) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index dfaa6c7..a93c83d 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 83856b6..8842838 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 858c6c4..75ee4bc 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ From dfdff68d9af108a8b0a3fd02d3a7477215b3a19c Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 14:14:46 +0100 Subject: [PATCH 09/21] Updated files with 'repo_helper'. (#31) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci_macos.yml | 4 ++-- .pre-commit-config.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 75ee4bc..f2f378a 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -18,8 +18,8 @@ permissions: jobs: tests: - name: "macos-latest / Python ${{ matrix.config.python-version }}" - runs-on: "macos-latest" + name: "macos-13 / Python ${{ matrix.config.python-version }}" + runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7d9df46..8a19610 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,7 +43,7 @@ repos: - id: bind-requirements - repo: https://github.com/domdfcoding/flake8-dunder-all - rev: v0.3.1 + rev: v0.4.1 hooks: - id: ensure-dunder-all files: ^snippet_fmt/.*\.py$ From 89a0e50385190af63d208f7f6aae730e8d479923 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 16:40:33 +0100 Subject: [PATCH 10/21] Set UNSAFE_PYO3_SKIP_VERSION_CHECK=1 for Python 3.13. (#32) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 1551f1f..c46e2e8 100644 --- a/tox.ini +++ b/tox.ini @@ -94,6 +94,7 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 PIP_PREFER_BINARY=1 + UNSAFE_PYO3_SKIP_VERSION_CHECK=1 skip_install = True changedir = {toxinidir} deps = From c8a84605cb5b21c5c45b303211f06c127e81c4be Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 16:10:00 +0100 Subject: [PATCH 11/21] [repo-helper] Configuration Update (#33) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- pyproject.toml | 6 +++--- tox.ini | 2 ++ 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index a93c83d..683b7fd 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-beta.1", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 8842838..838e490 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-beta.1", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index f2f378a..c99cd9d 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-beta.1", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/pyproject.toml b/pyproject.toml index 8e035b9..e3e44d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,13 +10,13 @@ readme = "README.rst" keywords = [ "docs", "formatting", "linting",] dynamic = [ "requires-python", "classifiers", "dependencies",] +[project.license] +file = "LICENSE" + [[project.authors]] name = "Dominic Davis-Foster" email = "dominic@davis-foster.co.uk" -[project.license] -file = "LICENSE" - [project.urls] Homepage = "https://github.com/python-formate/snippet-fmt" "Issue Tracker" = "https://github.com/python-formate/snippet-fmt/issues" diff --git a/tox.ini b/tox.ini index c46e2e8..e7041d1 100644 --- a/tox.ini +++ b/tox.ini @@ -75,6 +75,7 @@ setenv = setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 + UNSAFE_PYO3_SKIP_VERSION_CHECK=1 [testenv:py312] setenv = @@ -243,3 +244,4 @@ setenv = setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 + UNSAFE_PYO3_SKIP_VERSION_CHECK=1 From cbcfaf3c9da26a03c730ed852f836d6d93ce9efc Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:45:59 +0100 Subject: [PATCH 12/21] Bump Python 3.13 prerelease in GHA (#34) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 683b7fd..34ca01c 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-beta.1", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-beta.2", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 838e490..1a55b33 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-beta.1", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-beta.2", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index c99cd9d..bc84a2f 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-beta.1", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-beta.2", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ From ae64be2c0019594321f966d347775adfd2df5ae1 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 10:59:44 +0100 Subject: [PATCH 13/21] Updated files with 'repo_helper'. (#35) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- doc-source/conf.py | 17 ++++++++++++++++- doc-source/requirements.txt | 6 ++++++ 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 34ca01c..2d0031e 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-beta.2", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-beta.3", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 1a55b33..4e2ada8 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-beta.2", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-beta.3", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index bc84a2f..a6afd96 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-beta.2", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-beta.3", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/doc-source/conf.py b/doc-source/conf.py index 3a85007..4180de1 100644 --- a/doc-source/conf.py +++ b/doc-source/conf.py @@ -71,13 +71,28 @@ } +# Fix for pathlib issue with sphinxemoji on Python 3.9 and Sphinx 4.x +def copy_asset_files(app, exc): + # 3rd party + from domdf_python_tools.compat import importlib_resources + from sphinx.util.fileutil import copy_asset + + if exc: + return + + asset_files = ["twemoji.js", "twemoji.css"] + for path in asset_files: + path_str = os.fspath(importlib_resources.files("sphinxemoji") / path) + copy_asset(path_str, os.path.join(app.outdir, "_static")) + + def setup(app): # 3rd party from sphinx_toolbox.latex import better_header_layout from sphinxemoji import sphinxemoji app.connect("config-inited", lambda app, config: better_header_layout(config)) - app.connect("build-finished", sphinxemoji.copy_asset_files) + app.connect("build-finished", copy_asset_files) app.add_js_file("https://unpkg.com/twemoji@latest/dist/twemoji.min.js") app.add_js_file("twemoji.js") app.add_css_file("twemoji.css") diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt index 6c9404a..348806b 100644 --- a/doc-source/requirements.txt +++ b/doc-source/requirements.txt @@ -16,5 +16,11 @@ sphinx-prompt>=1.1.0 sphinx-pyproject>=0.1.0 sphinx-tabs>=1.1.13 sphinx-toolbox>=3.5.0 +sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-jsmath==1.0.1 +sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-serializinghtml==1.1.5 sphinxemoji>=0.1.6 toctree-plus>=0.6.1 From 2f0bc3dc8eeeb1374aa4d9d79bdc6b7974d11f58 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 10:29:34 +0100 Subject: [PATCH 14/21] [repo-helper] Configuration Update (#36) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- doc-source/requirements.txt | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 2d0031e..45be850 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-beta.3", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-beta.4", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 4e2ada8..9da12df 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-beta.3", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-beta.4", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index a6afd96..24a2543 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-beta.3", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-beta.4", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt index 348806b..947ae5c 100644 --- a/doc-source/requirements.txt +++ b/doc-source/requirements.txt @@ -12,9 +12,7 @@ sphinx-favicon>=0.2 sphinx-licenseinfo>=0.3.1 sphinx-notfound-page>=0.7.1 sphinx-packaging>=0.1.0 -sphinx-prompt>=1.1.0 sphinx-pyproject>=0.1.0 -sphinx-tabs>=1.1.13 sphinx-toolbox>=3.5.0 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 From 11b500654da201b4537e9f4aae4e973ffd028628 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:05:56 +0100 Subject: [PATCH 15/21] Bump Python 3.13 prerelease (#37) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 45be850..b19716e 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-beta.4", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 9da12df..4d20b94 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-beta.4", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 24a2543..856fa20 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-beta.4", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ From d44445e6e414eb7d7c778d091c493a9c029a9a60 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:26:42 +0100 Subject: [PATCH 16/21] Updated files with 'repo_helper'. (#38) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- .pre-commit-config.yaml | 6 +++--- tox.ini | 3 +++ 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index b19716e..a1c3034 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 4d20b94..c19d255 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 856fa20..b0d6e4f 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13", testenvs: "py313-dev-click{7,8},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8a19610..28d78ac 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.11.0 + rev: v0.11.1 hooks: - id: reformat-pyproject @@ -42,7 +42,7 @@ repos: exclude: ^(doc-source/conf|__pkginfo__|setup|tests/.*)\.py$ - id: bind-requirements - - repo: https://github.com/domdfcoding/flake8-dunder-all + - repo: https://github.com/python-formate/flake8-dunder-all rev: v0.4.1 hooks: - id: ensure-dunder-all @@ -86,7 +86,7 @@ repos: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ - - repo: https://github.com/domdfcoding/dep_checker + - repo: https://github.com/python-coincidence/dep_checker rev: v0.8.0 hooks: - id: dep_checker diff --git a/tox.ini b/tox.ini index e7041d1..27753b6 100644 --- a/tox.ini +++ b/tox.ini @@ -5,6 +5,7 @@ # * testenv # * testenv:.package # * testenv:py313-dev +# * testenv:py313 # * testenv:py312-dev # * testenv:py312 # * testenv:docs @@ -72,12 +73,14 @@ setenv = PIP_DISABLE_PIP_VERSION_CHECK=1 [testenv:py313-dev] +download = True setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 UNSAFE_PYO3_SKIP_VERSION_CHECK=1 [testenv:py312] +download = True setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 From 2d863816ae186a6cf6374da0f1aa217245578115 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2025 11:43:43 +0000 Subject: [PATCH 17/21] [repo-helper] Configuration Update (#39) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- tox.ini | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 28d78ac..c8e06e4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -81,7 +81,7 @@ repos: - id: snippet-fmt - repo: https://github.com/python-formate/formate - rev: v0.7.0 + rev: v0.8.0 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ diff --git a/README.rst b/README.rst index 73a448d..b3dc9cf 100644 --- a/README.rst +++ b/README.rst @@ -99,7 +99,7 @@ snippet-fmt :target: https://github.com/python-formate/snippet-fmt/commit/master :alt: GitHub last commit -.. |maintained| image:: https://img.shields.io/maintenance/yes/2024 +.. |maintained| image:: https://img.shields.io/maintenance/yes/2025 :alt: Maintenance .. |pypi-downloads| image:: https://img.shields.io/pypi/dm/snippet-fmt diff --git a/doc-source/index.rst b/doc-source/index.rst index 275d957..87a2f15 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -104,7 +104,7 @@ snippet-fmt :last-commit: :alt: GitHub last commit - .. |maintained| maintained-shield:: 2024 + .. |maintained| maintained-shield:: 2025 :alt: Maintenance .. |pypi-downloads| pypi-shield:: diff --git a/tox.ini b/tox.ini index 27753b6..9b2d35d 100644 --- a/tox.ini +++ b/tox.ini @@ -239,11 +239,13 @@ filterwarnings = ignore:lib2to3 package is deprecated and may not be able to parse Python 3.10+:PendingDeprecationWarning [testenv:py312-click{7,8}] +download = True setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 [testenv:py313-dev-click{7,8}] +download = True setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 From 31871dfefe3e76088d257864e13ab14353272082 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 8 Apr 2025 14:50:37 +0100 Subject: [PATCH 18/21] Drop support for Python 3.6 --- .github/workflows/python_ci.yml | 5 ++--- .github/workflows/python_ci_linux.yml | 5 ++--- .github/workflows/python_ci_macos.yml | 5 ++--- pyproject.toml | 2 +- repo_helper.yml | 3 +-- tox.ini | 12 +++++------- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index a1c3034..8d01ea8 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,20 +22,19 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13' + USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13' strategy: fail-fast: False matrix: config: - - {python-version: "3.6", testenvs: "py36-click{7,8},build", experimental: False} - {python-version: "3.7", testenvs: "py37-click{7,8},build", experimental: False} - {python-version: "3.8", testenvs: "py38-click{7,8},build", experimental: False} - {python-version: "3.9", testenvs: "py39-click{7,8},build", experimental: False} - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13", testenvs: "py313-click{7,8},build", experimental: False} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index c19d255..9d7e278 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,20 +23,19 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13' + USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13' strategy: fail-fast: False matrix: config: - - {python-version: "3.6", testenvs: "py36-click{7,8},build", experimental: False} - {python-version: "3.7", testenvs: "py37-click{7,8},build", experimental: False} - {python-version: "3.8", testenvs: "py38-click{7,8},build", experimental: False} - {python-version: "3.9", testenvs: "py39-click{7,8},build", experimental: False} - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13", testenvs: "py313-click{7,8},build", experimental: False} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index b0d6e4f..3ba7d80 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,20 +22,19 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13' + USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13' strategy: fail-fast: False matrix: config: - - {python-version: "3.6", testenvs: "py36-click{7,8},build", experimental: False} - {python-version: "3.7", testenvs: "py37-click{7,8},build", experimental: False} - {python-version: "3.8", testenvs: "py38-click{7,8},build", experimental: False} - {python-version: "3.9", testenvs: "py39-click{7,8},build", experimental: False} - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13", testenvs: "py313-dev-click{7,8},build", experimental: True} + - {python-version: "3.13", testenvs: "py313-click{7,8},build", experimental: False} steps: - name: Checkout 🛎️ diff --git a/pyproject.toml b/pyproject.toml index e3e44d9..90d9d54 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ base-classifiers = [ "Intended Audience :: Developers", "Typing :: Typed", ] -python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12",] +python-versions = [ "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13",] python-implementations = [ "CPython",] platforms = [ "Windows", "macOS", "Linux",] license-key = "MIT" diff --git a/repo_helper.yml b/repo_helper.yml index 839fc1f..881c254 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -17,14 +17,13 @@ sphinx_html_theme: furo docs_fail_on_warning: true python_versions: - - '3.6' - '3.7' - '3.8' - '3.9' - "3.10" - "3.11" - "3.12" - - 3.13-dev + - "3.13" keywords: - formatting diff --git a/tox.ini b/tox.ini index 9b2d35d..810fe74 100644 --- a/tox.ini +++ b/tox.ini @@ -23,14 +23,13 @@ [tox] envlist = - py36-click{7,8} py37-click{7,8} py38-click{7,8} py39-click{7,8} py310-click{7,8} py311-click{7,8} py312-click{7,8} - py313-dev-click{7,8} + py313-click{7,8} mypy build skip_missing_interpreters = True @@ -43,14 +42,13 @@ requires = [envlists] test = - py36-click{7,8} py37-click{7,8} py38-click{7,8} py39-click{7,8} py310-click{7,8} py311-click{7,8} py312-click{7,8} - py313-dev-click{7,8} + py313-click{7,8} qa = mypy, lint cov = py38-click7, coverage @@ -72,7 +70,7 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 -[testenv:py313-dev] +[testenv:py313] download = True setenv = PYTHONDEVMODE=1 @@ -204,7 +202,7 @@ inline-quotes = " multiline-quotes = """ docstring-quotes = """ count = True -min_python_version = 3.6.1 +min_python_version = 3.7 unused-arguments-ignore-abstract-functions = True unused-arguments-ignore-overload-functions = True unused-arguments-ignore-magic-methods = True @@ -244,7 +242,7 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 -[testenv:py313-dev-click{7,8}] +[testenv:py313-click{7,8}] download = True setenv = PYTHONDEVMODE=1 From 42d7c8e1c5b4f8b7865ff65a31be3b6f280ea1ad Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 16:24:50 +0100 Subject: [PATCH 19/21] Bump Ubuntu to 22.04 (#40) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/flake8.yml | 2 +- .github/workflows/mypy.yml | 2 +- .github/workflows/python_ci_linux.yml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 0a8c0c3..af1b394 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -16,7 +16,7 @@ permissions: jobs: Run: name: "Flake8" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" steps: - name: Checkout 🛎️ diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 10c6f30..bd74787 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - os: ['ubuntu-20.04', 'windows-2019'] + os: ['ubuntu-22.04', 'windows-2019'] fail-fast: false steps: diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 9d7e278..24f2e94 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -19,8 +19,8 @@ permissions: jobs: tests: - name: "ubuntu-20.04 / Python ${{ matrix.config.python-version }}" - runs-on: "ubuntu-20.04" + name: "ubuntu-22.04 / Python ${{ matrix.config.python-version }}" + runs-on: "ubuntu-22.04" continue-on-error: ${{ matrix.config.experimental }} env: USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13' @@ -81,7 +81,7 @@ jobs: Coverage: needs: tests - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" steps: - name: Checkout 🛎️ uses: "actions/checkout@v4" @@ -130,7 +130,7 @@ jobs: Deploy: needs: tests - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" steps: - name: Checkout 🛎️ uses: "actions/checkout@v4" From 3caf52748a40e536fc9479317a4e9bccce2b4b0c Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 17 Apr 2025 17:31:38 +0100 Subject: [PATCH 20/21] [repo-helper] Configuration Update (#42) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci_macos.yml | 18 +++++++++--------- .readthedocs.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 3ba7d80..e5a791a 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -18,8 +18,8 @@ permissions: jobs: tests: - name: "macos-13 / Python ${{ matrix.config.python-version }}" - runs-on: "macos-13" + name: "macos-${{ matrix.config.os-ver }} / Python ${{ matrix.config.python-version }}" + runs-on: "macos-${{ matrix.config.os-ver }}" continue-on-error: ${{ matrix.config.experimental }} env: USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13' @@ -28,13 +28,13 @@ jobs: fail-fast: False matrix: config: - - {python-version: "3.7", testenvs: "py37-click{7,8},build", experimental: False} - - {python-version: "3.8", testenvs: "py38-click{7,8},build", experimental: False} - - {python-version: "3.9", testenvs: "py39-click{7,8},build", experimental: False} - - {python-version: "3.10", testenvs: "py310-click{7,8},build", experimental: False} - - {python-version: "3.11", testenvs: "py311-click{7,8},build", experimental: False} - - {python-version: "3.12", testenvs: "py312-click{7,8},build", experimental: False} - - {python-version: "3.13", testenvs: "py313-click{7,8},build", experimental: False} + - {python-version: "3.7", os-ver: "13", testenvs: "py37-click{7,8},build", experimental: False} + - {python-version: "3.8", os-ver: "14", testenvs: "py38-click{7,8},build", experimental: False} + - {python-version: "3.9", os-ver: "14", testenvs: "py39-click{7,8},build", experimental: False} + - {python-version: "3.10", os-ver: "14", testenvs: "py310-click{7,8},build", experimental: False} + - {python-version: "3.11", os-ver: "14", testenvs: "py311-click{7,8},build", experimental: False} + - {python-version: "3.12", os-ver: "14", testenvs: "py312-click{7,8},build", experimental: False} + - {python-version: "3.13", os-ver: "14", testenvs: "py313-click{7,8},build", experimental: False} steps: - name: Checkout 🛎️ diff --git a/.readthedocs.yml b/.readthedocs.yml index e928b70..83fc025 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -13,7 +13,7 @@ python: - requirements: requirements.txt - requirements: doc-source/requirements.txt build: - os: ubuntu-20.04 + os: ubuntu-22.04 tools: python: '3.9' jobs: From 068f89b0b521ddfb55550c1fcb659461274ca70d Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 8 May 2025 21:33:03 +0100 Subject: [PATCH 21/21] Updated files with 'repo_helper'. (#43) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 1 + .github/workflows/python_ci_linux.yml | 2 ++ .github/workflows/python_ci_macos.yml | 1 + .pre-commit-config.yaml | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 8d01ea8..7f1196f 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -75,3 +75,4 @@ jobs: with: name: "coverage-${{ matrix.config.python-version }}" path: .coverage + include-hidden-files: true diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 24f2e94..6bbee2e 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -77,6 +77,7 @@ jobs: with: name: "coverage-${{ matrix.config.python-version }}" path: .coverage + include-hidden-files: true Coverage: @@ -119,6 +120,7 @@ jobs: with: name: "combined-coverage" path: .coverage + include-hidden-files: true - name: "Upload Combined Coverage to Coveralls" if: ${{ steps.show.outcome != 'failure' }} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index e5a791a..b945833 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -75,3 +75,4 @@ jobs: with: name: "coverage-${{ matrix.config.python-version }}" path: .coverage + include-hidden-files: true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c8e06e4..857b362 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.11.1 + rev: v0.13.0 hooks: - id: reformat-pyproject