From f6fdb00c8f91123722dd3245e738c0f8440c116a Mon Sep 17 00:00:00 2001
From: nguyed99 <nguyed99@zedat.fu-berlin.de>
Date: Tue, 19 Dec 2023 19:16:23 +0100
Subject: [PATCH] Udpate project structure
---
README.md | 7 ++++---
jobs/src/__init__.py | 0
jobs/{unittests => tests}/test_a_job.py | 0
jobs/{unittests => tests}/test_bht_algorithm.py | 0
jobs/{unittests => tests}/test_integrator.py | 0
jobs/{unittests => tests}/test_jpl_data_query.py | 0
jobs/unittests/__init__.py | 0
tasks/{integration-tests => tests}/test_a_task.py | 0
.../{integration-tests => tests}/test_direct_simulation.py | 0
tasks/{integration-tests => tests}/test_ff_simulation.py | 0
10 files changed, 4 insertions(+), 3 deletions(-)
delete mode 100644 jobs/src/__init__.py
rename jobs/{unittests => tests}/test_a_job.py (100%)
rename jobs/{unittests => tests}/test_bht_algorithm.py (100%)
rename jobs/{unittests => tests}/test_integrator.py (100%)
rename jobs/{unittests => tests}/test_jpl_data_query.py (100%)
delete mode 100644 jobs/unittests/__init__.py
rename tasks/{integration-tests => tests}/test_a_task.py (100%)
rename tasks/{integration-tests => tests}/test_direct_simulation.py (100%)
rename tasks/{integration-tests => tests}/test_ff_simulation.py (100%)
diff --git a/README.md b/README.md
index c60a3d7..1e1ef70 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
All folders are isolated projects. `cd` into the folder to run/build them.
-- `jobs`: jobs to be built as a Docker image
+- `jobs`: jobs contain utility functions
- `tasks`: a task can be composed of many jobs
## Getting started with development tools
@@ -27,6 +27,7 @@ All folders are isolated projects. `cd` into the folder to run/build them.
2. We are storing Docker images at GitLab's integrated container registry by running:
docker login git.imp.fu-berlin.de:5000 -u <GITLAB_USERNAME> -p <TOKEN>
+
*Some Project Access Tokens are available and will be provided to members.*
## Local development
@@ -38,11 +39,11 @@ Jobs and tasks are run inside of docker containers. There is a docker build scri
The image is built now and ready to be used! The tests in the Docker container built from the image can be sanity-checked via :
- docker run -it --rm git.imp.fu-berlin.de:5000/comp-sci-project/jobs-n-tasks:local python jobs/unittests/test_a_job.py
+ docker run -it --rm git.imp.fu-berlin.de:5000/comp-sci-project/jobs-n-tasks:local python jobs/tests/test_a_job.py
or for testing a task:
- docker run -it --rm git.imp.fu-berlin.de:5000/comp-sci-project/jobs-n-tasks:local python tasks/integration-tests/test_a_task.py
+ docker run -it --rm git.imp.fu-berlin.de:5000/comp-sci-project/jobs-n-tasks:local python tasks/tests/test_a_task.py
For live experience (meaning you enter the container), run:
diff --git a/jobs/src/__init__.py b/jobs/src/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/jobs/unittests/test_a_job.py b/jobs/tests/test_a_job.py
similarity index 100%
rename from jobs/unittests/test_a_job.py
rename to jobs/tests/test_a_job.py
diff --git a/jobs/unittests/test_bht_algorithm.py b/jobs/tests/test_bht_algorithm.py
similarity index 100%
rename from jobs/unittests/test_bht_algorithm.py
rename to jobs/tests/test_bht_algorithm.py
diff --git a/jobs/unittests/test_integrator.py b/jobs/tests/test_integrator.py
similarity index 100%
rename from jobs/unittests/test_integrator.py
rename to jobs/tests/test_integrator.py
diff --git a/jobs/unittests/test_jpl_data_query.py b/jobs/tests/test_jpl_data_query.py
similarity index 100%
rename from jobs/unittests/test_jpl_data_query.py
rename to jobs/tests/test_jpl_data_query.py
diff --git a/jobs/unittests/__init__.py b/jobs/unittests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tasks/integration-tests/test_a_task.py b/tasks/tests/test_a_task.py
similarity index 100%
rename from tasks/integration-tests/test_a_task.py
rename to tasks/tests/test_a_task.py
diff --git a/tasks/integration-tests/test_direct_simulation.py b/tasks/tests/test_direct_simulation.py
similarity index 100%
rename from tasks/integration-tests/test_direct_simulation.py
rename to tasks/tests/test_direct_simulation.py
diff --git a/tasks/integration-tests/test_ff_simulation.py b/tasks/tests/test_ff_simulation.py
similarity index 100%
rename from tasks/integration-tests/test_ff_simulation.py
rename to tasks/tests/test_ff_simulation.py
--
GitLab