Skip to content

Commit

Permalink
Apply minor fixes before releasing v3.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
PawelLipski committed May 2, 2023
1 parent 383943f commit 862c182
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
*

!git_machete/
!git-machete
!MANIFEST.in
!README.md
!requirements.txt
Expand Down
1 change: 1 addition & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## New in git-machete 3.17.2

- fixed: when `origin/feature/foo` branch exists, `git machete add foo` no longer falsely recognizes `origin/feature/foo` as a potential remote tracking branch for `foo`
- fixed: on Windows, git-machete installed globally via `pip` no longer crashes on `ModuleNotFoundError` within venvs (contributed by @cspotcode)

## New in git-machete 3.17.1

Expand Down
2 changes: 1 addition & 1 deletion ci/checks/enforce-indent-two-spaces-outside-python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ set -e -o pipefail -u
self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P)
self_name=$(basename -s .sh "$0")

git ls-files ':!*.awk' ':!/.circleci/config.yml' ':!*/Dockerfile' ':!docs/*' ':!*.gif' ':!git-machete' ':!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"
13 changes: 7 additions & 6 deletions git_machete/bin.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# flake8: noqa
import sys

# Since this shim needs to be compatible with Python 2,
# let's skip mypy checks, as type annotations were only introduced in Python 3.5.

def main():
# Check for correct python version
# Since function below needs to be compatible with python 2, lets skip Mypy checks, cause type annotations were introduced in python 3.5

def main(): # type: ignore
def validate_python_version(): # type: ignore
if sys.version_info[:2] < (3, 6):
version_str = "{}.{}.{}".format(sys.version_info.major, sys.version_info.minor, sys.version_info.micro)
# String interpolations were only introduced in Python 3.6
version_str = "{}.{}.{}".format(sys.version_info.major, sys.version_info.minor, sys.version_info.micro) # noqa: FS002
sys.stderr.write(
"Python {} is no longer supported. \n".format(version_str) +
"Python {} is no longer supported. \n".format(version_str) + # noqa: FS002
"Please switch to Python 3.6 or higher.\n")
sys.exit(1)

Expand Down
1 change: 0 additions & 1 deletion mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ disallow_subclassing_any = True
disallow_untyped_calls = True
disallow_untyped_decorators = True
disallow_untyped_defs = True
exclude = git_machete/bin.py
follow_imports = normal
no_implicit_optional = True
strict_optional = True
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ deps =
allowlist_externals = mkdir
commands =
mkdir -p test-results/
pytest -rP --numprocesses=auto --junitxml=test-results/testenv-{envname}.xml {posargs}
pytest --numprocesses=auto --junitxml=test-results/testenv-{envname}.xml {posargs}

[testenv:py36]
deps =
Expand Down

0 comments on commit 862c182

Please sign in to comment.