[med-svn] [Git][med-team/ariba][master] 3 commits: New upstream version 2.11.1+ds

[Sascha Steinbiss]

Sascha Steinbiss pushed to branch master at Debian Med / ariba


Commits:
47a54483 by Sascha Steinbiss at 2018-03-05T00:27:53+01:00
New upstream version 2.11.1+ds
- - - - -
5782d00b by Sascha Steinbiss at 2018-03-05T00:27:56+01:00
Update upstream source from tag 'upstream/2.11.1+ds'

Update to upstream version '2.11.1+ds'
with Debian dir ff0b418043699d37a7b861a9dda03931f958203e
- - - - -
e8776406 by Sascha Steinbiss at 2018-03-05T09:08:00+01:00
new upstream release

- - - - -


4 changed files:

- .travis.yml
- ariba/ref_genes_getter.py
- debian/changelog
- setup.py


Changes:

=====================================
.travis.yml
=====================================
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,9 @@ addons:
     - libgfortran3
     - libncurses5-dev
 python:
-  - "3.4"
+- '3.4'
 sudo: false
 install:
-  - "source ./install_dependencies.sh"
+- source ./install_dependencies.sh
 script:
-  - "python setup.py test"
+- python setup.py test


=====================================
ariba/ref_genes_getter.py
=====================================
--- a/ariba/ref_genes_getter.py
+++ b/ariba/ref_genes_getter.py
@@ -41,7 +41,7 @@ class RefGenesGetter:
     def _get_card_versions(self, tmp_file):
         print('Getting available CARD versions')
         common.download_file('https://card.mcmaster.ca/download', tmp_file, max_attempts=self.max_download_attempts, sleep_time=self.sleep_time, verbose=True)
-        p = re.compile(r'''href="(/download/.*?broad.*?v([0-9]+\.[0-9]+\.[0-9]+)\.tar\.bz2)"''')
+        p = re.compile(r'''href="(/download/.*?broad.*?v([0-9]+\.[0-9]+\.[0-9]+)\.tar\.(gz|bz2))"''')
         versions = {}
 
         with open(tmp_file) as f:
@@ -481,4 +481,3 @@ class RefGenesGetter:
 
     def run(self, outprefix):
         exec('self._get_from_' + self.ref_db + '(outprefix)')
-


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ariba (2.11.1+ds-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Sascha Steinbiss <satta at debian.org>  Mon, 05 Mar 2018 00:29:24 +0100
+
 ariba (2.11.0+ds-2) unstable; urgency=medium
 
   * Fix watchfile to not report non-release tags (with '-X' suffix).


=====================================
setup.py
=====================================
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@ vcfcall_mod = Extension(
 setup(
     ext_modules=[minimap_mod, fermilite_mod, vcfcall_mod],
     name='ariba',
-    version='2.11.0',
+    version='2.11.1',
     description='ARIBA: Antibiotic Resistance Identification By Assembly',
     packages = find_packages(),
     package_data={'ariba': ['test_run_data/*']},



View it on GitLab: https://salsa.debian.org/med-team/ariba/compare/c4e24edd67e121fd3df1c7414645977290807b37...e877640600d85c0064cf72c9c855d4ff688bd36a

---
View it on GitLab: https://salsa.debian.org/med-team/ariba/compare/c4e24edd67e121fd3df1c7414645977290807b37...e877640600d85c0064cf72c9c855d4ff688bd36a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180305/e075cae4/attachment-0001.html>