From 36197b014ac049ae00eda09b5ebdeb058ea21d17 Mon Sep 17 00:00:00 2001 From: Timothy Click Date: Mon, 9 Jul 2018 14:52:34 +0800 Subject: [PATCH 1/4] Updated log option. Signed-off-by: Timothy Click --- src/fluctmatch/commands/cmd_table_convert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fluctmatch/commands/cmd_table_convert.py b/src/fluctmatch/commands/cmd_table_convert.py index 7b02c91..12cd48f 100644 --- a/src/fluctmatch/commands/cmd_table_convert.py +++ b/src/fluctmatch/commands/cmd_table_convert.py @@ -114,7 +114,7 @@ def cli(logfile, top1, top2, coord, table, outfile): }, "file": { "class": "logging.FileHandler", - "filename": logfile, + "filename": path.join(os.getcwd(), logfile), "level": "INFO", "mode": "w", "formatter": "detailed", From 64f3c1c5cc929d5a11f6267b09e28dc78ce0be3f Mon Sep 17 00:00:00 2001 From: Timothy Click Date: Mon, 9 Jul 2018 14:52:53 +0800 Subject: [PATCH 2/4] Updated log option. Signed-off-by: Timothy Click --- src/fluctmatch/commands/cmd_splittraj.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fluctmatch/commands/cmd_splittraj.py b/src/fluctmatch/commands/cmd_splittraj.py index 83d621a..198df8d 100644 --- a/src/fluctmatch/commands/cmd_splittraj.py +++ b/src/fluctmatch/commands/cmd_splittraj.py @@ -177,7 +177,7 @@ def cli(program, toppar, topology, trajectory, data, index, outfile, logfile, }, "file": { "class": "logging.FileHandler", - "filename": logfile, + "filename": path.join(os.getcwd(), logfile), "level": "INFO", "mode": "w", "formatter": "detailed", From e3fd9bfd85b5383089681fc80b1d942ae817be48 Mon Sep 17 00:00:00 2001 From: Timothy Click Date: Mon, 9 Jul 2018 15:18:51 +0800 Subject: [PATCH 3/4] Fixed log output for splittraj. Signed-off-by: Timothy Click --- src/fluctmatch/commands/cmd_splittraj.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fluctmatch/commands/cmd_splittraj.py b/src/fluctmatch/commands/cmd_splittraj.py index 198df8d..4b136d9 100644 --- a/src/fluctmatch/commands/cmd_splittraj.py +++ b/src/fluctmatch/commands/cmd_splittraj.py @@ -113,7 +113,7 @@ metavar="LOG", show_default=True, default="splittraj.log", - type=click.Path(exists=False, file_okay=True, resolve_path=True), + type=click.Path(exists=False, file_okay=True, resolve_path=False), help="Log file", ) @click.option( From 7d8ce4ae502113cfaf47c64c2c479fee6fc1cd21 Mon Sep 17 00:00:00 2001 From: Timothy Click Date: Mon, 9 Jul 2018 15:20:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=203.3.4=20=E2=86=92=203.3.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- README.rst | 4 ++-- docs/conf.py | 2 +- setup.py | 2 +- src/fluctmatch/__init__.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9c2e810..9f9bccb 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.3.4 +current_version = 3.3.5 commit = True tag = True diff --git a/README.rst b/README.rst index 851b030..4132b29 100644 --- a/README.rst +++ b/README.rst @@ -44,9 +44,9 @@ Overview :alt: PyPI Package latest release :target: https://pypi.python.org/pypi/fluctmatch -.. |commits-since| image:: https://img.shields.io/github/commits-since/tclick/python-fluctmatch/v3.3.4.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/tclick/python-fluctmatch/v3.3.5.svg :alt: Commits since latest release - :target: https://github.com/tclick/python-fluctmatch/compare/v3.3.4...master + :target: https://github.com/tclick/python-fluctmatch/compare/v3.3.5...master .. |wheel| image:: https://img.shields.io/pypi/wheel/fluctmatch.svg :alt: PyPI Wheel diff --git a/docs/conf.py b/docs/conf.py index 08d0b70..3484a44 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -26,7 +26,7 @@ year = u'2014-2017' author = u'Timothy Click' copyright = '{0}, {1}'.format(year, author) -version = release = u'3.3.4' +version = release = u'3.3.5' pygments_style = 'trac' templates_path = ['.'] diff --git a/setup.py b/setup.py index fa907fc..17cbd39 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ def read(*names, **kwargs): setup( name="fluctmatch", - version="3.3.4", + version="3.3.5", license="BSD license", description="Elastic network model using fluctuation matching.", long_description="%s\n%s" % ( diff --git a/src/fluctmatch/__init__.py b/src/fluctmatch/__init__.py index 97ee249..899a5eb 100644 --- a/src/fluctmatch/__init__.py +++ b/src/fluctmatch/__init__.py @@ -24,7 +24,7 @@ import logging -__version__ = "3.3.4" +__version__ = "3.3.5" _MODELS = dict() _DESCRIBE = dict()