Skip to content

Commit

Permalink
Merge pull request #148 from lsst-sqre/u/jonathansick/update-precommit
Browse files Browse the repository at this point in the history
Update pre-commit plugins
  • Loading branch information
jonathansick authored Feb 8, 2023
2 parents 047297c + 4306b55 commit 4ba8a9a
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 12 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
sphinx-version:
- "5"
- "dev"
Expand Down Expand Up @@ -60,7 +61,7 @@ jobs:
- name: Build docs in tox
uses: lsst-sqre/run-tox@v1
with:
python-version: "3.10"
python-version: "3.11"
tox-envs: "docs,docs-lint"
use-cache: false

Expand Down Expand Up @@ -91,5 +92,5 @@ jobs:
uses: lsst-sqre/build-and-publish-to-pypi@v1
with:
pypi-token: ""
python-version: "3.10"
python-version: "3.11"
upload: false
7 changes: 4 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.11'

- name: Run pre-commit
uses: pre-commit/[email protected]
Expand All @@ -38,6 +38,7 @@ jobs:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
sphinx-version:
- '5'

Expand Down Expand Up @@ -82,7 +83,7 @@ jobs:
- name: Run tox
uses: lsst-sqre/run-tox@v1
with:
python-version: '3.10'
python-version: '3.11'
tox-envs: 'docs,docs-lint'

# Only attempt documentation uploads for tagged releases and pull
Expand Down Expand Up @@ -123,5 +124,5 @@ jobs:
uses: lsst-sqre/build-and-publish-to-pypi@v1
with:
pypi-token: ${{ secrets.PYPI_SQRE_ADMIN }}
python-version: '3.10'
python-version: '3.11'
upload: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,7 @@ docs/_build/

# PyBuilder
target/

# Python environments
.venv
venv
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ repos:
files: (README\.rst)|(CHANGELOG\.rst)

- repo: https://github.com/PyCQA/isort/
rev: 5.11.4
rev: 5.12.0
hooks:
- id: isort
additional_dependencies:
- toml

- repo: https://github.com/psf/black
rev: 22.12.0
rev: 23.1.0
hooks:
- id: black

- repo: https://github.com/asottile/blacken-docs
rev: v1.12.1
rev: 1.13.0
hooks:
- id: blacken-docs
additional_dependencies: [black==22.12.0]
Expand All @@ -38,7 +38,7 @@ repos:
- id: flake8

- repo: https://github.com/pre-commit/mirrors-prettier
rev: 'v2.7.1'
rev: 'v3.0.0-alpha.4'
hooks:
- id: prettier
types_or: [css, scss, javascript]
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Intended Audience :: Developers",
"Topic :: Documentation",
"Topic :: Documentation :: Sphinx",
Expand Down
2 changes: 0 additions & 2 deletions src/documenteer/sphinxext/lssttasks/topiclists.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ def types(self):


class ConfigurableListDirective(BaseTopicListDirective):

directive_name = "lsst-configurables"

@property
Expand All @@ -170,7 +169,6 @@ def types(self):


class ConfigListDirective(TaskListDirective):

directive_name = "lsst-configs"

@property
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ description = Compile coverage from each test run.
skip_install = true
deps = coverage[toml]>=5.0.2
depends =
py{37,38,39}-test-sphinx{5}
py-test-sphinx{5}
commands =
coverage combine
coverage report
Expand Down

0 comments on commit 4ba8a9a

Please sign in to comment.