From e16ee313e8f1d37ca67eafd26dddb9f04e867647 Mon Sep 17 00:00:00 2001 From: Vince Date: Tue, 11 Jun 2019 12:07:34 -0400 Subject: [PATCH] 0.1.2 --- docs/changelog.md | 4 ++++ refgenconf/_version.py | 2 +- refgenconf/refgenconf.py | 15 ++++++--------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 53e560a0..33ed056d 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format. +## [0.1.2] - 2019-06-11 +### Fixed +- Logic path such that genome config file is updated regardless of asset unpacking + ## [0.1.1] - 2019-06-11 ### Fixed - [Double-slash bug](https://github.com/databio/refgenie/issues/51) in URLs diff --git a/refgenconf/_version.py b/refgenconf/_version.py index 485f44ac..f8b43aba 100644 --- a/refgenconf/_version.py +++ b/refgenconf/_version.py @@ -1 +1 @@ -__version__ = "0.1.1" +__version__ = "0.1.2dev" diff --git a/refgenconf/refgenconf.py b/refgenconf/refgenconf.py index a77e61c0..57ce743a 100755 --- a/refgenconf/refgenconf.py +++ b/refgenconf/refgenconf.py @@ -312,16 +312,13 @@ def raise_unpack_error(): result = archive_data[CFG_ASSET_PATH_KEY] # successfully downloaded and moved tarball; untar it - if unpack: - if filepath.endswith(".tar") or filepath.endswith(".tgz"): - _untar(filepath, outdir) + if unpack and filepath.endswith(".tar") or filepath.endswith(".tgz"): + _untar(filepath, outdir) _LOGGER.debug("Unpacked archive into: {}".format(outdir)) - _LOGGER.info("Writing genome config file: {}".format(genome_config)) - self.update_genomes(genome, asset, {CFG_ASSET_PATH_KEY: result}) - self.write(genome_config) - return asset, result - else: - raise_unpack_error() + _LOGGER.info("Writing genome config file: {}".format(genome_config)) + self.update_genomes(genome, asset, {CFG_ASSET_PATH_KEY: result}) + self.write(genome_config) + return asset, result def update_genomes(self, genome, asset=None, data=None): """