Skip to content

Commit

Permalink
Should fix 2.7 failing build
Browse files Browse the repository at this point in the history
  • Loading branch information
betteridiot committed Nov 29, 2018
1 parent f6e5025 commit 50f1877
Show file tree
Hide file tree
Showing 22 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion bamnostic/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ def unpack(fmt, _io):
try:
# if it is byte object
out = struct.unpack(fmt, _io)
except TypeError:
except:
# if it is a file object
out = struct.unpack(fmt, _io.read(size))
if len(out) > 1:
Expand Down
4 changes: 2 additions & 2 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"description": "BAMnostic is a Pure Python OS, version, and runtime agnostic BAM file parser",
"keywords": "BAM, pysam, genomics, genetics, htslib, samtools",
"license": "https://github.com/betteridiot/bamnostic/blob/master/LICENSE",
"softwareVersion": "v1.0.6,
"version": "v1.0.6",
"softwareVersion": "v1.0.7,
"version": "v1.0.7",
"readme": "https://github.com/betteridiot/bamnostic/blob/master/README.md",
"buildInstructions": "https://github.com/betteridiot/bamnostic/blob/master/README.md",
"issueTracker": "https://github.com/betteridiot/bamnostic/issues",
Expand Down
Binary file modified docs/build/doctrees/environment.pickle
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/build/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: bcdbf5372f05aa74274336aa5687ab30
config: 6d491e59de0287a809983c89c4c65de7
tags: 645f666f9bcd5a90fca523b33c5a78b7
4 changes: 2 additions & 2 deletions docs/build/html/_modules/bamnostic/bai.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>bamnostic.bai &mdash; bamnostic 1.0.6 documentation</title>
<title>bamnostic.bai &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -56,7 +56,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down
4 changes: 2 additions & 2 deletions docs/build/html/_modules/bamnostic/bgzf.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>bamnostic.bgzf &mdash; bamnostic 1.0.6 documentation</title>
<title>bamnostic.bgzf &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -56,7 +56,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down
4 changes: 2 additions & 2 deletions docs/build/html/_modules/bamnostic/core.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>bamnostic.core &mdash; bamnostic 1.0.6 documentation</title>
<title>bamnostic.core &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -56,7 +56,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down
6 changes: 3 additions & 3 deletions docs/build/html/_modules/bamnostic/utils.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>bamnostic.utils &mdash; bamnostic 1.0.6 documentation</title>
<title>bamnostic.utils &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -56,7 +56,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down Expand Up @@ -539,7 +539,7 @@ <h1>Source code for bamnostic.utils</h1><div class="highlight"><pre>
<span class="k">try</span><span class="p">:</span>
<span class="c1"># if it is byte object</span>
<span class="n">out</span> <span class="o">=</span> <span class="n">struct</span><span class="o">.</span><span class="n">unpack</span><span class="p">(</span><span class="n">fmt</span><span class="p">,</span> <span class="n">_io</span><span class="p">)</span>
<span class="k">except</span> <span class="ne">TypeError</span><span class="p">:</span>
<span class="k">except</span><span class="p">:</span>
<span class="c1"># if it is a file object</span>
<span class="n">out</span> <span class="o">=</span> <span class="n">struct</span><span class="o">.</span><span class="n">unpack</span><span class="p">(</span><span class="n">fmt</span><span class="p">,</span> <span class="n">_io</span><span class="o">.</span><span class="n">read</span><span class="p">(</span><span class="n">size</span><span class="p">))</span>
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">out</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">1</span><span class="p">:</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/build/html/_modules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Overview: module code &mdash; bamnostic 1.0.6 documentation</title>
<title>Overview: module code &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -56,7 +56,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/_static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '1.0.6',
VERSION: '1.0.7',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
Expand Down
4 changes: 2 additions & 2 deletions docs/build/html/bamnostic.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>bamnostic package &mdash; bamnostic 1.0.6 documentation</title>
<title>bamnostic package &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -58,7 +58,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down
4 changes: 2 additions & 2 deletions docs/build/html/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Index &mdash; bamnostic 1.0.6 documentation</title>
<title>Index &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -57,7 +57,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down
4 changes: 2 additions & 2 deletions docs/build/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Welcome to bamnostic’s documentation! &mdash; bamnostic 1.0.6 documentation</title>
<title>Welcome to bamnostic’s documentation! &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -57,7 +57,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down
4 changes: 2 additions & 2 deletions docs/build/html/install.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Installation &mdash; bamnostic 1.0.6 documentation</title>
<title>Installation &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -58,7 +58,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down
Binary file modified docs/build/html/objects.inv
Binary file not shown.
4 changes: 2 additions & 2 deletions docs/build/html/py-modindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Python Module Index &mdash; bamnostic 1.0.6 documentation</title>
<title>Python Module Index &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -59,7 +59,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down
4 changes: 2 additions & 2 deletions docs/build/html/quickstart.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Quickstart &mdash; bamnostic 1.0.6 documentation</title>
<title>Quickstart &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -58,7 +58,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down
4 changes: 2 additions & 2 deletions docs/build/html/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Search &mdash; bamnostic 1.0.6 documentation</title>
<title>Search &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -56,7 +56,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down
4 changes: 2 additions & 2 deletions docs/build/html/support.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Citation and Support &mdash; bamnostic 1.0.6 documentation</title>
<title>Citation and Support &mdash; bamnostic 1.0.7 documentation</title>



Expand Down Expand Up @@ -57,7 +57,7 @@


<div class="version">
1.0.6
1.0.7
</div>


Expand Down
4 changes: 2 additions & 2 deletions docs/paper/codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"description": "BAMnostic: an OS-agnostic toolkit for genomic sequence analysis",
"keywords": "BAM, pysam, genomics, genetics, htslib, samtools",
"license": "https://github.com/betteridiot/bamnostic/blob/master/LICENSE",
"softwareVersion": "v1.0.6",
"version": "v1.0.6",
"softwareVersion": "v1.0.7",
"version": "v1.0.7",
"readme": "https://github.com/betteridiot/bamnostic/blob/master/README.md",
"buildInstructions": "https://github.com/betteridiot/bamnostic/blob/master/README.md",
"issueTracker": "https://github.com/betteridiot/bamnostic/issues",
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
author = 'Marcus D. Sherman'

# The short X.Y version
version = '1.0.6'
version = '1.0.7'
# The full version, including alpha/beta/rc tags
release = '1.0.6'
release = '1.0.7'


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def readme():

setup(
name='bamnostic',
version='1.0.6',
version='1.0.7',
description='Pure Python, OS-agnostic Binary Alignment Map (BAM) random access and parsing tool',
long_description=readme(),
url='https://github.com/betteridiot/bamnostic/',
Expand Down

0 comments on commit 50f1877

Please sign in to comment.