Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/218868
Change subject: conftool: multiple fixes
......................................................................
conftool: multiple fixes
* setup.py: Fix the requirements
* setup.py: version bump
* tool.py: fix config argument
* syncer.py: add default to config argument
Change-Id: I91a814a3627f8f6d35322651d64d65e85a5e97e0
---
M conftool/cli/syncer.py
M conftool/cli/tool.py
M setup.py
3 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/conftool
refs/changes/68/218868/1
diff --git a/conftool/cli/syncer.py b/conftool/cli/syncer.py
index 043b9fa..1f71d7e 100644
--- a/conftool/cli/syncer.py
+++ b/conftool/cli/syncer.py
@@ -145,7 +145,8 @@
"data")
parser.add_argument('--directory',
help="Directory containing the files to sync")
- parser.add_argument('--config', help="Configuration file")
+ parser.add_argument('--config', help="Optional configuration file",
+ default="/etc/conftool/config.yaml")
parser.add_argument('--debug', action="store_true",
default=False, help="print debug info")
return parser.parse_args(args)
diff --git a/conftool/cli/tool.py b/conftool/cli/tool.py
index 23e8717..60d3d33 100644
--- a/conftool/cli/tool.py
+++ b/conftool/cli/tool.py
@@ -21,8 +21,8 @@
epilog="More details at"
" <https://wikitech.wikimedia.org/wiki/conftool>.",
fromfile_prefix_chars='@')
- parser.add_argument('--config', nargs=1, help="Optional config file",
- default="/etc/conftool/config")
+ parser.add_argument('--config', help="Optional config file",
+ default="/etc/conftool/config.yaml")
parser.add_argument('--tags',
help="List of comma-separated tags; they need to "
"match the base tags of the object type you chose.",
diff --git a/setup.py b/setup.py
index ec3dcce..b3eb09f 100755
--- a/setup.py
+++ b/setup.py
@@ -4,12 +4,12 @@
setup(
name='conftool',
- version='0.0.1',
+ version='0.0.2',
description='Collection of tools to interoperate with distributed k/v
stores',
author='Joe',
author_email='[email protected]',
url='https://github.com/wikimedia/operations-software-conftool',
- install_requires=['python-etcd', 'yaml'],
+ install_requires=['python-etcd', 'pyyaml'],
setup_requires=[],
zip_safe=True,
packages=find_packages(),
--
To view, visit https://gerrit.wikimedia.org/r/218868
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91a814a3627f8f6d35322651d64d65e85a5e97e0
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/conftool
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
