Skip to content

Commit fcd8291

Browse files
Merge pull request #103 from databio/dev
Release 0.7.0
2 parents aed4ef6 + 3697f3b commit fcd8291

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2934
-905
lines changed

.github/workflows/black.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ jobs:
66
lint:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
10-
- uses: actions/setup-python@v2
9+
- uses: actions/checkout@v4
10+
- uses: actions/setup-python@v5
1111
- uses: psf/black@stable

.pre-commit-config.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

Dockerfile

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
FROM bioconductor/bioconductor_docker:devel
2+
3+
# Update apt-get
4+
RUN apt-get update
5+
6+
# Set python env
7+
RUN python3 -m venv /opt/venv
8+
ENV PATH="/opt/venv/bin:$PATH"
9+
10+
RUN pip install uv
11+
12+
RUN uv pip install torch==2.3.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
13+
RUN uv pip install git+https://github.com/databio/bedboss.git@dev#egg=bedboss
14+
15+
RUN bedboss install-requirements
16+
17+
#RUN R -e "options(timeout = 2000); install.packages('http://big.databio.org/GenomicDistributionsData/GenomicDistributionsData_0.0.2.tar.gz', repos=NULL, type='source')"
18+
19+
## Download bedToBigBed binary from UCSC
20+
#RUN wget -O /usr/local/bin/bedToBigBed http://hgdownload.soe.ucsc.edu/admin/exe/linux.x86_64/bedToBigBed \
21+
# && chmod +x /usr/local/bin/bedToBigBed \
22+
## Verify installation
23+
#RUN bedToBigBed 2>&1 | grep "bedToBigBed"
24+
25+
# -p flag creates the directory if it doesn't exist
26+
RUN mkdir -p /workdir/output
27+
28+
COPY ./production/config.yaml /workdir/config.yaml
29+
30+
## docker dosn't see refgenie from terminal if not installed like this:
31+
#RUN pip install refgenie
32+
#
33+
## Configure refgenie:
34+
#RUN refgenie init -c /workdir/refgenie/genome_config.yaml
35+
#ENV REFGENIE="/workdir/refgenie/"
36+
#
37+
#RUN refgenie pull hg38/fasta --skip-read-lock -c /workdir/refgenie/genome_config.yaml
38+
#RUN refgenie pull mm10/fasta --skip-read-lock -c /workdir/refgenie/genome_config.yaml
39+
#RUN refgenie pull hg19/fasta --skip-read-lock -c /workdir/refgenie/genome_config.yaml
40+
41+
#CMD ["bash"]
42+
CMD ["sh", "-c", "bedboss reprocess-all --bedbase-config /workdir/config.yaml --outfolder /workdir/output --limit ${UPLOAD_LIMIT:-1}"]

bedboss/__init__.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" Package-level data """
1+
"""Package-level data"""
22

33
import logging
44

@@ -33,29 +33,41 @@
3333
)
3434

3535
_LOGGER_PIPESTAT = logging.getLogger("pipestat")
36+
_LOGGER_PIPESTAT.propagate = False
3637
coloredlogs.install(
3738
logger=_LOGGER_PIPESTAT,
3839
datefmt="%H:%M:%S",
3940
fmt="[%(levelname)s] [%(asctime)s] [PIPESTAT] %(message)s",
4041
)
4142

4243
_LOGGER_GENIML = logging.getLogger("geniml")
44+
_LOGGER_GENIML.propagate = False
4345
coloredlogs.install(
4446
logger=_LOGGER_GENIML,
4547
datefmt="%H:%M:%S",
4648
fmt="[%(levelname)s] [%(asctime)s] [GENIML] %(message)s",
4749
)
4850

4951
_LOGGER_BBCONF = logging.getLogger("bbconf")
52+
_LOGGER_BBCONF.propagate = False
5053
coloredlogs.install(
5154
logger=_LOGGER_BBCONF,
5255
datefmt="%H:%M:%S",
5356
fmt="[%(levelname)s] [%(asctime)s] [BBCONF] %(message)s",
5457
)
5558

56-
_LOGGER_BBCONF = logging.getLogger("pephubclient")
59+
_LOGGER_PHC = logging.getLogger("pephubclient")
60+
_LOGGER_PHC.propagate = False
5761
coloredlogs.install(
58-
logger=_LOGGER_BBCONF,
62+
logger=_LOGGER_PHC,
5963
datefmt="%H:%M:%S",
6064
fmt="[%(levelname)s] [%(asctime)s] [PEPHUBCLIENT] %(message)s",
6165
)
66+
67+
_LOGGER_REF_CONF = logging.getLogger("refgenconf")
68+
_LOGGER_REF_CONF.propagate = False
69+
coloredlogs.install(
70+
logger=_LOGGER_PHC,
71+
datefmt="%H:%M:%S",
72+
fmt="[%(levelname)s] [%(asctime)s] [REFGENCONF] %(message)s",
73+
)

bedboss/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.6.0"
1+
__version__ = "0.7.0"

bedboss/bbuploader/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" Package-level data """
1+
"""Package-level data"""
22

33
import coloredlogs
44
import logmuse

0 commit comments

Comments
 (0)