Skip to content

Commit

Permalink
Bump coverage from 7.0.0 to 7.0.1 (#748)
Browse files Browse the repository at this point in the history
* Bump coverage from 7.0.0 to 7.0.1

Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](nedbat/coveragepy@7.0.0...7.0.1)

---
updated-dependencies:
- dependency-name: coverage
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update our Nix expression path

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pawel Lipski <[email protected]>
  • Loading branch information
dependabot[bot] and PawelLipski authored Dec 26, 2022
1 parent 5cc6148 commit 6ddee6a
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 8 deletions.
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ ln -s ../../hook_samples/post-commit .git/hooks/post-commit
ln -s ../../ci/checks/run-all-checks.sh .git/hooks/pre-commit
```

Install `fish` and `shellcheck` for `run-all-checks.sh` to pass successfully.

## Run tests locally

Expand Down Expand Up @@ -184,7 +185,7 @@ Review fixes should be pushed on separate commits for easier viewing on GitHub (
Inspect the output of `docker-compose` and verify that the latest version gets correctly installed on Ubuntu (esp. see the output of `git machete --version`).

1. Thanks to the courtesy of [@blitz (Julian Stecklina)](https://github.com/blitz),
a [git-machete package](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/version-management/git-and-tools/git-machete/default.nix)
a [git-machete package](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/version-management/git-machete/default.nix)
lives in [Nixpkgs](https://github.com/NixOS/nixpkgs) &mdash; the collection of packages for [Nix package manager](https://nixos.org/).

Since @blitz's [PR #131141 to NixOS/nixpkgs](https://github.com/NixOS/nixpkgs/pull/131141),
Expand Down
4 changes: 2 additions & 2 deletions ci/checks/enforce-indent-two-spaces-outside-python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e -o pipefail -u

self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P)
self_name=$(basename --suffix=.sh "$0")
self_name=$(basename -s .sh "$0")

git ls-files ':!*.awk' ':!/.circleci/config.yml' ':!*/Dockerfile' ':!docs/*' ':!graphics/setup-sandbox' ':!*.md' ':!*.png' ':!*.py' ':!*.svg' \
git ls-files ':!*.awk' ':!/.circleci/config.yml' ':!*/Dockerfile' ':!docs/*' ':!*.gif' ':!graphics/setup-sandbox' ':!*.md' ':!*.png' ':!*.py' ':!*.svg' \
| xargs awk -f "$self_dir/$self_name.awk"
2 changes: 1 addition & 1 deletion ci/checks/enforce-release-notes-up-to-date.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e -o pipefail -u

current_version=$(python3 setup.py --version)
release_notes_version=$(sed '3!d' RELEASE_NOTES.md | egrep -o '(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)')
release_notes_version=$(sed '3!d' RELEASE_NOTES.md | grep -Eo '(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)')

if [[ $current_version != "$release_notes_version" ]]; then
echo "Please update RELEASE_NOTES.md! Current version: $current_version, latest version in RELEASE_NOTES.md (line 3): $release_notes_version."
Expand Down
2 changes: 1 addition & 1 deletion ci/checks/prohibit-strings-split-without-delimiter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e -o pipefail -u

self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P)
self_name=$(basename --suffix=.sh "$0")
self_name=$(basename -s .sh "$0")

git ls-files '*.py' ':!tests/**' \
| xargs awk -f "$self_dir/$self_name.awk"
2 changes: 1 addition & 1 deletion ci/checks/prohibit-trailing-whitespace.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

if git grep -EIn '\s+$' -- :!'*.py'; then
if git grep -EIn ' +$' -- :!'*.py'; then
echo 'The above lines contain trailing whitespace, please tidy up'
exit 1
fi
2 changes: 1 addition & 1 deletion ci/nixpkgs-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ RUN chmod +x /root/entrypoint.sh
CMD /root/entrypoint.sh

WORKDIR /root/nixpkgs
ENV EXPRESSION_PATH=pkgs/applications/version-management/git-and-tools/git-machete/default.nix
ENV EXPRESSION_PATH=pkgs/applications/version-management/git-machete/default.nix
2 changes: 1 addition & 1 deletion requirements.coverage.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
coverage==7.0.0
coverage==7.0.1
pytest==7.2.0
pytest-mock==3.10.0

0 comments on commit 6ddee6a

Please sign in to comment.