Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow python from environment and missing includes on musl #1087

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/bamToBed/bamToBed.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ using namespace BamTools;
#include <sstream>
#include <fstream>
#include <stdlib.h>
#include <stdint.h>

using namespace std;

Expand Down
2 changes: 2 additions & 0 deletions src/clusterBed/clusterBed.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include "lineFileUtilities.h"
#include "clusterBed.h"

#include <stdint.h>

// = Constructor =
BedCluster::BedCluster(string &bedFile,
int maxDistance,
Expand Down
1 change: 1 addition & 0 deletions src/pairToBed/pairToBed.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ using namespace BamTools;
#include <vector>
#include <iostream>
#include <fstream>
#include <stdint.h>

using namespace std;

Expand Down
1 change: 1 addition & 0 deletions src/randomBed/randomBed.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <algorithm> // for binary search
#include <stdint.h>
using namespace std;

const int MAX_TRIES = 1000000;
Expand Down
2 changes: 2 additions & 0 deletions src/summaryFile/summaryFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include "ToolBase.h"
#include "ContextSummary.h"

#include <stdint.h>

struct Interval {
CHRPOS start;
CHRPOS end;
Expand Down
1 change: 1 addition & 0 deletions src/utils/BamTools/include/BamAlignment.mapping.hpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <stdint.h>

struct _RefID_t {
operator int32_t() const {return (int32_t)(_ptr()->core.tid);}
Expand Down
1 change: 1 addition & 0 deletions src/utils/BamTools/include/api/BamAux.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <string>
#include <stdint.h>

#ifndef BAMAUX_H
#define BAMAUX_H
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#define SINGLELINETEXTFILEREADER_H_

#include <algorithm>
#include <stdint.h>
#include "FileReader.h"
#include "string.h"
#include "lineFileUtilities.h"
Expand Down
2 changes: 2 additions & 0 deletions src/utils/FileRecordTools/Records/BamRecord.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#include "BamFileReader.h"
#include "RecordKeyVector.h"

#include <stdint.h>

BamRecord::BamRecord()
: _bamChromId(-1)
{
Expand Down
1 change: 1 addition & 0 deletions src/utils/GenomeFile/GenomeFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <fstream>
#include <cstring>
#include <cstdio>
#include <stdint.h>
#include <algorithm> // for bsearch lower_bound()
#include "api/BamReader.h"
#include "api/BamAux.h"
Expand Down
1 change: 1 addition & 0 deletions src/utils/GenomeFile/NewGenomeFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#define NEW_GENOMEFILE_H

#include <algorithm> // for bsearch lower_bound()
#include <stdint.h>

#include "BedtoolsTypes.h"

Expand Down
1 change: 1 addition & 0 deletions src/utils/bedFilePE/bedFilePE.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <fstream>
#include <sstream>
#include <cstring>
#include <stdint.h>
#include <algorithm>
#include "bedFile.h"
#include "lineFileUtilities.h"
Expand Down
2 changes: 1 addition & 1 deletion src/utils/general/ParseTools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <climits>
#include <cctype>
#include <cstring>
#include <cstdint>
#include <stdint.h>
#include <cstdio>
#include <cstdlib>
#include <sstream>
Expand Down
1 change: 1 addition & 0 deletions src/utils/lineFileUtilities/lineFileUtilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <vector>
#include <string>
#include <cstring>
#include <stdint.h>
#include <cstdlib>
#include <sstream>
#include <iostream>
Expand Down
1 change: 1 addition & 0 deletions src/utils/sequenceUtilities/sequenceUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <string>
#include <algorithm>
#include <cctype>
#include <stdint.h>

using namespace std;

Expand Down
2 changes: 2 additions & 0 deletions src/windowMaker/windowMaker.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Licenced under the GNU General Public License 2.0 license.
#include "NewGenomeFile.h"
#include "bedFile.h"

#include <stdint.h>

using namespace std;


Expand Down
2 changes: 2 additions & 0 deletions src/windowMaker/windowMakerMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Licenced under the GNU General Public License 2.0 license.
#include "windowMaker.h"
#include "version.h"

#include <stdint.h>

using namespace std;

// define our program name
Expand Down
2 changes: 1 addition & 1 deletion test/bigchroms/test-bigchroms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ check obs abig.bed
rm obs

if [[ "$BT_NO_BIG_FILES" != "" ]]; then
python make-big-chrom.py
${PYTHON:-python} make-big-chrom.py

echo -e " bigchroms.t03...big get fasta \c"
$BT getfasta -fi bigx.fasta -bed bigx.bed | tail -1 > obs
Expand Down
2 changes: 1 addition & 1 deletion test/fisher/cmp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -eo pipefail
echo "fisher,shuffled"

for i in $(seq 1000); do
fisher=$(python ./sim.py | tail -1 | cut -f 2)
fisher=$(${PYTHON:-python} ./sim.py | tail -1 | cut -f 2)
shuffle=$(bash shuf.sh)
echo "$fisher,$shuffle"
done
2 changes: 1 addition & 1 deletion test/genomecov/test-genomecov.sh
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ CRAM_REFERENCE=test_ref.fa $BT genomecov -ibam empty.cram > obs
check obs exp
rm obs exp

python mk-deep.py > deep.sam
${PYTHON:-python} mk-deep.py > deep.sam
echo -e " genomecov.t18...\c"
echo "c1 1 1000000" > exp
$BT genomecov -d -ibam deep.sam | head -1 > obs
Expand Down