Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor project structure #55

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Refactor project structure #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5558a6b
Begin work on setup.py
muff1nman Mar 2, 2014
d44ad64
Flushed out more of setup.py
muff1nman Mar 2, 2014
4326425
remove extra newlines
muff1nman Mar 2, 2014
a32229b
Added bin, moved bulk into module
muff1nman Mar 2, 2014
566626c
renamed module according to pep8
muff1nman Mar 2, 2014
1db9faa
Remove useless if main check
muff1nman Mar 2, 2014
90b9027
Added quick versioning
muff1nman Mar 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions bin/git-imerge
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#! /usr/bin/env python

from gitimerge.gitimerge import main
import sys

main(sys.argv[1:])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, this file shouldn't exist and instead be built using the setuptools console_scripts entry point feature. It is more compatible and tested across platforms.

https://python-packaging.readthedocs.io/en/latest/command-line-scripts.html#the-console-scripts-entry-point


# vim: set expandtab ft=python:
1 change: 1 addition & 0 deletions gitimerge/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

7 changes: 2 additions & 5 deletions git-imerge → gitimerge/gitimerge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#! /usr/bin/env python

# Copyright 2012-2013 Michael Haggerty <[email protected]>
#
# This file is part of git-imerge.
Expand Down Expand Up @@ -3312,7 +3310,6 @@ def main(args):
else:
parser.error('Unrecognized subcommand')


main(sys.argv[1:])

if __name__ == "__main__":
main(sys.argv[1:])
# vim: set expandtab ft=python:
18 changes: 18 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
# vim:fenc=utf-8

from distutils.core import setup

setup(
name = 'gitimerge',
description = 'Incremental merge for git',
author='Michael Haggerty',
version='0.7.0',
author_email='[email protected]',
url='https://github.com/mhagger/git-imerge',
packages=['gitimerge'],
license='GPL',
scripts=['bin/git-imerge']
)