summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common.mk1
-rw-r--r--pyproject.toml3
-rwxr-xr-xsetup.py9
3 files changed, 6 insertions, 7 deletions
diff --git a/common.mk b/common.mk
index 4bad419..c534915 100644
--- a/common.mk
+++ b/common.mk
@@ -21,7 +21,6 @@ release:
@if ! type -P twine; then echo "Please install twine"; exit 1; fi
git pull
git clean -x --force $$(python setup.py --name)
- sed -i -e "s/version=\([\'\"]\)[0-9]*\.[0-9]*\.[0-9]*/version=\1$${TAG:1}/" setup.py
git add setup.py
TAG_MSG=$$(mktemp); \
echo "# Changes for ${TAG} ($$(date +%Y-%m-%d))" > $$TAG_MSG; \
diff --git a/pyproject.toml b/pyproject.toml
index 3317b5d..f76dfb4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,3 +21,6 @@ ignore_missing_imports = true
[[tool.mypy.overrides]]
module = "yq.version"
ignore_missing_imports = true
+
+[tool.setuptools_scm]
+version_file = "yq/version.py"
diff --git a/setup.py b/setup.py
index 97b4547..f2ba1bd 100755
--- a/setup.py
+++ b/setup.py
@@ -4,18 +4,15 @@ from setuptools import find_packages, setup
setup(
name="yq",
- version="3.4.2",
url="https://github.com/kislyuk/yq",
license="Apache Software License",
author="Andrey Kislyuk",
author_email="kislyuk@gmail.com",
description="Command-line YAML/XML processor - jq wrapper for YAML/XML documents",
long_description=open("README.rst").read(),
- python_requires=">=3.6",
- use_scm_version={
- "write_to": "yq/version.py",
- },
- setup_requires=["setuptools_scm >= 7, <8"],
+ python_requires=">=3.8",
+ use_scm_version=True,
+ setup_requires=["setuptools_scm >= 7"],
install_requires=[
"PyYAML >= 5.3.1",
"xmltodict >= 0.11.0",