Skip to content

Commit

Permalink
Merge 0cbc2bc into 97ef279
Browse files Browse the repository at this point in the history
  • Loading branch information
repo-helper[bot] committed Mar 12, 2024
2 parents 97ef279 + 0cbc2bc commit 046a5a7
Show file tree
Hide file tree
Showing 15 changed files with 66 additions and 51 deletions.
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ updates:
directory: /
schedule:
interval: weekly
open-pull-requests-limit: 0
reviewers:
- domdfcoding
2 changes: 1 addition & 1 deletion .github/workflows/docs_test_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: Check for changed files
uses: dorny/paths-filter@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: Check for changed files
uses: dorny/paths-filter@v2
Expand All @@ -33,7 +33,7 @@ jobs:
- name: Setup Python 🐍
if: steps.changes.outputs.code == 'true'
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v5"
with:
python-version: "3.8"

Expand All @@ -43,7 +43,7 @@ jobs:
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install tox
python -m pip install tox~=3.0
- name: "Run Flake8"
if: steps.changes.outputs.code == 'true'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: Check for changed files
uses: dorny/paths-filter@v2
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Setup Python 🐍
if: steps.changes.outputs.code == 'true'
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v5"
with:
python-version: "3.8"

Expand All @@ -47,7 +47,7 @@ jobs:
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox virtualenv!=20.16.0
python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0
- name: "Run mypy"
if: steps.changes.outputs.code == 'true'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/python_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: Check for changed files
if: startsWith(github.ref, 'refs/tags/') != true
Expand All @@ -53,7 +53,7 @@ jobs:
- name: Setup Python 🐍
id: setup-python
if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }}
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v5"
with:
python-version: "${{ matrix.config.python-version }}"

Expand All @@ -63,14 +63,14 @@ jobs:
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox virtualenv!=20.16.0
python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
if: steps.setup-python.outcome == 'success'
run: python -m tox -e "${{ matrix.config.testenvs }}" -s false

- name: "Upload Coverage 🚀"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: ${{ always() && steps.setup-python.outcome == 'success' }}
with:
name: "coverage-${{ matrix.config.python-version }}"
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: Check for changed files
if: startsWith(github.ref, 'refs/tags/') != true
Expand All @@ -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@v2"
uses: "actions/setup-python@v5"
with:
python-version: "${{ matrix.config.python-version }}"

Expand All @@ -64,15 +64,15 @@ jobs:
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox virtualenv!=20.16.0
python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0
python -m pip install --upgrade coverage_pyver_pragma
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
if: steps.setup-python.outcome == 'success'
run: python -m tox -e "${{ matrix.config.testenvs }}" -s false

- name: "Upload Coverage 🚀"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: ${{ always() && steps.setup-python.outcome == 'success' }}
with:
name: "coverage-${{ matrix.config.python-version }}"
Expand All @@ -84,10 +84,10 @@ jobs:
runs-on: "ubuntu-20.04"
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: Setup Python 🐍
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v5"
with:
python-version: 3.8

Expand All @@ -97,7 +97,7 @@ jobs:
python -m pip install --upgrade "coveralls>=3.0.0" coverage_pyver_pragma
- name: "Download Coverage 🪂"
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
path: coverage

Expand All @@ -115,7 +115,7 @@ jobs:
- name: "Upload Combined Coverage Artefact 🚀"
if: ${{ steps.show.outcome != 'failure' }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: "combined-coverage"
path: .coverage
Expand All @@ -133,11 +133,11 @@ jobs:
runs-on: "ubuntu-20.04"
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"
if: startsWith(github.ref, 'refs/tags/')

- name: Setup Python 🐍
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v5"
if: startsWith(github.ref, 'refs/tags/')
with:
python-version: 3.8
Expand All @@ -146,7 +146,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox
python -m pip install --upgrade tox~=3.0
- name: Build distributions 📦
if: startsWith(github.ref, 'refs/tags/')
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/python_ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: Check for changed files
if: startsWith(github.ref, 'refs/tags/') != true
Expand All @@ -53,7 +53,7 @@ jobs:
- name: Setup Python 🐍
id: setup-python
if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }}
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v5"
with:
python-version: "${{ matrix.config.python-version }}"

Expand All @@ -63,14 +63,14 @@ jobs:
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox virtualenv!=20.16.0
python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
if: steps.setup-python.outcome == 'success'
run: python -m tox -e "${{ matrix.config.testenvs }}" -s false

- name: "Upload Coverage 🚀"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: ${{ always() && steps.setup-python.outcome == 'success' }}
with:
name: "coverage-${{ matrix.config.python-version }}"
Expand Down
16 changes: 8 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ci:

repos:
- repo: https://github.com/repo-helper/pyproject-parser
rev: v0.7.0
rev: v0.9.1
hooks:
- id: reformat-pyproject

Expand Down Expand Up @@ -43,18 +43,18 @@ repos:
- id: bind-requirements

- repo: https://github.com/domdfcoding/flake8-dunder-all
rev: v0.2.2
rev: v0.3.1
hooks:
- id: ensure-dunder-all
files: ^domplotlib/.*\.py$

- repo: https://github.com/domdfcoding/flake2lint
rev: v0.4.2
rev: v0.4.3
hooks:
- id: flake2lint

- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.9.0
rev: v1.10.0
hooks:
- id: python-no-eval
- id: rst-backticks
Expand All @@ -70,24 +70,24 @@ repos:
- --keep-runtime-typing

- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.3.1
rev: v1.5.1
hooks:
- id: remove-crlf
- 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.4.10
rev: v0.7.0
hooks:
- id: formate
exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$

- repo: https://github.com/domdfcoding/dep_checker
rev: v0.7.0
rev: v0.8.0
hooks:
- id: dep_checker
args:
Expand Down
13 changes: 10 additions & 3 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,16 @@ formats:
- pdf
- htmlzip
python:
version: 3.8
install:
- requirements: requirements.txt
- requirements: doc-source/requirements.txt
- method: pip
path: .
build:
os: ubuntu-20.04
tools:
python: '3.9'
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
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ domplotlib
:target: https://github.com/domdfcoding/domplotlib/commit/master
:alt: GitHub last commit

.. |maintained| image:: https://img.shields.io/maintenance/yes/2022
.. |maintained| image:: https://img.shields.io/maintenance/yes/2024
:alt: Maintenance

.. |pypi-downloads| image:: https://img.shields.io/pypi/dm/domplotlib
Expand Down
2 changes: 1 addition & 1 deletion doc-source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ domplotlib
:last-commit:
:alt: GitHub last commit

.. |maintained| maintained-shield:: 2022
.. |maintained| maintained-shield:: 2024
:alt: Maintenance

.. |pypi-downloads| pypi-shield::
Expand Down
18 changes: 9 additions & 9 deletions doc-source/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
default-values>=0.5.0
extras-require>=0.2.0
furo>=2020.11.19b18
html-section>=0.1.0
seed-intersphinx-mapping>=0.3.1
default-values>=0.6.0
extras-require>=0.5.0
furo==2021.06.18b36
html-section>=0.3.0
seed-intersphinx-mapping>=1.2.2
sphinx>=3.0.3
sphinx-copybutton>=0.2.12
sphinx-debuginfo>=0.1.0
sphinx-licenseinfo>=0.1.1
sphinx-debuginfo>=0.2.2
sphinx-licenseinfo>=0.3.1
sphinx-notfound-page>=0.7.1
sphinx-prompt>=1.1.0
sphinx-pyproject>=0.1.0
sphinx-tabs>=1.1.13
sphinx-toolbox>=2.13.0
sphinx-toolbox>=3.5.0
sphinxcontrib-httpdomain>=1.7.0
sphinxemoji>=0.1.6
toctree-plus>=0.5.0
toctree-plus>=0.6.1
2 changes: 1 addition & 1 deletion formate.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ known_third_party = [
"requests",
"typing_extensions",
]
known_first_party = "domplotlib"
known_first_party = [ "domplotlib",]
2 changes: 1 addition & 1 deletion sort_image_hashes.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
data.sort(key=itemgetter(0))
with open(filename, 'w', encoding="UTF-8") as fp:
json.dump(dict(data), fp, indent=2)
fp.write("\n")
fp.write('\n')
Loading

0 comments on commit 046a5a7

Please sign in to comment.