Skip to content

Commit

Permalink
Merge pull request #37 from databio/dev
Browse files Browse the repository at this point in the history
0.1.2
  • Loading branch information
vreuter authored Jun 11, 2019
2 parents 891d8e4 + e16ee31 commit d835595
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
4 changes: 4 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion refgenconf/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.1.1"
__version__ = "0.1.2dev"
15 changes: 6 additions & 9 deletions refgenconf/refgenconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down

0 comments on commit d835595

Please sign in to comment.