Skip to content

Commit

Permalink
Bump the required group across 1 directory with 15 updates (#78)
Browse files Browse the repository at this point in the history
  • Loading branch information
llucax authored Aug 26, 2024
2 parents fe7d9f2 + 9b1220f commit 64c6192
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 25 deletions.
7 changes: 5 additions & 2 deletions .github/containers/test-installation/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@ RUN apt-get update -y && \
python -m pip install --upgrade --no-cache-dir pip

COPY dist dist
RUN pip install dist/*.whl && \
rm -rf dist
# This git-credentials file is made available by the GitHub ci.yaml workflow
COPY git-credentials /root/.git-credentials
RUN git config --global credential.helper store && \
pip install dist/*.whl && \
rm -rf dist /root/.git-credentials
42 changes: 37 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- name: Setup Git
uses: frequenz-floss/[email protected]

- name: Print environment (debug)
run: env

Expand Down Expand Up @@ -88,10 +91,14 @@ jobs:
# The job name should match the name of the `nox` job.
name: Test with nox
needs: ["nox"]
# We skip this job only if nox was also skipped
if: always() && needs.nox.result != 'skipped'
runs-on: ubuntu-20.04
env:
DEPS_RESULT: ${{ needs.nox.result }}
steps:
- name: Return true
run: "true"
- name: Check matrix job result
run: test "$DEPS_RESULT" = "success"

nox-cross-arch:
name: Cross-arch tests with nox
Expand All @@ -115,6 +122,9 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- name: Setup Git
uses: frequenz-floss/[email protected]

- name: Fetch sources
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -161,7 +171,7 @@ jobs:
uses: actions/cache@v4
with:
path: /tmp/pip-cache
key: nox-${{ matrix.nox-session }}-${{ matrix.arch }}-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('**/pyproject.toml') }}
key: nox-${{ matrix.nox-session }}-${{ matrix.arch }}-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}

# This ensures that the docker container has access to the pip cache.
# Changing the user in the docker-run step causes it to fail due to
Expand Down Expand Up @@ -202,15 +212,22 @@ jobs:
# The job name should match the name of the `nox-cross-arch` job.
name: Cross-arch tests with nox
needs: ["nox-cross-arch"]
# We skip this job only if nox-cross-arch was also skipped
if: always() && needs.nox-cross-arch.result != 'skipped'
runs-on: ubuntu-20.04
env:
DEPS_RESULT: ${{ needs.nox-cross-arch.result }}
steps:
- name: Return true
run: "true"
- name: Check matrix job result
run: test "$DEPS_RESULT" = "success"

build:
name: Build distribution packages
runs-on: ubuntu-20.04
steps:
- name: Setup Git
uses: frequenz-floss/[email protected]

- name: Fetch sources
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -245,15 +262,24 @@ jobs:
steps:
- name: Fetch sources
uses: actions/checkout@v4

- name: Download package
uses: actions/download-artifact@v4
with:
name: dist-packages
path: dist

- name: Make Git credentials available to docker
run: |
touch ~/.git-credentials # Ensure the file exists
cp ~/.git-credentials git-credentials || true
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up docker-buildx
uses: docker/setup-buildx-action@v3

- name: Test Installation
uses: docker/build-push-action@v6
with:
Expand Down Expand Up @@ -431,6 +457,12 @@ jobs:
# https://blog.pypi.org/posts/2023-04-20-introducing-trusted-publishers/
id-token: write
steps:
- name: Setup Git
uses: frequenz-floss/[email protected]

- name: Fetch sources
uses: actions/checkout@v4

- name: Download distribution files
uses: actions/download-artifact@v4
with:
Expand Down
3 changes: 2 additions & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ plugins:
- literate-nav:
nav_file: SUMMARY.md
- mike:
alias_type: redirect
alias_type: symlink
canonical_version: latest
- mkdocstrings:
default_handler: python
Expand All @@ -111,6 +111,7 @@ plugins:
show_signature_annotations: true
show_source: true
show_symbol_type_toc: true
show_symbol_type_toc: true
signature_crossrefs: true
import:
# See https://mkdocstrings.github.io/python/usage/#import for details
Expand Down
39 changes: 22 additions & 17 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,42 +47,43 @@ email = "[email protected]"

[project.optional-dependencies]
dev-flake8 = [
"flake8 == 7.1.0",
"flake8 == 7.1.1",
"flake8-docstrings == 1.7.0",
"flake8-pyproject == 1.2.3", # For reading the flake8 config from pyproject.toml
"pydoclint == 0.5.3",
"pydoclint == 0.5.6",
"pydocstyle == 6.3.0",
]
dev-formatting = ["black == 24.4.2", "isort == 5.13.2"]
dev-formatting = ["black == 24.8.0", "isort == 5.13.2"]
dev-mkdocs = [
"black == 24.4.2",
"Markdown==3.6",
"mike == 2.1.2",
"black == 24.8.0",
"Markdown==3.7",
"mike == 2.1.3",
"mkdocs-gen-files == 0.5.0",
"mkdocs-literate-nav == 0.6.1",
"mkdocs-macros-plugin == 1.0.5",
"mkdocs-material == 9.5.27",
"mkdocstrings[python] == 0.25.1",
"frequenz-repo-config[lib] == 0.9.2",
"mkdocs-material == 9.5.33",
"mkdocstrings[python] == 0.25.2",
"mkdocstrings-python == 1.10.8",
"frequenz-repo-config[lib] == 0.10.0",
]
dev-mypy = [
"mypy == 1.10.1",
"types-Markdown == 3.6.0.20240316",
"mypy == 1.11.2",
"types-Markdown == 3.7.0.20240822",
# For checking the noxfile, docs/ script, and tests
"frequenz-client-microgrid[dev-mkdocs,dev-noxfile,dev-pytest]",
]
dev-noxfile = ["nox == 2024.4.15", "frequenz-repo-config[lib] == 0.9.2"]
dev-noxfile = ["nox == 2024.4.15", "frequenz-repo-config[lib] == 0.10.0"]
dev-pylint = [
"pylint == 3.2.5",
"pylint == 3.2.6",
# For checking the noxfile, docs/ script, and tests
"frequenz-client-microgrid[dev-mkdocs,dev-noxfile,dev-pytest]",
]
dev-pytest = [
"pytest == 8.2.2",
"frequenz-repo-config[extra-lint-examples] == 0.9.2",
"pytest == 8.3.2",
"frequenz-repo-config[extra-lint-examples] == 0.10.0",
"pytest-mock == 3.14.0",
"pytest-asyncio == 0.23.7",
"async-solipsism == 0.6",
"pytest-asyncio == 0.24.0",
"async-solipsism == 0.7",
]
dev = [
"frequenz-client-microgrid[dev-mkdocs,dev-flake8,dev-formatting,dev-mkdocs,dev-mypy,dev-noxfile,dev-pylint,dev-pytest]",
Expand Down Expand Up @@ -138,8 +139,12 @@ disable = [
# pylint's unsubscriptable check is buggy and is not needed because
# it is a type-check, for which we already have mypy.
"unsubscriptable-object",
# Checked by mypy
"no-member",
# Checked by flake8
"f-string-without-interpolation",
"line-too-long",
"missing-function-docstring",
"redefined-outer-name",
"unnecessary-lambda-assignment",
"unused-import",
Expand Down

0 comments on commit 64c6192

Please sign in to comment.