Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
New upstream version 2.11.1+ds
· 47a54483
Sascha Steinbiss
authored
Mar 05, 2018
47a54483
Merge branch 'upstream' of salsa.debian.org:med-team/ariba into upstream
· 313bcec6
Sascha Steinbiss
authored
Mar 05, 2018
313bcec6
Show whitespace changes
Inline
Side-by-side
.travis.yml
View file @
313bcec6
...
...
@@ -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
View file @
313bcec6
...
...
@@ -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)
'
)
setup.py
View file @
313bcec6
...
...
@@ -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/*
'
]},
...
...