Skip to content

Commit

Permalink
Merge pull request #217 from bacpop/bacpop-43
Browse files Browse the repository at this point in the history
Small fixes for beebop
  • Loading branch information
johnlees authored Sep 7, 2022
2 parents 6570f98 + e79f19a commit 434408b
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 6 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
recursive-include scripts *.py
recursive-include PopPUNK/data *.gz
recursive-include PopPUNK/data *.pkl
recursive-include vendor *
recursive-include src *
include CMakeLists.txt
2 changes: 1 addition & 1 deletion PopPUNK/visualise.py
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ def generate_visualisations(query_db,
combined_seq = rlist

# Fill in qq-distances if required
if self == False and tree != "none":
if self == False:
sys.stderr.write("Note: Distances in " + distances + " are from assign mode\n"
"Note: Distance will be extended to full all-vs-all distances\n"
"Note: Re-run poppunk_assign with --update-db to avoid this\n")
Expand Down
14 changes: 9 additions & 5 deletions docker2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,15 @@ RUN add-apt-repository https://downloads.skewed.de/apt && \
ln -s /usr/lib/python3/dist-packages/graph_tool \
/usr/local/lib/python3.10/site-packages

COPY requirements.txt /tmp/requirements.txt
RUN pip install pybind11 && \
pip install -r /tmp/requirements.txt && \
rm -f /tmp/requirements.txt
RUN pip install pybind11[global]

COPY . /src
WORKDIR /src
RUN python setup.py install
RUN pip install .

RUN pip install cmake plotly ffmpeg

RUN git clone -b bacpop-49 https://github.com/bacpop/mandrake.git && \
cd mandrake && \
python setup.py install && \
cd .. && rm -r mandrake
13 changes: 13 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,19 @@ def build_extension(self, ext):
'Programming Language :: Python :: 3.8',
],
python_requires='>=3.8.0',
install_requires=['biopython',
'h5py',
'hdbscan',
'matplotlib',
# 'mandrake', #uncomment when on PyPI
'networkx',
'pandas',
'pp-sketchlib',
'requests',
'scikit-learn',
'tqdm',
'treeswift',
],
keywords='bacteria genomics population-genetics k-mer',
packages=['PopPUNK'],
entry_points={
Expand Down

0 comments on commit 434408b

Please sign in to comment.