Skip to content

GitLab

Commit fdf81f2d authored by Rok Roškar's avatar Rok Roškar
Browse files

Merge branch '000-update-upstream' into 'master' 

update project renku and template versions

See merge request !1
parents 4f40c849 0becbb54
Pipeline #427110 passed with stage
in 6 minutes and 45 seconds
Hide whitespace changes
Inline Side-by-side
.gitattributes
View file @ fdf81f2d
models/RFC filter=lfs diff=lfs merge=lfs -text
models/XGB filter=lfs diff=lfs merge=lfs -text
.renku/metadata/** merge=renkumerge
.gitignore
View file @ fdf81f2d
......@@ -336,3 +336,7 @@ tags
.renku.lock
.renku/tmp
.renku/cache
.direnv
.envrc
.renku/metadata/project
View file @ fdf81f2d
{
"@renku_data_type": "renku.core.models.project.Project",
"@renku_data_type": "renku.domain_model.project.Project",
"@renku_oid": "project",
"agent_version": "1.1.1",
"agent_version": "1.6.0",
"annotations": [],
"automated_update": true,
"creator": {
"@renku_data_type": "renku.core.models.provenance.agent.Person",
"@renku_data_type": "renku.domain_model.provenance.agent.Person",
"@renku_data_value": {
"affiliation": null,
"alternate_name": null,
......@@ -24,9 +24,9 @@
"keywords": [],
"name": "renku-mls-plugin",
"template_id": "python-minimal",
"template_metadata": "{\"__template_source__\": \"https://github.com/SwissDataScienceCenter/renku-project-template\", \"__template_ref__\": \"0.3.0\", \"__template_id__\": \"python-minimal\", \"__namespace__\": \"lee.gavin.k\", \"__automated_update__\": true, \"__repository__\": \"https://renkulab.io/gitlab\", \"__sanitized_project_name__\": \"renku-mls-plugin\", \"__project_slug__\": \"lee.gavin.k/renku-mls-plugin\", \"__renku_version__\": \"1.0.6\", \"name\": \"renku-mls-plugin\", \"__template_version__\": \"fc5fddb1e14055ef5ac3b3332fc9bb8e271d7e08\"}",
"template_ref": "0.3.0",
"template_metadata": "{\"__template_source__\": \"https://github.com/SwissDataScienceCenter/renku-project-template\", \"__template_ref__\": \"0.3.4\", \"__template_id__\": \"python-minimal\", \"__namespace__\": \"lee.gavin.k\", \"__automated_update__\": true, \"__repository__\": \"https://renkulab.io/gitlab\", \"__sanitized_project_name__\": \"renku-mls-plugin\", \"__project_slug__\": \"lee.gavin.k/renku-mls-plugin\", \"__renku_version__\": \"1.3.1\", \"name\": \"renku-mls-plugin\", \"__template_version__\": \"fc5953b87e53ec5bd5a3288ce6660b39a9f0107c\"}",
"template_ref": "0.3.4",
"template_source": "https://github.com/SwissDataScienceCenter/renku-project-template",
"template_version": "fc5fddb1e14055ef5ac3b3332fc9bb8e271d7e08",
"template_version": "fc5953b87e53ec5bd5a3288ce6660b39a9f0107c",
"version": "9"
}
\ No newline at end of file
}
.renku/metadata/root
View file @ fdf81f2d
{
"@renku_data_type": "renku.core.metadata.database.RenkuOOBTree",
"@renku_data_type": "renku.infrastructure.database.RenkuOOBTree",
"@renku_data_value": {
"@renku_data_type": "builtins.tuple",
"@renku_data_value": [
......@@ -14,33 +14,33 @@
"@renku_data_value": [
"_downstream_relations",
{
"@renku_data_type": "renku.core.metadata.database.RenkuOOBTree",
"@renku_data_type": "renku.infrastructure.database.RenkuOOBTree",
"@renku_oid": "_downstream_relations",
"@renku_reference": true
},
"activities",
{
"@renku_data_type": "renku.core.metadata.database.Index",
"@renku_data_type": "renku.infrastructure.database.Index",
"@renku_oid": "activities-index",
"attribute": "id",
"entries": {
"@renku_data_type": "renku.core.metadata.database.RenkuOOBTree",
"@renku_data_type": "renku.infrastructure.database.RenkuOOBTree",
"@renku_oid": "activities",
"@renku_reference": true
},
"key_type": null,
"name": "activities",
"object_type": "renku.core.models.provenance.activity.Activity"
"object_type": "renku.domain_model.provenance.activity.Activity"
},
"activities-by-generation",
{
"@renku_data_type": "renku.core.metadata.database.RenkuOOBTree",
"@renku_data_type": "renku.infrastructure.database.RenkuOOBTree",
"@renku_oid": "activities-by-generation",
"@renku_reference": true
},
"activities-by-usage",
{
"@renku_data_type": "renku.core.metadata.database.RenkuOOBTree",
"@renku_data_type": "renku.infrastructure.database.RenkuOOBTree",
"@renku_oid": "activities-by-usage",
"@renku_reference": true
},
......@@ -52,53 +52,53 @@
},
"activity-collections",
{
"@renku_data_type": "renku.core.metadata.database.Index",
"@renku_data_type": "renku.infrastructure.database.Index",
"@renku_oid": "activity-collections-index",
"attribute": "id",
"entries": {
"@renku_data_type": "renku.core.metadata.database.RenkuOOBTree",
"@renku_data_type": "renku.infrastructure.database.RenkuOOBTree",
"@renku_oid": "activity-collections",
"@renku_reference": true
},
"key_type": null,
"name": "activity-collections",
"object_type": "renku.core.models.provenance.activity.ActivityCollection"
"object_type": "renku.domain_model.provenance.activity.ActivityCollection"
},
"datasets",
{
"@renku_data_type": "renku.core.metadata.database.Index",
"@renku_data_type": "renku.infrastructure.database.Index",
"@renku_oid": "datasets-index",
"attribute": "name",
"entries": {
"@renku_data_type": "renku.core.metadata.database.RenkuOOBTree",
"@renku_data_type": "renku.infrastructure.database.RenkuOOBTree",
"@renku_oid": "datasets",
"@renku_reference": true
},
"key_type": null,
"name": "datasets",
"object_type": "renku.core.models.dataset.Dataset"
"object_type": "renku.domain_model.dataset.Dataset"
},
"datasets-provenance-tails",
{
"@renku_data_type": "renku.core.metadata.database.Index",
"@renku_data_type": "renku.infrastructure.database.Index",
"@renku_oid": "datasets-provenance-tails-index",
"attribute": "id",
"entries": {
"@renku_data_type": "renku.core.metadata.database.RenkuOOBTree",
"@renku_data_type": "renku.infrastructure.database.RenkuOOBTree",
"@renku_oid": "datasets-provenance-tails",
"@renku_reference": true
},
"key_type": null,
"name": "datasets-provenance-tails",
"object_type": "renku.core.models.dataset.Dataset"
"object_type": "renku.domain_model.dataset.Dataset"
},
"datasets-tags",
{
"@renku_data_type": "renku.core.metadata.database.Index",
"@renku_data_type": "renku.infrastructure.database.Index",
"@renku_oid": "datasets-tags-index",
"attribute": null,
"entries": {
"@renku_data_type": "renku.core.metadata.database.RenkuOOBTree",
"@renku_data_type": "renku.infrastructure.database.RenkuOOBTree",
"@renku_oid": "datasets-tags",
"@renku_reference": true
},
......@@ -108,35 +108,35 @@
},
"plans",
{
"@renku_data_type": "renku.core.metadata.database.Index",
"@renku_data_type": "renku.infrastructure.database.Index",
"@renku_oid": "plans-index",
"attribute": "id",
"entries": {
"@renku_data_type": "renku.core.metadata.database.RenkuOOBTree",
"@renku_data_type": "renku.infrastructure.database.RenkuOOBTree",
"@renku_oid": "plans",
"@renku_reference": true
},
"key_type": null,
"name": "plans",
"object_type": "renku.core.models.workflow.plan.AbstractPlan"
"object_type": "renku.domain_model.workflow.plan.AbstractPlan"
},
"plans-by-name",
{
"@renku_data_type": "renku.core.metadata.database.Index",
"@renku_data_type": "renku.infrastructure.database.Index",
"@renku_oid": "plans-by-name-index",
"attribute": "name",
"entries": {
"@renku_data_type": "renku.core.metadata.database.RenkuOOBTree",
"@renku_data_type": "renku.infrastructure.database.RenkuOOBTree",
"@renku_oid": "plans-by-name",
"@renku_reference": true
},
"key_type": null,
"name": "plans-by-name",
"object_type": "renku.core.models.workflow.plan.AbstractPlan"
"object_type": "renku.domain_model.workflow.plan.AbstractPlan"
},
"project",
{
"@renku_data_type": "renku.core.models.project.Project",
"@renku_data_type": "renku.domain_model.project.Project",
"@renku_oid": "project",
"@renku_reference": true
}
......
.renku/template_checksums.json
View file @ fdf81f2d
{"requirements.txt": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "README.md": "d98733a5a166007a942ecf9d9f0a9e1a9334827e419fa521323b71a885375665", ".renkulfsignore": "89dc86df93fbf15fbb6b0460f12b01c9b4a045ae836282b8d400654b3a2ed03a", ".gitignore": "7a908bfd4db867f62fa279c53311f117ca4a567feef463203f85b62d8d0b140c", "Dockerfile": "15c4416e0aaf876a76df01f42460158776d007673fe7ea7f36ffb04b3b89edac", "environment.yml": "917e293c2a5459e6f2a2e64bdadf0531953c875e434913ad44e41ed639962555", ".gitlab-ci.yml": "ab51e216f032a3cc5e35c3746fa2776571bd42263b8585571c05ff257a7b468c", ".dockerignore": "abc0b37932c96cf447b2930bcb2455fac0be146ee9cf1d447f8aef537a531c41", "data/.gitkeep": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", ".renku/renku.ini": "2f1f6cc027f301328bd5519b3762328b500019beedf78233bd8ed94147061d74", "notebooks/.gitkeep": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
\ No newline at end of file
{"requirements.txt": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "README.md": "d98733a5a166007a942ecf9d9f0a9e1a9334827e419fa521323b71a885375665", ".renkulfsignore": "b418745d4f9f40d3b05b88c305041316b8c3e9fc6af877a21a37ccc6b43d6d66", ".gitignore": "7a908bfd4db867f62fa279c53311f117ca4a567feef463203f85b62d8d0b140c", "Dockerfile": "0a625eacc323a39bf2f7d3e2fdf7e4540585341aabbb7df50b3624d05650d9ee", "environment.yml": "917e293c2a5459e6f2a2e64bdadf0531953c875e434913ad44e41ed639962555", ".gitlab-ci.yml": "ab51e216f032a3cc5e35c3746fa2776571bd42263b8585571c05ff257a7b468c", ".dockerignore": "abc0b37932c96cf447b2930bcb2455fac0be146ee9cf1d447f8aef537a531c41", "data/.gitkeep": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", ".renku/renku.ini": "2f1f6cc027f301328bd5519b3762328b500019beedf78233bd8ed94147061d74", "notebooks/.gitkeep": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}
.renkulfsignore
View file @ fdf81f2d
......@@ -13,9 +13,9 @@
# See https://github.com/SwissDataScienceCenter/renku-project-template for proper
# usage.
# Warning: modifying the next line will check generated ipynb files (e.g. from papermill) into LFS:
# they will no longer be displayed in the renku UI
*.ipynb
# Warning: removing these lines will check source files (e.g. generated ipynb files from papermill) into LFS and they
# will no longer be displayed in the renku UI
*.ipynb
*.py
*.r
*.md
......
Dockerfile
View file @ fdf81f2d
# For finding latest versions of the base image see
# https://github.com/SwissDataScienceCenter/renkulab-docker
ARG RENKU_BASE_IMAGE=renku/renkulab-py:3.9-0.10.1
ARG RENKU_BASE_IMAGE=renku/renkulab-py:3.9-0.11.0
FROM ${RENKU_BASE_IMAGE}
# Uncomment and adapt if code is to be included in the image
......@@ -27,7 +27,7 @@ RUN conda env update -q -f /tmp/environment.yml && \
# RENKU_VERSION determines the version of the renku CLI
# that will be used in this image. To find the latest version,
# visit https://pypi.org/project/renku/#history.
ARG RENKU_VERSION=1.1.1
ARG RENKU_VERSION=1.5.0
########################################################
# Do not edit this section and do not add anything below
......@@ -47,4 +47,4 @@ RUN if [ -n "$RENKU_VERSION" ] ; then \
fi \
fi
########################################################
\ No newline at end of file
########################################################
src/train.py
View file @ fdf81f2d
......@@ -38,6 +38,7 @@ y_pred = model.predict(X_test)
acc = accuracy_score(y_test, y_pred)
print("Accuracy: ", acc)
# send the metadata to the Renku knowledge graph
export(model, force=True, evaluation_measure=(accuracy_score, acc))
with open(sys.argv[4], "wb") as f:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

This GitLab is a part of renkulab.io