Skip to content

Commit

Permalink
chore: merge branch 'main' into feature-merge/2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lengau committed Aug 8, 2024
2 parents 026b78d + 3b092a3 commit be8fd06
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Release Drafter
uses: release-drafter/release-drafter@v5.25.0
uses: release-drafter/release-drafter@v6.0.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/release-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Get pypi artifacts
uses: actions/download-artifact@v4
- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: |
**
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
env:
PYTEST_ADDOPTS: "--no-header -vv -rN"
- name: Upload code coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
directory: ./results/
files: coverage*.xml
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ repos:
- id: mixed-line-ending
- repo: https://github.com/charliermarsh/ruff-pre-commit
# renovate: datasource=pypi;depName=ruff
rev: "v0.0.267"
rev: "v0.4.4"
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- repo: https://github.com/psf/black
# renovate: datasource=pypi;depName=black
rev: "23.3.0"
rev: "23.12.1"
hooks:
- id: black
- repo: https://github.com/adrienverge/yamllint.git
# renovate: datasource=pypi;depName=yamllint
rev: "v1.31.0"
rev: "v1.35.1"
hooks:
- id: yamllint
2 changes: 1 addition & 1 deletion craft_store/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def get_credentials(self) -> str:
encoded_credentials_string = self._keyring.get_password(
self.application_name, self.host
)
except Exception as unknown_error: # noqa: BLE001
except Exception as unknown_error:
logger.debug(
"Unhandled exception raised when retrieving credentials: %r",
unknown_error,
Expand Down
16 changes: 8 additions & 8 deletions docs/.sphinx/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
furo==2023.9.10
furo==2024.7.18
lxd-sphinx-extensions==0.0.16
myst-parser==2.0.0
myst-parser==3.0.1
pyspelling==2.10
sphinx==7.2.6
sphinx-autobuild==2021.3.14
sphinx==7.4.7
sphinx-autobuild==2024.4.16
sphinxcontrib-jquery==4.1
sphinx-copybutton==0.5.2
sphinx-design==0.5.0
sphinx-design==0.6.0
sphinxext-opengraph==0.9.1
sphinx-lint==0.9.1
sphinx-notfound-page==1.0.0
sphinx-reredirects==0.1.3
sphinx-notfound-page==1.0.2
sphinx-reredirects==0.1.5
sphinx-tabs==3.4.5
sphinx-toolbox==3.5.0
sphinx-toolbox==3.7.0
30 changes: 15 additions & 15 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ requires-python = ">=3.10"
dev = [
"build",
"pyyaml>=6.0.0",
"coverage[toml]==7.4.4",
"pytest==8.1.1",
"coverage[toml]==7.6.0",
"pytest==8.3.1",
"pytest-cov==5.0.0",
"pytest-mock==3.14.0",
"pytest-check>=2.0",
"pytest-subprocess>=1.5",
"pytest-timeout>=2.0",
]
lint = [
"black==23.12.1",
"codespell[toml]==2.2.6",
"ruff==0.1.15",
"black==24.4.2",
"codespell[toml]==2.3.0",
"ruff==0.4.4",
"yamllint==1.35.1"
]
types = [
"mypy[reports]==1.9.0",
"pyright==1.1.367",
"mypy[reports]==1.11.0",
"pyright==1.1.372",
"types-PyYAML",
"types-Pygments",
"types-colorama",
Expand All @@ -61,19 +61,19 @@ types = [
"types-setuptools",
]
docs = [
"furo==2023.9.10",
"furo==2024.7.18",
"lxd-sphinx-extensions==0.0.16",
"myst-parser==2.0.0",
"myst-parser==3.0.1",
"pyspelling==2.10",
"sphinx==7.2.6",
"sphinx-autobuild==2021.3.14",
"sphinx==7.4.7",
"sphinx-autobuild==2024.4.16",
"sphinxcontrib-jquery==4.1",
"sphinx-copybutton==0.5.2",
"sphinx-design==0.5.0",
"sphinx-design==0.6.0",
"sphinxext-opengraph==0.9.1",
"sphinx-lint==0.9.1",
"sphinx-notfound-page==1.0.0",
"sphinx-reredirects==0.1.3",
"sphinx-notfound-page==1.0.2",
"sphinx-reredirects==0.1.5",
"sphinx-rtd-theme",
"sphinx-tabs==3.4.5",
"sphinx-toolbox>=2.5.0",
Expand All @@ -85,7 +85,7 @@ release = [

[build-system]
requires = [
"setuptools==69.2.0",
"setuptools==70.3.0",
"setuptools_scm[toml]>=7.1"
]
build-backend = "setuptools.build_meta"
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ requires =
# renovate: datasource=pypi
tox-ignore-env-name-mismatch>=0.2.0.post2
# renovate: datasource=pypi
tox-gh==1.3.1
tox-gh==1.3.2
# Allow tox to access the user's $TMPDIR environment variable if set.
# This workaround is required to avoid circular dependencies for TMPDIR,
# since tox will otherwise attempt to use the environment's TMPDIR variable.
Expand Down

0 comments on commit be8fd06

Please sign in to comment.