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

PUBLIC-2591: App code extraction, test improvement #16

Merged
merged 3 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
3 changes: 0 additions & 3 deletions .github/workflows/kb_sdk_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: KBase SDK Tests

on:
pull_request:
branches:
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

run the tests on every PR

- main
- develop

jobs:
sdk_tests:
Expand Down
19 changes: 9 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,24 @@ LABEL maintainer="KBase Developers [[email protected]]"
WORKDIR /kb/module
# Update
RUN apt-get update \
&& apt-get upgrade -y \
&& sed -i 's/\(.*DST_Root_CA_X3.crt\)/!\1/' /etc/ca-certificates.conf \
&& update-ca-certificates \
&& apt-get -y install xvfb \
&& pip install --upgrade pip && \
&& apt-get upgrade -y && \
update-ca-certificates && \
apt-get -y install xvfb curl && \
# Install FastTree
mkdir -p /kb/module/FastTree/bin && \
cd /kb/module/FastTree/bin && \
curl -o FastTree http://www.microbesonline.org/fasttree/FastTree && \
chmod 555 FastTree
chmod 555 FastTree && \
pip install --upgrade pip && \
# install the python requirements
# Note: You must use PyQt5==5.11.3 on debian
pip install ete3==3.1.2 PyQt5==5.11.3 numpy==1.23.1 pytest coverage pytest-cov vcrpy
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved up the python installation to prior to copying over the repo

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No requirements file?
And do the dev requirements need versioning? Probably not, realistically, but I figured I should mention.


COPY ./ /kb/module

RUN mkdir -p /kb/module/work && \
chmod -R a+rw /kb/module && \
mv /kb/module/compile_report.json /kb/module/work/compile_report.json && \
# install the python requirements
# Note: You must use PyQt5==5.11.3 on debian
pip install ete3==3.1.2 PyQt5==5.11.3 numpy==1.23.1 pytest coverage pytest-cov
mv /kb/module/compile_report.json /kb/module/work/compile_report.json

WORKDIR /kb/module
ENTRYPOINT [ "./scripts/entrypoint.sh" ]
Expand Down
19 changes: 0 additions & 19 deletions deploy.cfg
Original file line number Diff line number Diff line change
@@ -1,23 +1,4 @@
[kb_fasttree]
kbase-endpoint = {{ kbase_endpoint }}
job-service-url = {{ job_service_url }}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

none of the rest of these are used - just the workspace URL and the scratch dir

workspace-url = {{ workspace_url }}
shock-url = {{ shock_url }}
{% if handle_url %}
handle-service-url = {{ handle_url }}
{% else %}
handle-service-url = {{ kbase_endpoint }}/handle_service
{% endif %}
{% if srv_wiz_url %}
service-wizard-url = {{ srv_wiz_url }}
{% else %}
service-wizard-url = {{ kbase_endpoint }}/service_wizard
{% endif %}
njsw-url = {{ njsw_url }}
{% if auth_service_url %}
auth-service-url = {{ auth_service_url }}
{% endif %}
{% if auth_service_url_allow_insecure %}
auth-service-url-allow-insecure = {{ auth_service_url_allow_insecure }}
{% endif %}
scratch = /kb/module/work/tmp
Empty file added lib/biokbase/__init__.py
Empty file.
Loading
Loading