diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 8e741c2..1ba164f 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -137,7 +137,6 @@ jobs: sudo make fetch-modules cd ${{ vars.REPO_CLONE_PATH }}/backend/apps/ifc_validation/checks/ifc_gherkin_rules && git checkout -q ${{ vars.BRANCH_NAME }} && git pull cd ./ifc_validation_models && git checkout -q ${{ vars.BRANCH_NAME }} && git pull - cd ${{ vars.REPO_CLONE_PATH }}/backend/apps/ifc_validation/checks/step_file_parser && git checkout -q master && git pull cd ${{ vars.REPO_CLONE_PATH }}/backend/apps/ifc_validation_models && git checkout -q ${{ vars.BRANCH_NAME }} && git pull cd ${{ vars.REPO_CLONE_PATH }} ./check-submodules.sh diff --git a/.gitmodules b/.gitmodules index 4706ccf..ffa044a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,10 +2,6 @@ path = backend/apps/ifc_validation/checks/ifc_gherkin_rules url = https://github.com/buildingSMART/ifc-gherkin-rules branch = development -[submodule "backend/apps/ifc_validation/checks/step_file_parser"] - path = backend/apps/ifc_validation/checks/step_file_parser - url = https://github.com/IfcOpenShell/step-file-parser - branch = master [submodule "backend/apps/ifc_validation_models"] path = backend/apps/ifc_validation_models url = https://github.com/buildingSMART/ifc-validation-data-model diff --git a/README.md b/README.md index d6587ad..2f11a0a 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,13 @@ # Application Structure -The application consists of three main submodules, each hosted in separate GitHub repositories. Docker Compose is configured to automatically bind the correct submodule versions for local deployment. +The application consists of two main submodules, each hosted in separate GitHub repositories. Docker Compose is configured to automatically bind the correct submodule versions for local deployment. ### Submodules Documentation of the seperate functionalities can be found within each submodule. -1. **File Parser**: A module within IfcOpenShell, dedicated to parsing files. https://github.com/IfcOpenShell/step-file-parser -2. **Gherkin Rules**: Contains the rules for validation. It can be run independently by cloning the repository and executing: +1. **Gherkin Rules**: Contains the rules for validation. It can be run independently by cloning the repository and executing: https://github.com/buildingSMART/ifc-gherkin-rules ``` @@ -27,7 +26,7 @@ https://github.com/buildingSMART/ifc-gherkin-rules python test/test_main.py path_to_separate_file.py # For a separate file `````` -3. **Shared DataModel**: This module includes Django data models shared between the main repository and the Gherkin repository, serving as a submodule for both. +2. **Shared DataModel**: This module includes Django data models shared between the main repository and the Gherkin repository, serving as a submodule for both. https://github.com/buildingSMART/ifc-validation-data-model ## Running Validation Checks diff --git a/backend/README.md b/backend/README.md index d306a77..565ae00 100644 --- a/backend/README.md +++ b/backend/README.md @@ -5,7 +5,7 @@ 1. Syntax Validation ```shell -python3 apps/ifc_validation/checks/step_file_parser/main.py --json filename +python3 -m ifcopenshell.simple_spf --json filename ``` 2. Parse Info diff --git a/backend/apps/ifc_validation/checks/step_file_parser b/backend/apps/ifc_validation/checks/step_file_parser deleted file mode 160000 index 8a5349f..0000000 --- a/backend/apps/ifc_validation/checks/step_file_parser +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8a5349f57eadcbc280f8578cf5f6a1c006189533