Skip to content

Commit

Permalink
Chore: Fix release process and update Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
amotl committed Dec 3, 2024
1 parent 0e1ae9c commit ae4dbf6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include setup.cfg *.txt *.rst *.md
include pyproject.toml *.txt *.rst *.md
exclude .bumpversion.cfg
recursive-include grafanimate *.py *.js
prune tests
18 changes: 6 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ $(eval pip := $(venvpath)/bin/pip)
$(eval python := $(venvpath)/bin/python)
$(eval pytest := $(venvpath)/bin/pytest)
$(eval bumpversion := $(venvpath)/bin/bumpversion)
$(eval black := $(venvpath)/bin/black)
$(eval isort := $(venvpath)/bin/isort)


# Setup Python virtualenv
Expand All @@ -28,10 +26,6 @@ setup-virtualenv:
test: setup-virtualenv
$(pytest) -vvv tests

format: install-releasetools
$(isort) .
$(black) .

format-js:
brew install prettier
prettier --write grafanimate
Expand All @@ -44,7 +38,7 @@ format-js:
# Release this piece of software
# Synopsis:
# make release bump=minor (major,minor,patch)
release: bumpversion push sdist pypi-upload
release: bumpversion push package pypi-upload


# -------------
Expand All @@ -66,17 +60,17 @@ bumpversion: install-releasetools
push:
git push && git push --tags

sdist:
@$(python) setup.py sdist
package:
@$(python) -m build

pypi-upload: install-releasetools
twine upload --skip-existing --verbose dist/*.tar.gz
twine upload --skip-existing --verbose dist/*{.tar.gz,.whl}

install-doctools: setup-virtualenv
@$(pip) install --quiet --requirement requirements-docs.txt --upgrade
@$(pip) install --quiet --upgrade --requirement '.[docs]'

install-releasetools: setup-virtualenv
@$(pip) install --quiet --requirement requirements-release.txt --upgrade
@$(pip) install --quiet --upgrade --requirement '.[release]'


# ==========================================
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ optional-dependencies.develop = [
]
optional-dependencies.release = [
"build<2",
"bump2version",
"keyring",
"twine<7",
]
Expand Down

0 comments on commit ae4dbf6

Please sign in to comment.