Skip to content

Commit

Permalink
Merge pull request #271 from sanger-pathogens/v2.14.1_bug_fix_branch
Browse files Browse the repository at this point in the history
Backed out MANIFEST.in change, bumped release number to v2.14.1 and added fix for issue 263
  • Loading branch information
kpepper authored Jun 13, 2019
2 parents 0ecc485 + 2f673d7 commit dae0008
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 3 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Change Log

[v2.14.1](https://github.com/sanger-pathogens/ariba/tree/v2.14.1) (2019-06-13)
[Full Changelog](https://github.com/sanger-pathogens/ariba/compare/v2.14.0...v2.14.1)

**Fixed bugs:**

- Ariba fails to install from PyPI due to missing .h files in distribution. Related to MANIFEST.in change in [\#269](https://github.com/sanger-pathogens/ariba/pull/269)
- Fix for Issue [\#263](https://github.com/sanger-pathogens/ariba/issues/263)

[v2.14.0](https://github.com/sanger-pathogens/ariba/tree/v2.14.0) (2019-06-06)
[Full Changelog](https://github.com/sanger-pathogens/ariba/compare/v2.13.5...v2.14.0)

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN cd /usr/local/bin && ln -s /usr/bin/python3 python && cd

RUN git clone https://github.com/sanger-pathogens/ariba.git \
&& cd ariba \
&& git checkout v2.14.0 \
&& git checkout v2.14.1 \
&& python3 setup.py test \
&& python3 setup.py install

Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
recursive-include third_party *.h
2 changes: 1 addition & 1 deletion ariba/clusters.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def __init__(self,
if self.verbose:
print('Temporary directory:', self.tmp_dir)

for i in [x for x in dir(signal) if x.startswith("SIG") and x not in {'SIGCHLD', 'SIGCLD', 'SIGPIPE'}]:
for i in [x for x in dir(signal) if x.startswith("SIG") and x not in {'SIGCHLD', 'SIGCLD', 'SIGPIPE', 'SIGTSTP', 'SIGCONT'}]:
try:
signum = getattr(signal, i)
signal.signal(signum, self._receive_signal)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
setup(
ext_modules=[minimap_mod, fermilite_mod, vcfcall_mod],
name='ariba',
version='2.14.0',
version='2.14.1',
description='ARIBA: Antibiotic Resistance Identification By Assembly',
packages = find_packages(),
package_data={'ariba': ['test_run_data/*', 'tb_data/*']},
Expand Down

0 comments on commit dae0008

Please sign in to comment.