From 28645dc530b6cf90e4365b41c469909150c4783f Mon Sep 17 00:00:00 2001 From: hjwilli Date: Tue, 5 May 2020 17:04:43 -0400 Subject: [PATCH] cleanup dockers -> docker Former-commit-id: ba64807011193fe2eb3b85c5fa06da353e6411b8 --- .dockerignore | 6 +-- config/readme.md | 2 +- .../preprocess_pmlb_knowledgebase.ipynb | 2 +- docker-compose-int-test.yml | 6 +-- docker-compose-multi-machine.yml | 16 +++--- docker-compose-production.yml | 6 +-- docker-compose.yml | 6 +-- {dockers => docker}/dbmongo/Dockerfile | 2 +- .../dbmongo/files/entrypoint.sh | 0 {dockers => docker}/dbmongo/files/mongod.conf | 0 .../dbmongo/files/projects.json | 0 {dockers => docker}/dbmongo/files/sync.sh | 0 {dockers => docker}/dbmongo/files/users.json | 0 {dockers => docker}/lab/Dockerfile | 2 +- {dockers => docker}/lab/Dockerfile_production | 2 +- {dockers => docker}/lab/files/001-pennai.conf | 0 {dockers => docker}/lab/files/ca.crt | 0 {dockers => docker}/lab/files/certs/.gitigore | 0 {dockers => docker}/lab/files/entrypoint.sh | 0 {dockers => docker}/lab/files/ports.conf | 0 .../lab/files/requirements.txt | 16 +++--- {dockers => docker}/lab/files/start.sh | 0 {dockers => docker}/lab/files/wait-for-it.sh | 0 {dockers => docker}/machine/Dockerfile | 2 +- .../machine/Dockerfile_production | 2 +- .../machine/files/entrypoint.sh | 0 .../machine/files/requirements.txt | 18 +++---- .../machine/files/wait-for-it.sh | 0 dockers/lab/files/certs/cert.pem | 34 ------------- dockers/lab/files/certs/key.pem | 51 ------------------- dockers/lab/files/htpasswd | 3 -- machine/test/learn_tests.py | 2 +- 32 files changed, 45 insertions(+), 133 deletions(-) rename {dockers => docker}/dbmongo/Dockerfile (95%) mode change 100755 => 100644 rename {dockers => docker}/dbmongo/files/entrypoint.sh (100%) mode change 100755 => 100644 rename {dockers => docker}/dbmongo/files/mongod.conf (100%) rename {dockers => docker}/dbmongo/files/projects.json (100%) rename {dockers => docker}/dbmongo/files/sync.sh (100%) mode change 100755 => 100644 rename {dockers => docker}/dbmongo/files/users.json (100%) rename {dockers => docker}/lab/Dockerfile (98%) mode change 100755 => 100644 rename {dockers => docker}/lab/Dockerfile_production (98%) rename {dockers => docker}/lab/files/001-pennai.conf (100%) mode change 100755 => 100644 rename {dockers => docker}/lab/files/ca.crt (100%) mode change 100755 => 100644 rename {dockers => docker}/lab/files/certs/.gitigore (100%) rename {dockers => docker}/lab/files/entrypoint.sh (100%) mode change 100755 => 100644 rename {dockers => docker}/lab/files/ports.conf (100%) rename {dockers => docker}/lab/files/requirements.txt (94%) rename {dockers => docker}/lab/files/start.sh (100%) mode change 100755 => 100644 rename {dockers => docker}/lab/files/wait-for-it.sh (100%) rename {dockers => docker}/machine/Dockerfile (96%) mode change 100755 => 100644 rename {dockers => docker}/machine/Dockerfile_production (97%) rename {dockers => docker}/machine/files/entrypoint.sh (100%) mode change 100755 => 100644 rename {dockers => docker}/machine/files/requirements.txt (94%) rename {dockers => docker}/machine/files/wait-for-it.sh (100%) delete mode 100644 dockers/lab/files/certs/cert.pem delete mode 100644 dockers/lab/files/certs/key.pem delete mode 100644 dockers/lab/files/htpasswd diff --git a/.dockerignore b/.dockerignore index feb5ee33d..82f8c7f7d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,9 +1,9 @@ # Allow files and directories !**/package.json !**/package-lock.json -!/dockers/dbmongo/files/** -!/dockers/lab/files/** -!/dockers/machine/files/** +!/docker/dbmongo/files/** +!/docker/lab/files/** +!/docker/machine/files/** # Ignore unnecessary files inside allowed directories # This should go after the allowed directories diff --git a/config/readme.md b/config/readme.md index b8400b8e8..0d92bdb69 100644 --- a/config/readme.md +++ b/config/readme.md @@ -1,7 +1,7 @@ # Environment Configuration # Algorithm Configuration -Machine learning algorithm parameters and UI settings are defined in `/dockers/dbmongo/files/projects.json` +Machine learning algorithm parameters and UI settings are defined in `/docker/dbmongo/files/projects.json` ## Schema ``` diff --git a/data/knowledgebases/processing/preprocess_pmlb_knowledgebase.ipynb b/data/knowledgebases/processing/preprocess_pmlb_knowledgebase.ipynb index 4ad6544fb..c9783c3ce 100644 --- a/data/knowledgebases/processing/preprocess_pmlb_knowledgebase.ipynb +++ b/data/knowledgebases/processing/preprocess_pmlb_knowledgebase.ipynb @@ -117,7 +117,7 @@ "from json import JSONDecoder \n", "from functools import partial \n", " \n", - "alldata= json.load(open('../../../dockers/dbmongo/files/projects.json'),encoding=\"utf-8\")\n", + "alldata= json.load(open('../../../docker/dbmongo/files/projects.json'),encoding=\"utf-8\")\n", "\n", "# path = 'projects_newlines.json' \n", "# data,alldata=[],[] \n", diff --git a/docker-compose-int-test.yml b/docker-compose-int-test.yml index bdf755935..380a0e168 100644 --- a/docker-compose-int-test.yml +++ b/docker-compose-int-test.yml @@ -21,7 +21,7 @@ services: lab: build: context: . - dockerfile: dockers/lab/Dockerfile + dockerfile: docker/lab/Dockerfile tty: true stdin_open: true volumes: @@ -43,7 +43,7 @@ services: machine: build: context: . - dockerfile: dockers/machine/Dockerfile + dockerfile: docker/machine/Dockerfile tty: true stdin_open: true volumes: @@ -62,7 +62,7 @@ services: dbmongo: build: context: . - dockerfile: dockers/dbmongo/Dockerfile + dockerfile: docker/dbmongo/Dockerfile tty: true stdin_open: true ports: diff --git a/docker-compose-multi-machine.yml b/docker-compose-multi-machine.yml index 05a21a7cb..de2fdd07d 100644 --- a/docker-compose-multi-machine.yml +++ b/docker-compose-multi-machine.yml @@ -4,7 +4,7 @@ services: lab: build: context: . - dockerfile: dockers/lab/Dockerfile + dockerfile: docker/lab/Dockerfile tty: true stdin_open: true volumes: @@ -23,7 +23,7 @@ services: machine_1: build: context: . - dockerfile: dockers/machine/Dockerfile + dockerfile: docker/machine/Dockerfile tty: true stdin_open: true volumes: @@ -42,7 +42,7 @@ services: machine_2: build: context: . - dockerfile: dockers/machine/Dockerfile + dockerfile: docker/machine/Dockerfile tty: true stdin_open: true volumes: @@ -61,7 +61,7 @@ services: machine_3: build: context: . - dockerfile: dockers/machine/Dockerfile + dockerfile: docker/machine/Dockerfile tty: true stdin_open: true volumes: @@ -80,7 +80,7 @@ services: machine_4: build: context: . - dockerfile: dockers/machine/Dockerfile + dockerfile: docker/machine/Dockerfile tty: true stdin_open: true volumes: @@ -98,7 +98,7 @@ services: machine_5: build: context: . - dockerfile: dockers/machine/Dockerfile + dockerfile: docker/machine/Dockerfile tty: true stdin_open: true volumes: @@ -117,7 +117,7 @@ services: machine_6: build: context: . - dockerfile: dockers/machine/Dockerfile + dockerfile: docker/machine/Dockerfile tty: true stdin_open: true volumes: @@ -136,7 +136,7 @@ services: dbmongo: build: context: . - dockerfile: dockers/dbmongo/Dockerfile + dockerfile: docker/dbmongo/Dockerfile tty: true stdin_open: true ports: diff --git a/docker-compose-production.yml b/docker-compose-production.yml index fc5702662..c131773ba 100644 --- a/docker-compose-production.yml +++ b/docker-compose-production.yml @@ -5,7 +5,7 @@ services: lab: build: context: . - dockerfile: dockers/lab/Dockerfile_production + dockerfile: docker/lab/Dockerfile_production image: "pennai_lab:${TAG}" tty: true stdin_open: true @@ -24,7 +24,7 @@ services: machine: build: context: . - dockerfile: dockers/machine/Dockerfile_production + dockerfile: docker/machine/Dockerfile_production image: "pennai_machine:${TAG}" tty: true stdin_open: true @@ -43,7 +43,7 @@ services: dbmongo: build: context: . - dockerfile: dockers/dbmongo/Dockerfile + dockerfile: docker/dbmongo/Dockerfile image: "pennai_dbmongo:${TAG}" tty: true stdin_open: true diff --git a/docker-compose.yml b/docker-compose.yml index fab769516..1891ece4d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: lab: build: context: . - dockerfile: dockers/lab/Dockerfile + dockerfile: docker/lab/Dockerfile tty: true stdin_open: true volumes: @@ -22,7 +22,7 @@ services: machine: build: context: . - dockerfile: dockers/machine/Dockerfile + dockerfile: docker/machine/Dockerfile tty: true stdin_open: true volumes: @@ -40,7 +40,7 @@ services: dbmongo: build: context: . - dockerfile: dockers/dbmongo/Dockerfile + dockerfile: docker/dbmongo/Dockerfile tty: true stdin_open: true ports: diff --git a/dockers/dbmongo/Dockerfile b/docker/dbmongo/Dockerfile old mode 100755 new mode 100644 similarity index 95% rename from dockers/dbmongo/Dockerfile rename to docker/dbmongo/Dockerfile index b3252faa2..d8f2b5c7a --- a/dockers/dbmongo/Dockerfile +++ b/docker/dbmongo/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:xenial WORKDIR /opt/ -ARG docker_filepath=dockers/dbmongo/files +ARG docker_filepath=docker/dbmongo/files #add repo for mongodb RUN echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.2.list diff --git a/dockers/dbmongo/files/entrypoint.sh b/docker/dbmongo/files/entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from dockers/dbmongo/files/entrypoint.sh rename to docker/dbmongo/files/entrypoint.sh diff --git a/dockers/dbmongo/files/mongod.conf b/docker/dbmongo/files/mongod.conf similarity index 100% rename from dockers/dbmongo/files/mongod.conf rename to docker/dbmongo/files/mongod.conf diff --git a/dockers/dbmongo/files/projects.json b/docker/dbmongo/files/projects.json similarity index 100% rename from dockers/dbmongo/files/projects.json rename to docker/dbmongo/files/projects.json diff --git a/dockers/dbmongo/files/sync.sh b/docker/dbmongo/files/sync.sh old mode 100755 new mode 100644 similarity index 100% rename from dockers/dbmongo/files/sync.sh rename to docker/dbmongo/files/sync.sh diff --git a/dockers/dbmongo/files/users.json b/docker/dbmongo/files/users.json similarity index 100% rename from dockers/dbmongo/files/users.json rename to docker/dbmongo/files/users.json diff --git a/dockers/lab/Dockerfile b/docker/lab/Dockerfile old mode 100755 new mode 100644 similarity index 98% rename from dockers/lab/Dockerfile rename to docker/lab/Dockerfile index 78185190c..0a677aa7e --- a/dockers/lab/Dockerfile +++ b/docker/lab/Dockerfile @@ -6,7 +6,7 @@ RUN wget --quiet https://nodejs.org/dist/v11.14.0/node-v11.14.0-linux-x64.tar.xz rm ~/node.tar.xz ENV PATH /opt/node-v11.14.0-linux-x64/bin:$PATH -ARG docker_filepath=dockers/lab/files +ARG docker_filepath=docker/lab/files RUN apt-get update --fix-missing && apt-get install -y \ vim openssh-client openssh-server telnet apache2 \ diff --git a/dockers/lab/Dockerfile_production b/docker/lab/Dockerfile_production similarity index 98% rename from dockers/lab/Dockerfile_production rename to docker/lab/Dockerfile_production index 4333019de..fa41b7c8d 100644 --- a/dockers/lab/Dockerfile_production +++ b/docker/lab/Dockerfile_production @@ -11,7 +11,7 @@ RUN wget --quiet https://nodejs.org/dist/v11.14.0/node-v11.14.0-linux-x64.tar.xz rm ~/node.tar.xz ENV PATH /opt/node-v11.14.0-linux-x64/bin:$PATH -ARG docker_filepath=dockers/lab/files +ARG docker_filepath=docker/lab/files RUN apt-get update --fix-missing && apt-get install -y \ vim openssh-client openssh-server telnet apache2 \ diff --git a/dockers/lab/files/001-pennai.conf b/docker/lab/files/001-pennai.conf old mode 100755 new mode 100644 similarity index 100% rename from dockers/lab/files/001-pennai.conf rename to docker/lab/files/001-pennai.conf diff --git a/dockers/lab/files/ca.crt b/docker/lab/files/ca.crt old mode 100755 new mode 100644 similarity index 100% rename from dockers/lab/files/ca.crt rename to docker/lab/files/ca.crt diff --git a/dockers/lab/files/certs/.gitigore b/docker/lab/files/certs/.gitigore similarity index 100% rename from dockers/lab/files/certs/.gitigore rename to docker/lab/files/certs/.gitigore diff --git a/dockers/lab/files/entrypoint.sh b/docker/lab/files/entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from dockers/lab/files/entrypoint.sh rename to docker/lab/files/entrypoint.sh diff --git a/dockers/lab/files/ports.conf b/docker/lab/files/ports.conf similarity index 100% rename from dockers/lab/files/ports.conf rename to docker/lab/files/ports.conf diff --git a/dockers/lab/files/requirements.txt b/docker/lab/files/requirements.txt similarity index 94% rename from dockers/lab/files/requirements.txt rename to docker/lab/files/requirements.txt index bc202775b..d4b523175 100644 --- a/dockers/lab/files/requirements.txt +++ b/docker/lab/files/requirements.txt @@ -1,8 +1,8 @@ -scikit-learn==0.22.1 -tqdm==4.32.2 -pymongo==3.8.0 -pandas==1.0.3 -cython==0.29.2 -xgboost==0.82 -simplejson==3.16.0 -requests==2.22.0 +scikit-learn==0.22.1 +tqdm==4.32.2 +pymongo==3.8.0 +pandas==1.0.3 +cython==0.29.2 +xgboost==0.82 +simplejson==3.16.0 +requests==2.22.0 diff --git a/dockers/lab/files/start.sh b/docker/lab/files/start.sh old mode 100755 new mode 100644 similarity index 100% rename from dockers/lab/files/start.sh rename to docker/lab/files/start.sh diff --git a/dockers/lab/files/wait-for-it.sh b/docker/lab/files/wait-for-it.sh similarity index 100% rename from dockers/lab/files/wait-for-it.sh rename to docker/lab/files/wait-for-it.sh diff --git a/dockers/machine/Dockerfile b/docker/machine/Dockerfile old mode 100755 new mode 100644 similarity index 96% rename from dockers/machine/Dockerfile rename to docker/machine/Dockerfile index c0a07a104..102909cc2 --- a/dockers/machine/Dockerfile +++ b/docker/machine/Dockerfile @@ -6,7 +6,7 @@ RUN wget --quiet https://nodejs.org/dist/v11.14.0/node-v11.14.0-linux-x64.tar.xz rm ~/node.tar.xz ENV PATH /opt/node-v11.14.0-linux-x64/bin:$PATH -ARG docker_filepath=dockers/machine/files +ARG docker_filepath=docker/machine/files RUN apt-get update --fix-missing && apt-get install -y \ vim openssh-client openssh-server graphviz \ diff --git a/dockers/machine/Dockerfile_production b/docker/machine/Dockerfile_production similarity index 97% rename from dockers/machine/Dockerfile_production rename to docker/machine/Dockerfile_production index ebf526f9f..570a6c481 100644 --- a/dockers/machine/Dockerfile_production +++ b/docker/machine/Dockerfile_production @@ -10,7 +10,7 @@ RUN wget --quiet https://nodejs.org/dist/v11.14.0/node-v11.14.0-linux-x64.tar.xz rm ~/node.tar.xz ENV PATH /opt/node-v11.14.0-linux-x64/bin:$PATH -ARG docker_filepath=dockers/machine/files +ARG docker_filepath=docker/machine/files RUN apt-get update --fix-missing && apt-get install -y \ vim openssh-client openssh-server graphviz \ diff --git a/dockers/machine/files/entrypoint.sh b/docker/machine/files/entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from dockers/machine/files/entrypoint.sh rename to docker/machine/files/entrypoint.sh diff --git a/dockers/machine/files/requirements.txt b/docker/machine/files/requirements.txt similarity index 94% rename from dockers/machine/files/requirements.txt rename to docker/machine/files/requirements.txt index b1a95081b..15482eac2 100644 --- a/dockers/machine/files/requirements.txt +++ b/docker/machine/files/requirements.txt @@ -1,9 +1,9 @@ -scikit-learn==0.22.1 -tqdm==4.32.2 -pymongo==3.8.0 -pandas==1.0.3 -matplotlib==3.1.0 -mlxtend==0.16.0 -pydot==1.4.1 -requests==2.22.0 -xgboost==0.90 +scikit-learn==0.22.1 +tqdm==4.32.2 +pymongo==3.8.0 +pandas==1.0.3 +matplotlib==3.1.0 +mlxtend==0.16.0 +pydot==1.4.1 +requests==2.22.0 +xgboost==0.90 diff --git a/dockers/machine/files/wait-for-it.sh b/docker/machine/files/wait-for-it.sh similarity index 100% rename from dockers/machine/files/wait-for-it.sh rename to docker/machine/files/wait-for-it.sh diff --git a/dockers/lab/files/certs/cert.pem b/dockers/lab/files/certs/cert.pem deleted file mode 100644 index 75b43fc53..000000000 --- a/dockers/lab/files/certs/cert.pem +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIF7zCCA9egAwIBAgIJALYrP7sJPo0fMA0GCSqGSIb3DQEBCwUAMIGNMQswCQYD -VQQGEwJVUzEVMBMGA1UECAwMUGVubnN5bHZhbmlhMRUwEwYDVQQHDAxQaGlsYWRl -bHBoaWExIzAhBgNVBAoMGlVuaXZlcnNpdHkgb2YgUGVubnN5bHZhbmlhMQ8wDQYD -VQQLDAZQZW5uQUkxGjAYBgNVBAMMEWJpZy50cmlkZW50YmMub3JnMB4XDTE3MDYx -NDE4NDY0MVoXDTE4MDYxNDE4NDY0MVowgY0xCzAJBgNVBAYTAlVTMRUwEwYDVQQI -DAxQZW5uc3lsdmFuaWExFTATBgNVBAcMDFBoaWxhZGVscGhpYTEjMCEGA1UECgwa -VW5pdmVyc2l0eSBvZiBQZW5uc3lsdmFuaWExDzANBgNVBAsMBlBlbm5BSTEaMBgG -A1UEAwwRYmlnLnRyaWRlbnRiYy5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQDRF1y7a9OZSO9rn/kS2cz3D9/y7MELGdh3cmUF3gzBCLrMxwC9IrMn -lwVwPTHWOdLB3f+GRHcxj9eso1fIgYwl3rWx808edXa4mFF1LUfBiXF0Z9Lx9Wuh -0NAFh6a2i2W3U58sSvtrZOoTZY1Lu2ub5saiPUu6R8sB2BqmMBUeBnN2boXX2BUQ -BEq/Dypw8UPxXmRGbH2vbfYEZmqrTk5650uF8m/JS3a4vijMnX5gvEEc6UjkZrot -Wepmpv8TA4urXSm61gSkHczG8arRwgtSE5OLIb0f3pkkBHharo9X67DibKZgOwQg -5AcNGxsS2utx/IXp8pyjGgSY8QohBmtkIH8OUBNMyY5XDnXReZdrqYfzMPovYHdc -XURCM1/GSKzLk8uhq/RpCL7Wn7ApMu4tVl+Zz96ybranRX41IvGsGJt0n/mA/9Vk -OMr8S+XbbYAukq8OiJiIaQX75ZgvpDNXdhUZ8JlvPu0s+plGjQCmdgtt+kjQ9OmS -Rp4vQaHKlFZRsm6Mozd8iDde8VQmqaLB9KHAWJLUxAsgcvGKam6Purskjj8lhS/B -w2oCM3tWYF2nXDlyJ47aqMd5pOKt0a6+FfUqqLPnK7+zVgeppvZtBBMwOUCuFN7S -a5sBFc7OWzgD4iA2NWTTB+cWVusaTwiwUmv7oeX//JoAxpM+ACtMuwIDAQABo1Aw -TjAdBgNVHQ4EFgQUCVfbyMsCSX63ZuGlo7m20dTSlFYwHwYDVR0jBBgwFoAUCVfb -yMsCSX63ZuGlo7m20dTSlFYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC -AgEAsPQVhB/sBTvRLQNG1Xh6mu1ukiRGtRUr8WvEYCx0A7AxP3fgnTrXmQiXg9TG -NkHK6ogVOcjPDHbFTV5MSVQ+nzxqcD4992cHcadT7w1zjm6t8QSuc/TfHG4aqEVF -oFYBmX44lIacvkYC3U3LFCDn+ftDLuW1W6sfKYLqrbwTBcsZ9zc64LgjTo/pWczq -r4C4gCt3PGAQD2elrqTYL38M05CwJxlGA5rpvnCaWMPNN0WaSPI15VMWsnhidFOy -NX8WHKmhB9Oy7Mxhd36JsYwzFfsH+rVwEuOLSrDrvt2FslInpiANMzXpdLTJK2Xo -7s8Ew8aytj/4qIiGMoS5vM+GX1PJnwYmojtvCT4M/FqqQAGjeVsUtWxFu25M+Q9D -sUqKiwPuQFs7IBU2WxcYnz57oiSXkKu1/ZUxEZd/X90JVTTTfgYyGmvK69QyKBmx -g9xJck9edb7chEd+ADyyOQ1KsHBvRUjJ54dgUYdu2SRzGg6usLfmteDqjQirb3zN -5HOyMhXgbagje7RIFAK8yJKGmK9ibNPEpGn7NkCFibY1AyQhj06TK8pVghhDnjiC -bJeGQe0MaG9RiVgQ5ZuGOyhMIX1c+HakZsHxYLYDt+1TcpH8dVC91F6wlI8LXdo5 -eAQ7nrVc/5OiVmPF98WqvNItPqP8kjbXT0ARyM7ZkxJ9GtY= ------END CERTIFICATE----- diff --git a/dockers/lab/files/certs/key.pem b/dockers/lab/files/certs/key.pem deleted file mode 100644 index 3eeb8ccae..000000000 --- a/dockers/lab/files/certs/key.pem +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/dockers/lab/files/htpasswd b/dockers/lab/files/htpasswd deleted file mode 100644 index f076e7125..000000000 --- a/dockers/lab/files/htpasswd +++ /dev/null @@ -1,3 +0,0 @@ -testuser:$apr1$t1XGAfRI$PlHPPt/qiVcOlNQpeh9/P1 -pmlb:$apr1$so2Yb06R$FHZXvWwt7NS5CC5FCAb9L0 -ai:$apr1$FRbCKfig$KslXYhMhfqU3kETejsV4i/ diff --git a/machine/test/learn_tests.py b/machine/test/learn_tests.py index 3765807c4..11535d64c 100644 --- a/machine/test/learn_tests.py +++ b/machine/test/learn_tests.py @@ -119,7 +119,7 @@ def make_train_test_split(input_data, target_name, random_state): test_gbc = GradientBoostingClassifier() test_reg = DecisionTreeRegressor() # projects information -projects_json = "dockers/dbmongo/files/projects.json" +projects_json = "docker/dbmongo/files/projects.json" # json_file = open(projects_json, encoding="utf8") # projects_json_data = [obj for obj in decode_stacked(json_file.read())]