Skip to content

Commit

Permalink
Merge pull request #130 from buildingSMART/IVS-265_Remove_Stepfilepar…
Browse files Browse the repository at this point in the history
…ser_Gitmodule

IVS-265 Remove stepfileparser module
  • Loading branch information
Ghesselink authored Nov 24, 2024
2 parents e84453c + 25b2866 commit ca51a0d
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 11 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

```
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion backend/apps/ifc_validation/checks/step_file_parser
Submodule step_file_parser deleted from 8a5349

0 comments on commit ca51a0d

Please sign in to comment.