From ab4a50e01d66bceefc8c7bbfe1d9d9264ddf6ff9 Mon Sep 17 00:00:00 2001 From: Stephen Steneker Date: Sun, 11 Dec 2016 08:44:57 +1100 Subject: [PATCH 1/5] Fix merge conflicts --- CHANGES.md | 1 - mtools/version.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7f028ff1..8409e14a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,7 +4,6 @@ Changes to mtools #### version 1.2.3-dev * mlaunch: fixed parsing of the `mongod` version (#451) - #### version 1.2.2 * mgenerate: create operator for binary data (#405) diff --git a/mtools/version.py b/mtools/version.py index 48cc47e4..6f1f70e3 100644 --- a/mtools/version.py +++ b/mtools/version.py @@ -1 +1 @@ -__version__ = '1.2.3-dev' +__version__ = '1.2.3-dev' \ No newline at end of file From 8750df805f5f4a0792cea2157a750f3fa1e7f431 Mon Sep 17 00:00:00 2001 From: Steve Hand Date: Mon, 15 Aug 2016 09:32:12 -0500 Subject: [PATCH 2/5] Fixed 410 and 426. Enabled mtools utilities to be run under debugger like PyCharm. --- mtools/util/cmdlinetool.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mtools/util/cmdlinetool.py b/mtools/util/cmdlinetool.py index 0f96411a..8e2da983 100644 --- a/mtools/util/cmdlinetool.py +++ b/mtools/util/cmdlinetool.py @@ -75,7 +75,15 @@ def __init__(self): self.argparser = argparse.ArgumentParser() self.argparser.add_argument('--version', action='version', version="mtools version %s" % __version__) self.argparser.add_argument('--no-progressbar', action='store_true', default=False, help='disables progress bar') - self.is_stdin = not sys.stdin.isatty() + """ PyCharm and other debuggers apparently run script in a non-TTY process. + For now, just ignore the fact that we are debugging + """ + if __debug__: + self.is_stdin = False + else: + self.is_stdin = not sys.stdin.isatty() + + def run(self, arguments=None, get_unknowns=False): From 54b48fcaf64a188b851061ab00d77949ac62c7db Mon Sep 17 00:00:00 2001 From: Stephen Steneker Date: Sun, 11 Dec 2016 08:56:12 +1100 Subject: [PATCH 3/5] Backout debugger change from #427 that introduced stdin usage regression --- mtools/util/cmdlinetool.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/mtools/util/cmdlinetool.py b/mtools/util/cmdlinetool.py index 8e2da983..0f96411a 100644 --- a/mtools/util/cmdlinetool.py +++ b/mtools/util/cmdlinetool.py @@ -75,15 +75,7 @@ def __init__(self): self.argparser = argparse.ArgumentParser() self.argparser.add_argument('--version', action='version', version="mtools version %s" % __version__) self.argparser.add_argument('--no-progressbar', action='store_true', default=False, help='disables progress bar') - """ PyCharm and other debuggers apparently run script in a non-TTY process. - For now, just ignore the fact that we are debugging - """ - if __debug__: - self.is_stdin = False - else: - self.is_stdin = not sys.stdin.isatty() - - + self.is_stdin = not sys.stdin.isatty() def run(self, arguments=None, get_unknowns=False): From da2a0325261646adef09fc8d5ed5801280c3d508 Mon Sep 17 00:00:00 2001 From: Stephen Steneker Date: Sun, 11 Dec 2016 09:58:33 +1100 Subject: [PATCH 4/5] Update changelog for 1.2.3 release --- CHANGES.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8409e14a..765c59dc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,17 @@ Changes to mtools ================= -#### version 1.2.3-dev - * mlaunch: fixed parsing of the `mongod` version (#451) +#### version 1.2.3 + + * mlaunch: support for MongoDB 3.4 (#466) + * mlaunch: MongoDB 3.3+ only supports CSRS for mongos --configdb parameter (#431) + * mlaunch: CSRS feature breaks older configurations (#402) + * mlaunch: improved parsing of the `mongod` version for RCs (#451) + * mlaunch: New init --priority option forces first member primary + * mlaunch: init & list now print username and password if auth enabled (#469) + * mlaunch: --stop is now an alias of --kill to simplify auth shutdown (#363, #369, #333) + +Thanks to @kevinadi, @Pash10g, @Steve-Hand, @vmenajr, and @ajdavis for contributions to this release! #### version 1.2.2 From dd6862f1218707c4a416c11cc6471b9d52169231 Mon Sep 17 00:00:00 2001 From: Stephen Steneker Date: Sun, 11 Dec 2016 10:58:51 +1100 Subject: [PATCH 5/5] Bump version --- README.md | 2 +- mtools/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ff532287..dc003b2d 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ instructions for these modules. Recent Changes -------------- -The current version of mtools is 1.2.1. See [CHANGES.md](./CHANGES.md) for a list of recent changes from previous versions of mtools. +The current version of mtools is 1.2.3. See [CHANGES.md](./CHANGES.md) for a list of recent changes from previous versions of mtools. Contribute to mtools diff --git a/mtools/version.py b/mtools/version.py index 6f1f70e3..5a5df3be 100644 --- a/mtools/version.py +++ b/mtools/version.py @@ -1 +1 @@ -__version__ = '1.2.3-dev' \ No newline at end of file +__version__ = '1.2.3'