From 533727b37331402e6bb11bf90c4913f2abd4540b Mon Sep 17 00:00:00 2001 From: robmadole Date: Mon, 26 Mar 2012 08:45:14 -0500 Subject: [PATCH 1/6] Version up --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ec75d8f..0395a57 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ README = open(os.path.join(here, 'README.rst')).read() NEWS = open(os.path.join(here, 'NEWS.txt')).read() -version = '0.1.0' +version = '0.1.1' install_requires = [ 'GitPython>=0.3.2RC1'] From 6f518a36fd7e4cf8ff84f1045d36538999c6a579 Mon Sep 17 00:00:00 2001 From: robmadole Date: Wed, 28 Mar 2012 08:04:44 -0500 Subject: [PATCH 2/6] Updating news and adding classifiers --- NEWS.txt | 12 +++++++++++- setup.py | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/NEWS.txt b/NEWS.txt index c3784ef..0dfd33f 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,9 +1,19 @@ News ==== +0.1.1 + +*Release date: March 28, 2012* + +* Fix issue #1 which makes the git-sweep help menus more useful +* Fix a minor grammar issue in the help +* Fix issue #2 which dropped extra options when telling you to use + cleanup +* Added a --force option to skip confirmation prompt + 0.1.0 ----- -*Release date: 0.1.0* +*Release date: n/a* * Initial release diff --git a/setup.py b/setup.py index 0395a57..e5483d8 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,17 @@ description="Clean up branches from your Git remotes", long_description=README + '\n\n' + NEWS, classifiers=[ - # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers + 'Development Status :: 4 - Beta', + 'Environment :: Console', + 'License :: OSI Approved :: MIT License', + 'Intended Audience :: Developers', + 'Natural Language :: English', + 'Operating System :: POSIX', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Topic :: Software Development :: Quality Assurance', + 'Topic :: Software Development :: Version Control', + 'Topic :: Text Processing' ], keywords='git maintenance branches', author='Arc90, Inc.', From bce10cba9bf0bb679ced092709a38183fd08d10f Mon Sep 17 00:00:00 2001 From: Joshua Lucier Date: Fri, 24 Apr 2015 13:01:23 -0400 Subject: [PATCH 3/6] changed help message --- src/gitsweep/tests/test_cli.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gitsweep/tests/test_cli.py b/src/gitsweep/tests/test_cli.py index 9ddd6ce..f26e0a2 100644 --- a/src/gitsweep/tests/test_cli.py +++ b/src/gitsweep/tests/test_cli.py @@ -22,6 +22,8 @@ def test_help(self): optional arguments: -h, --help show this help message and exit + --origin [remote name] select a specific remote (default is 'origin') + --master [branch name] select a specific branch to use as master (default is 'master') action: Preview changes or perform clean up From b784534c5e30f9e4cadfee00d1b4c395ce4780eb Mon Sep 17 00:00:00 2001 From: Joshua Lucier Date: Fri, 24 Apr 2015 13:20:53 -0400 Subject: [PATCH 4/6] reverted changes --- src/gitsweep/tests/test_cli.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gitsweep/tests/test_cli.py b/src/gitsweep/tests/test_cli.py index f26e0a2..9ddd6ce 100644 --- a/src/gitsweep/tests/test_cli.py +++ b/src/gitsweep/tests/test_cli.py @@ -22,8 +22,6 @@ def test_help(self): optional arguments: -h, --help show this help message and exit - --origin [remote name] select a specific remote (default is 'origin') - --master [branch name] select a specific branch to use as master (default is 'master') action: Preview changes or perform clean up From bc4f1b5d45acecef7ace179e89e2824d284bbe52 Mon Sep 17 00:00:00 2001 From: Joshua Lucier Date: Fri, 24 Apr 2015 13:22:37 -0400 Subject: [PATCH 5/6] using parser for help --- src/gitsweep/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gitsweep/cli.py b/src/gitsweep/cli.py index 6b995b5..3940ae7 100644 --- a/src/gitsweep/cli.py +++ b/src/gitsweep/cli.py @@ -17,7 +17,7 @@ class CommandLine(object): """ parser = ArgumentParser( description='Clean up your Git remote branches.', - usage='git-sweep [-h]', + usage='git-sweep [-h] --origin [remote name] --master [branch name]', ) _sub_parsers = parser.add_subparsers(title='action', From 8d29900d1b9f0d4529649305b7c444eac1dfd46d Mon Sep 17 00:00:00 2001 From: Joshua Lucier Date: Fri, 24 Apr 2015 13:52:14 -0400 Subject: [PATCH 6/6] help options added --- bootstrap.py | 7 ++++--- src/gitsweep/tests/test_cli.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bootstrap.py b/bootstrap.py index 63aebb9..aaca535 100644 --- a/bootstrap.py +++ b/bootstrap.py @@ -54,9 +54,10 @@ except ImportError: ez = {} if USE_DISTRIBUTE: - exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py' - ).read() in ez - ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True) + ez = {} + #exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py' + # ).read() in ez + #ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True) else: exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py' ).read() in ez diff --git a/src/gitsweep/tests/test_cli.py b/src/gitsweep/tests/test_cli.py index 9ddd6ce..134f0c1 100644 --- a/src/gitsweep/tests/test_cli.py +++ b/src/gitsweep/tests/test_cli.py @@ -16,7 +16,7 @@ def test_help(self): (retcode, stdout, stderr) = self.gscommand('git-sweep -h') self.assertResults(''' - usage: git-sweep [-h] + usage: git-sweep [-h] --origin [remote name] --master [branch name] Clean up your Git remote branches.