Skip to content

Commit

Permalink
pyproject.toml: transfer more metadata from setup.cfg
Browse files Browse the repository at this point in the history
List out all packages intead of relying on find: or find_namespaces:.
find: warns because we have cola/i18n/ and cola/icons/ that contain
data files only. find_namespaces: finds too much and includes the
contrib/, requirements/ and bin/ directories.

Avoid these issues by listing the package.

Signed-off-by: David Aguilar <davvid@gmail.com>
  • Loading branch information
davvid committed Mar 26, 2023
1 parent 5b4e58b commit 1c4e58c
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 22 deletions.
21 changes: 21 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
[project]
name = "git-cola"
authors = [
{name = "David Aguilar", email = "davvid@gmail.com"}
]
classifiers = [
"Development Status :: 6 - Mature",
"Intended Audience :: Developers",
"Intended Audience :: End Users/Desktop",
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
"Programming Language :: Python :: 3",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: Software Development :: Version Control :: Git",
]
description = "A sleek and powerful Git GUI"
dynamic = ["version"]
license = {file = "COPYING"}
readme = "README.md"

[project.scripts]
cola = "cola.main:main"
git-cola = "cola.main:main"
git-dag = "cola.dag:main"
git-cola-sequence-editor = "cola.sequenceeditor:main"

[build-system]
requires = ["setuptools>=42", "setuptools_scm[toml]>=3.4.1"]
Expand Down
30 changes: 8 additions & 22 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
[metadata]
name = git-cola
author = David Aguilar
author_email = davvid@gmail.com
description = A sleek and powerful Git GUI
license_file = COPYING
license = GPL-2.0
long_description = Git Cola is a powerful Git GUI with a slick and intuitive user interface.
url = https://github.com/git-cola/git-cola
platform = any
classifiers =
Development Status :: 6 - Mature
Intended Audience :: Developers
Intended Audience :: End Users/Desktop
License :: OSI Approved :: GNU General Public License v2 (GPLv2)
Programming Language :: Python :: 3
Topic :: Software Development :: Libraries :: Python Modules
Topic :: Software Development :: Version Control :: Git

[bdist_rpm]
release = 1
Expand All @@ -36,8 +23,13 @@ build-dir = docs/_build
source-dir = docs/

[options]
python_requires = >=2.7
packages = find:
packages =
cola
cola.bin
cola.i18n
cola.icons
cola.models
cola.widgets
include_package_data = true
install_requires =
importlib_metadata; python_version<"3.8"
Expand All @@ -53,6 +45,7 @@ cola =

[options.packages.find]
exclude =
bin*
build*
dist*
docs*
Expand Down Expand Up @@ -102,10 +95,3 @@ docs =
rst.linker >= 1.9

# local

[options.entry_points]
console_scripts =
cola = cola.main:main
git-cola = cola.main:main
git-dag = cola.dag:main
git-cola-sequence-editor = cola.sequenceeditor:main

0 comments on commit 1c4e58c

Please sign in to comment.