From a4116832e7a7819358e05eac3bb71d91fe77c6c9 Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Fri, 8 Apr 2022 20:49:39 +0200 Subject: [PATCH] fix(build-toolchain): migrate versioning to setuptools_scm versioning of package now handled through setuptools_scm. Git tag therefore takes precedence and manually setting a version in setup.cfg is redundant. In addition, setuptools_scm handles proper inclusion of sdist non-python files and simplifies bdist packaging. --- .gitignore | 4 +++- MANIFEST.in | 2 -- pyproject.toml | 7 +++++-- setup.cfg | 5 ++++- 4 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 MANIFEST.in diff --git a/.gitignore b/.gitignore index 0ec6dc9..e2bd56f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,6 @@ **/__pycache__/ .DS_Store .coverage -/*.md \ No newline at end of file +/*.md +/.eggs/ +/devel/ \ No newline at end of file diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 75d6607..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,2 +0,0 @@ -recursive-include src/httpaste/schema *.json -recursive-incude src/httpaste/backend *.sql diff --git a/pyproject.toml b/pyproject.toml index 9111d02..cb91714 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,8 @@ [build-system] requires = [ "setuptools", - "wheel" + "wheel", + "setuptools-scm[toml]" ] build-backend = "setuptools.build_meta" @@ -9,4 +10,6 @@ build-backend = "setuptools.build_meta" max_line_length = 80 aggressive = 3 recursive = true -in-place = true \ No newline at end of file +in-place = true + +[tool.setuptools_scm] diff --git a/setup.cfg b/setup.cfg index 915d670..465a26b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = httpaste-victorykit -version = 1.0.9-alpha author = Tiara Rodney author_email = t.rodney@victoryk.it description = a versatile HTTP pastebin @@ -38,3 +37,7 @@ console_scripts = [options.packages.find] where = src +[options.package_data] +* = + *.json + *.sql \ No newline at end of file