From b041a3f84f5ab4be71197ff93226ba224818ddb8 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Thu, 13 Jun 2019 09:24:30 +0200 Subject: [PATCH 1/3] =?UTF-8?q?setup.py:=20add=20a=20hyphen=20to=20the=20n?= =?UTF-8?q?ame=20=E2=86=92=20"git-imerge"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4b346a5..b77639b 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( - name="gitimerge", + name="git-imerge", description="Incremental merge for git", url="https://github.com/mhagger/git-imerge", author="Michael Haggerty", From f25a1618b56aa5d38d3055b6abbeed124297fa2a Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Thu, 13 Jun 2019 09:26:58 +0200 Subject: [PATCH 2/3] setup.py: add a long description --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b77639b..d798053 100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,9 @@ from setuptools import setup +with open("README.rst", "r") as fh: + long_description = fh.read() + data_files = [] try: completionsdir = subprocess.check_output( @@ -21,10 +24,12 @@ name="git-imerge", description="Incremental merge for git", url="https://github.com/mhagger/git-imerge", + version="1.1.0", author="Michael Haggerty", author_email="mhagger@alum.mit.edu", + long_description=long_description, + long_description_content_type="text/x-rst", license="GPLv2+", - version="1.1.0", py_modules=["gitimerge"], data_files=data_files, entry_points={"console_scripts": ["git-imerge = gitimerge:climain"]}, From a7f56b1754ca9d1edeece2a843a285e24eb7cb12 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Thu, 13 Jun 2019 09:27:20 +0200 Subject: [PATCH 3/3] setup.py: add some more classifiers --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index d798053..8cb21b3 100644 --- a/setup.py +++ b/setup.py @@ -45,5 +45,8 @@ "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Environment :: Console", + "Intended Audience :: Developers", + "Topic :: Software Development :: Version Control :: Git", ], )