chore: move metadata to pyproject

DataShades · Oct 17, 2024 · 34a63a9 · 34a63a9
1 parent 9c40a26
commit 34a63a9
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 <!-- insertion marker -->
-## Unreleased
+## [0.2.0](https://github.com/DataShades/ckanext-collection/releases/tag/0.2.0) - 2024-10-17
 
-<small>[Compare with latest](https://github.com/DataShades/ckanext-collection/compare/v0.1.2...HEAD)</small>
+<small>[Compare with v0.1.2](https://github.com/DataShades/ckanext-collection/compare/v0.1.2...0.2.0)</small>
 
 ### Features
 
@@ -20,7 +20,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - ModelData has naive filters/search enabled by default ([cf16a86](https://github.com/DataShades/ckanext-collection/commit/cf16a86a4e90eff51c2d3e1387105af35f1c3ef0) by Sergey Motornyuk).
 - Columns filterable and sortable are empty by default ([aeb3950](https://github.com/DataShades/ckanext-collection/commit/aeb3950bda6013a680d9f48bba9d481d52d0bd47) by Sergey Motornyuk).
 
-<!-- insertion marker -->
 ## [v0.1.2](https://github.com/DataShades/ckanext-collection/releases/tag/v0.1.2) - 2024-03-03
 
 <small>[Compare with v0.1.1](https://github.com/DataShades/ckanext-collection/compare/v0.1.1...v0.1.2)</small>

diff --git a/Makefile b/Makefile
@@ -5,21 +5,8 @@ help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
 
 
-# Type	Section
-# build	Build
-# chore	Chore
-# ci	Continuous Integration
-# deps	Dependencies
-# doc(s)	Docs
-# feat	Features
-# fix	Bug Fixes
-# perf	Performance Improvements
-# ref(actor)	Code Refactoring
-# revert	Reverts
-# style	Style
-# test(s)	Tests
 changelog:  ## compile changelog
-	git changelog
+	git changelog -c conventional -o CHANGELOG.md $(if $(bump),-B $(bump))
 
 vendor:
 	cp node_modules/htmx.org/dist/htmx.js ckanext/collection/assets/vendor

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,42 @@
+[build-system]
+requires = [ "setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "ckanext-collection"
+version = "0.2.0"
+description = ""
+classifiers = [ "Development Status :: 4 - Beta", "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12",]
+keywords = [ "CKAN",]
+requires-python = ">= 3.8"
+dependencies = [ "typing-extensions",]
+readme = "README.md"
+license = {text = "AGPL"}
+authors = [
+    {name = "DataShades", email = "datashades@linkdigital.com.au"},
+    {name = "Sergey Motornyuk", email = "sergey.motornyuk@linkdigital.com.au"},
+]
+maintainers = [
+    {name = "DataShades", email = "datashades@linkdigital.com.au"},
+]
+
+[project.urls]
+Homepage = "https://github.com/DataShades/ckanext-collection"
+
+[project.optional-dependencies]
+test = [ "pytest-ckan", "ckanext-toolbelt",]
+docs = [ "mkdocs", "mkdocs-material", "pymdown-extensions", "mkdocstrings[python]",]
+dev = [ "pytest-ckan", "ckanext-toolbelt", "mkdocs", "mkdocs-material", "pymdown-extensions", "mkdocstrings[python]",]
+
+[project.entry-points."ckan.plugins"]
+collection = "ckanext.collection.plugin:CollectionPlugin"
+
+[project.entry-points."babel.extractors"]
+ckan = "ckan.lib.extract:extract_ckan"
+
+[tool.setuptools.packages]
+find = {}
+
 [tool.black]
 # line-length = 88
 # preview = true

diff --git a/setup.cfg b/setup.cfg
@@ -1,52 +1,3 @@
-[metadata]
-name = ckanext-collection
-version = 0.2.0a1
-description =
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://github.com/DataShades/ckanext-collection
-author = Sergey Motornyuk
-author_email = sergey.motornyuk@linkdigital.com.au
-license = AGPL
-classifiers =
-            Development Status :: 4 - Beta
-            License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
-            Programming Language :: Python :: 3.8
-            Programming Language :: Python :: 3.9
-            Programming Language :: Python :: 3.10
-            Programming Language :: Python :: 3.11
-            Programming Language :: Python :: 3.12
-keywords = CKAN
-
-[options]
-python_requires = >= 3.8
-packages = find:
-namespace_packages = ckanext
-install_requires =
-                 typing-extensions
-include_package_data = True
-
-[options.entry_points]
-ckan.plugins =
-             collection = ckanext.collection.plugin:CollectionPlugin
-
-babel.extractors =
-                 ckan = ckan.lib.extract:extract_ckan
-
-[options.extras_require]
-test =
-     pytest-ckan
-     ckanext-toolbelt
-
-docs =
-     mkdocs
-     mkdocs-material
-     pymdown-extensions
-     mkdocstrings[python]
-dev =
-    %(test)s
-    %(docs)s
-
 [extract_messages]
 keywords = translate isPlural
 add_comments = TRANSLATORS: