From aca71949eb6a4f3f9ea2ca2a8564735f6a54db7e Mon Sep 17 00:00:00 2001 From: James Cooke Date: Sat, 4 Nov 2023 15:41:05 +0000 Subject: [PATCH] Fix tag recipe (#233) * Fix tag recipe: use grep to sniff release number from __about__.py * Other Makefile changes * Update CHANGELOG --- CHANGELOG.rst | 8 ++++++++ Makefile | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8faf649..f16944a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -25,6 +25,14 @@ Unreleased_ See also `latest documentation `_. +Changed +....... + +* 📕 Version signatures now run on Python 3.12, upgraded from Python 3.11. + +* ⛏️ Make tag recipe fixed to work using grep. `Issue 224 + `_. + 0.17.0_ - 2023/10/30 -------------------- diff --git a/Makefile b/Makefile index adb3862..216b404 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ docs: # Generate version signature used in README.rst .PHONY: signature signature: - tox exec -e py311-meta_plugin_dogfood -- flake8 --version + tox exec -e py312-meta_plugin_dogfood -- flake8 --version .PHONY: clean clean: @@ -58,11 +58,11 @@ bdist_wheel: .PHONY: testpypi testpypi: clean sdist bdist_wheel - twine upload --repository-url https://test.pypi.org/legacy/ dist/* + twine upload --username=__token__ --repository-url https://test.pypi.org/legacy/ dist/* .PHONY: pypi pypi: sdist bdist_wheel - twine upload --repository-url https://upload.pypi.org/legacy/ dist/* + twine upload --username=__token__ --repository-url https://upload.pypi.org/legacy/ dist/* .PHONY: on_master on_master: @@ -70,7 +70,7 @@ on_master: .PHONY: tag tag: on_master - git tag -a $$(python -c 'from src.flake8_aaa.__about__ import __version__; print("v{}".format(__version__))') + git tag -a v$$(grep -E "^__version__ = .*" -- src/flake8_aaa/__about__.py | grep -Eo '[0-9\.]*') .PHONY: fixlint fixlint: