Skip to content

Commit

Permalink
Remove invocations of setup.py from non-Dockerized deployment code
Browse files Browse the repository at this point in the history
  • Loading branch information
PawelLipski committed Mar 9, 2024
1 parent 7f3306f commit a2d07e8
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 12 deletions.
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release notes

## New in git-machete 3.24.1

- fixed: deployment issues

## New in git-machete 3.24.0

- added: `-f`/`--as-first-child` flag to `git machete add` (contributed by @matthalp)
Expand Down
1 change: 0 additions & 1 deletion ci/checks/enforce-bumped-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ set -e -o pipefail -u

last_tag=$(git describe --tags --abbrev=0)
last_tag_version=${last_tag/v/}
# Not using `python3 setup.py --version` to make it work in the contexts where setuptools are missing (Python 3.12+)
current_version=$(cut -d\' -f2 git_machete/__init__.py)

if [[ "$(echo -e "$current_version\n$last_tag_version" | sort --version-sort | tail -n 1)" == "$last_tag_version" ]]; then
Expand Down
1 change: 0 additions & 1 deletion ci/checks/enforce-release-notes-up-to-date.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

set -e -o pipefail -u

# Not using `python3 setup.py --version` to make it work in the contexts where setuptools are missing (Python 3.12+)
current_version=$(cut -d\' -f2 git_machete/__init__.py)
release_notes_version=$(sed '3!d' RELEASE_NOTES.md | grep -Eo '(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*))+')

Expand Down
2 changes: 1 addition & 1 deletion ci/deb-ppa-upload/build-context/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ echo "$SSH_PRIVATE_KEY_CONTENTS_BASE64" | base64 -d > ~/.ssh/id_rsa
chmod 400 ~/.ssh/id_rsa

set -x
VERSION=$(python3 setup.py --version)
VERSION=$(cut -d\' -f2 git_machete/__init__.py)
export VERSION
envsubst '$VERSION' < debian/files.envsubst > debian/files
cp LICENSE debian/copyright
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ WORKDIR /tmp/input/
RUN find . | sort
RUN \
export PYTHONDONTWRITEBYTECODE=1; \
python setup.py install; \
pip install -e .; \
git machete --version; \
rm -rf /tmp/input/

Expand Down
2 changes: 1 addition & 1 deletion ci/docker/ci-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ else
do_push=true
fi

version=$(python3 setup.py --version)
version=$(cut -d\' -f2 git_machete/__init__.py)

docker build \
-t gitmachete/git-machete:$version \
Expand Down
2 changes: 1 addition & 1 deletion ci/github-releases/ci-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e -o pipefail -u -x

tag=v$(python3 setup.py --version)
tag=v$(cut -d\' -f2 git_machete/__init__.py)
# Note that this will also create a git tag on the remote
# (since apparently all non-draft releases on GitHub must have a corresponding git tag).
hub release create "$tag" \
Expand Down
2 changes: 1 addition & 1 deletion ci/homebrew/ci-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ else
pypi_host=pypi.org
fi

version=$(python3 setup.py --version)
version=$(cut -d\' -f2 git_machete/__init__.py)
url="https://$pypi_host/packages/source/g/git-machete/git-machete-$version.tar.gz"
sha256=$(
curl -s https://$pypi_host/pypi/git-machete/"$version"/json \
Expand Down
2 changes: 1 addition & 1 deletion ci/pypi/ci-wait-for-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e -o pipefail -u

host=$1
timeout_minutes=${2-30}
version=$(python3 setup.py --version)
version=$(cut -d\' -f2 git_machete/__init__.py)
url=https://$host/packages/source/g/git-machete/git-machete-$version.tar.gz

# Typically just 2 minutes of waiting are enough.
Expand Down
4 changes: 2 additions & 2 deletions docs/man/git-machete.1
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
.TH "GIT-MACHETE" "1" "Feb 26, 2024" "" "git-machete"
.TH "GIT-MACHETE" "1" "Mar 09, 2024" "" "git-machete"
.SH NAME
git-machete \- git-machete 3.24.0
git-machete \- git-machete 3.24.1
.sp
git machete is a robust tool that \fBsimplifies your git workflows\fP\&.
.sp
Expand Down
2 changes: 1 addition & 1 deletion git_machete/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '3.24.0'
__version__ = '3.24.1'
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ parts:
PS4='$0.$LINENO:'
set -x
craftctl default
version=$(python3 setup.py --version)
version=$(cut -d\' -f2 git_machete/__init__.py)
craftctl set version="$version"
apps:
Expand Down

0 comments on commit a2d07e8

Please sign in to comment.