Skip to content

Commit

Permalink
Merge branch 'setuptools'
Browse files Browse the repository at this point in the history
  • Loading branch information
mhagger committed Jun 12, 2020
2 parents 85812fc + a7f56b1 commit d2e19f9
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -18,13 +21,15 @@


setup(
name="gitimerge",
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"]},
Expand All @@ -40,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",
],
)

0 comments on commit d2e19f9

Please sign in to comment.