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.

Sign up for GitHub

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

Revert "Quick Fix: Improve rich console logger." #206

Merged
merged 1 commit into from
Jun 19, 2024
Merged

Revert "Quick Fix: Improve rich console logger." #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions .docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ COPY --from=solr:latest /var/solr/ /var/solr/
COPY --from=condaforge/mambaforge:latest /opt/conda /opt/conda
COPY . /tmp/evaluation_system
RUN set -x && \
groupadd -r --gid 1001 freva && \
groupadd -r --gid 1000 freva && \
groupadd -r --gid 8983 solr && \
adduser --uid 1001 --gid 1001 --gecos "Default user" \
adduser --uid 1001 --gid 1000 --gecos "Default user" \
--shell /bin/bash --disabled-password freva && \
usermod -aG solr,mysql freva &&\
if [ "$binder" = "true" ]; then\
Expand All @@ -53,8 +53,7 @@ RUN set -x && \
else\
/opt/conda/bin/conda create -y -q -c conda-forge make pip git conda -p /opt/evaluation_system;\
fi &&\
rm -rf /opt/conda
RUN set -e &&\
rm -rf /opt/conda &&\
mkdir -p ${EVAL_HOME}/bin ${EVAL_HOME}/share/freva /mnt/freva_plugins \
${MYSQL_LOGS_DIR} ${SOLR_LOGS_DIR} ${MYSQL_DATA_DIR} ${MYSQL_HOME}/tmpl &&\
mv /tmp/evaluation_system/src/evaluation_system/tests/mocks/bin/* /usr/local/bin/ && \
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci_job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ permissions:
pull-requests: write
on:
push:
pull_request:
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion src/evaluation_system/misc/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
logger_stream_handle = RichHandler(
rich_tracebacks=True,
show_path=True,
console=Console(soft_wrap=False, stderr=True, force_jupyter=False),
console=Console(soft_wrap=True, stderr=True),
)
logger_stream_handle.setLevel(logging.INFO)
logging.basicConfig(
Expand Down
Loading