@@ -55,7 +55,6 @@ clean-coverage: ## remove coverage artifacts
5555
5656.PHONY : clean-test
5757clean-test : # # remove test artifacts
58- rm -fr .tox/
5958 rm -fr .pytest_cache
6059
6160.PHONY : clean
@@ -76,6 +75,9 @@ install-test: clean-build clean-pyc ## install the package and test dependencies
7675install-develop : clean-build clean-pyc # # install the package in editable mode and dependencies for development
7776 pip install -e .[dev]
7877
78+ .PHONY : install-readme
79+ install-readme : clean-build clean-pyc # # install the package in editable mode and readme dependencies for developement
80+ pip install -e .[readme]
7981
8082# LINT TARGETS
8183
@@ -116,10 +118,6 @@ test: test-unit test-integration test-readme test-tutorials ## test everything t
116118.PHONY : test-devel
117119test-devel : lint # # test everything that needs development dependencies
118120
119- .PHONY : test-all
120- test-all : # # run tests on every Python version with tox
121- tox -r
122-
123121.PHONY : coverage
124122coverage : # # check code coverage quickly with the default Python
125123 coverage run --source deepecho -m pytest
@@ -129,11 +127,6 @@ coverage: ## check code coverage quickly with the default Python
129127
130128
131129# RELEASE TARGETS
132-
133- .PHONY : git-push
134- git-push : # # Simply push the repository to github
135- git push
136-
137130.PHONY : dist
138131dist : clean # # builds source and wheel package
139132 python -m build --wheel --sdist
@@ -154,41 +147,47 @@ publish-test: dist publish-confirm ## package and upload a release on TestPyPI
154147publish : dist publish-confirm # # package and upload a release
155148 twine upload dist/*
156149
157- .PHONY : bumpversion-release
158- bumpversion-release : # # Merge main to stable and bumpversion release
150+ .PHONY : git-merge-main-stable
151+ git-merge-main-stable : # # Merge main into stable
159152 git checkout stable || git checkout -b stable
160153 git merge --no-ff main -m" make release-tag: Merge branch 'main' into stable"
161- bump-my-version bump release
154+
155+ .PHONY : git-merge-stable-main
156+ git-merge-stable-main : # # Merge stable into main
157+ git checkout main
158+ git merge stable
159+
160+ .PHONY : git-push
161+ git-push : # # Simply push the repository to github
162+ git push
163+
164+ .PHONY : git-push-tags-stable
165+ git-push-tags-stable : # # Push tags and stable to github
162166 git push --tags origin stable
163167
164- .PHONY : bumpversion-release-test
165- bumpversion-release-test : # # Merge main to stable and bumpversion release
166- git checkout stable || git checkout -b stable
167- git merge --no-ff main -m" make release-tag: Merge branch 'main' into stable"
168+ .PHONY : bumpversion-release
169+ bumpversion-release : # # Bump the version to the next release
168170 bump-my-version bump release --no-tag
169- @echo git push --tags origin stable
170171
171172.PHONY : bumpversion-patch
172- bumpversion-patch : # # Merge stable to main and bumpversion patch
173- git checkout main
174- git merge stable
175- bump-my-version bump patch --no-tag
176- git push
173+ bumpversion-patch : # # Bump the version to the next patch
174+ bump-my-version bump --no-tag patch
177175
178176.PHONY : bumpversion-candidate
179177bumpversion-candidate : # # Bump the version to the next candidate
180178 bump-my-version bump candidate --no-tag
181179
182180.PHONY : bumpversion-minor
183181bumpversion-minor : # # Bump the version the next minor skipping the release
184- bump-my-version bump minor --no-tag
182+ bump-my-version bump --no-tag minor
185183
186184.PHONY : bumpversion-major
187185bumpversion-major : # # Bump the version the next major skipping the release
188- bump-my-version bump major --no-tag
186+ bump-my-version bump --no-tag major
189187
190188.PHONY : bumpversion-revert
191189bumpversion-revert : # # Undo a previous bumpversion-release
190+ git tag --delete $(shell git tag --points-at HEAD)
192191 git checkout main
193192 git branch -D stable
194193
@@ -231,13 +230,20 @@ check-release: check-clean check-candidate check-main check-history ## Check if
231230 @echo " A new release can be made"
232231
233232.PHONY : release
234- release : check-release bumpversion-release publish bumpversion-patch
233+ release : check-release git-merge-main-stable bumpversion-release git-push-tags-stable \
234+ git-merge-stable-main bumpversion-patch git-push
235235
236236.PHONY : release-test
237- release-test : check-release bumpversion-release-test publish-test bumpversion-revert
237+ release-test : check-release git-merge-main-stable bumpversion-release bumpversion-revert
238238
239239.PHONY : release-candidate
240240release-candidate : check-main publish bumpversion-candidate git-push
241241
242242.PHONY : release-candidate-test
243243release-candidate-test : check-clean check-main publish-test
244+
245+ .PHONY : release-minor
246+ release-minor : check-release bumpversion-minor release
247+
248+ .PHONY : release-major
249+ release-major : check-release bumpversion-major release
0 commit comments