make package easier to distribute

Author: tedivm

.gitignore

@@ -101,3 +101,5 @@ ENV/
 .mypy_cache/
 
 .gitcredentials
+
+MANIFEST

LICENSE LICENSE.txtLICENSE renamed to LICENSE.txt

@@ -15,5 +15,4 @@ if [ ! -f $ENV ]; then
 fi
 source $ENV
 
-SCRIPT="$DIR/../gitconsensus/gitconsensus"
-$SCRIPT "$@"
+python -m gitconsensus.gitconsensus "$@"

bin/gitconsensus

@@ -1,9 +1,8 @@
-#!/usr/bin/env python3
 import click
 import github3
 import os
 import random
-from repository import Repository
+from gitconsensus.repository import Repository
 import string
 
 @click.group()
@@ -104,7 +103,5 @@ def close(username, repository_name):
             click.echo("Closing PR#%s" % (request.number,))
             request.close()
 
-
-
 if __name__ == '__main__':
     cli()

gitconsensus/gitconsensus gitconsensus/gitconsensus.pygitconsensus/gitconsensus renamed to gitconsensus/gitconsensus.py

@@ -1,4 +1,4 @@
-import config
+import gitconsensus.config
 import datetime
 import github3
 import json

gitconsensus/repository.py

@@ -6,25 +6,25 @@ ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
 all: dependencies
 
-fresh: fulluninstall dependencies
-
-fulluninstall: uninstall cleancode
-
-install:
-	ln -s -f $(ROOT_DIR)/bin/gitconsensus /usr/local/bin/gitconsensus
-
-dependencies:
-	if [ ! -d $(ROOT_DIR)/env ]; then python3 -m venv $(ROOT_DIR)/env; fi
-	source $(ROOT_DIR)/env/bin/activate; yes w | python3 -m pip install -r $(ROOT_DIR)/requirements.txt
-
-uninstall:
-	if [ -L /usr/local/bin/gitconsensus ]; then \
-		rm /usr/local/bin/gitconsensus; \
-	fi;
-
-cleancode:
+clean:
 	rm -rf $(ROOT_DIR)/*.pyc
 	# Remove existing environment
 	if [ -d $(ROOT_DIR)/env ]; then \
 		rm -rf $(ROOT_DIR)/env; \
 	fi;
+	if [ -d $(ROOT_DIR)/dist ]; then \
+		rm -rf $(ROOT_DIR)/dist; \
+	fi;
+	if [ -d $(ROOT_DIR)/build ]; then \
+		rm -rf $(ROOT_DIR)/build; \
+	fi;
+	if [ -d $(ROOT_DIR)/gitconsensus.egg-info ]; then \
+		rm -rf $(ROOT_DIR)/gitconsensus.egg-info; \
+	fi;
+
+dependencies:
+	if [ ! -d $(ROOT_DIR)/env ]; then python3 -m venv $(ROOT_DIR)/env; fi
+	source $(ROOT_DIR)/env/bin/activate; yes w | python -m pip install -e .[dev]
+
+package:
+	source $(ROOT_DIR)/env/bin/activate; python setup.py bdist_wheel

makefile

@@ -1,4 +1,4 @@
-click==0.5
+click==5.0
 github3.py==0.9.6
 PyYAML==3.12
 requests==2.18.4

requirements.txt

@@ -0,0 +1,2 @@
+[metadata]
+description-file = README.md

setup.cfg

@@ -0,0 +1,63 @@
+# Always prefer setuptools over distutils
+from setuptools import setup, find_packages
+# To use a consistent encoding
+from codecs import open
+from os import path
+
+here = path.abspath(path.dirname(__file__))
+
+# Get the long description from the README file
+with open(path.join(here, 'README.md'), encoding='utf-8') as f:
+    long_description = f.read()
+
+
+setup(
+
+  name = 'gitconsensus',
+
+  version = '0.0.1.dev1',
+  packages=find_packages(),
+
+  description = 'Automate Github Pull Requests using Reactions',
+  long_description=long_description,
+  python_requires='>=3',
+
+  author = 'Robert Hafner',
+  author_email = '[email protected]',
+  url = 'https://github.com/tedivm/gitconsensus',
+  download_url = 'https://github.com/tedivm/gitconsensus/archive/0.1.tar.gz',
+  keywords = 'automation github consensus git',
+
+  classifiers = [
+    'Development Status :: 4 - Beta',
+    'License :: OSI Approved :: MIT License',
+
+    'Intended Audience :: Developers',
+    'Intended Audience :: System Administrators',
+    'Topic :: Software Development :: Version Control'
+
+    'Programming Language :: Python :: 3',
+    'Environment :: Console',
+  ],
+
+  install_requires=[
+    'click>=5.0,<6.0',
+    'github3.py==0.9.6,<0.10',
+    'PyYAML>=3.12,<3.13',
+    'requests>=2.18.0,<2.19',
+  ],
+
+  extras_require={
+    'dev': [
+      'wheel',
+      'twine'
+    ],
+  },
+
+  entry_points={
+    'console_scripts': [
+      'gitconsensus=gitconsensus.gitconsensus:cli',
+    ],
+  },
+
+)