Skip to content

Refactor file structure #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 25, 2025
Merged

Conversation

syntron
Copy link
Contributor

@syntron syntron commented Apr 17, 2025

Related Issues

See #254

Purpose

Separate the differnet classes / parser files such that specific commits touch only the corresponding file.
Use init.py only for the package related definitions (public interface of the package)

Approach

  • move classes from init.py into separate files (=> OMCSession; ModelicaSystem)
  • move OMParser/init.py into OMParser.py as it is just a directory

This is splitted into several commits such that the main change (move class definitions) can easily be rebased / redone

There are some smaller changes which I would add on top of this change / after #249

@syntron syntron force-pushed the refactor_file_structure branch from 2c6ce23 to 5fc1d97 Compare April 17, 2025 17:11
@syntron syntron mentioned this pull request Apr 17, 2025
@adeas31
Copy link
Member

adeas31 commented Apr 23, 2025

@syntron please fix conflicts.

@syntron
Copy link
Contributor Author

syntron commented Apr 23, 2025

@syntron please fix conflicts.

I can do the rebase; however, my recommendation is to merge #258 (and #262) before that (will be rebased first ;-))

@syntron syntron force-pushed the refactor_file_structure branch from 5fc1d97 to 742ed1c Compare April 23, 2025 17:29
@syntron
Copy link
Contributor Author

syntron commented Apr 23, 2025

rebase available

@syntron syntron mentioned this pull request Apr 23, 2025
@adeas31
Copy link
Member

adeas31 commented Apr 23, 2025

#258 and #262 are merged.

syntron added 7 commits April 24, 2025 20:15
reason: cleanup; no need to use a sub-module / sub-directory
* dummy entries for the classes to move from __init__.py
* dummy entries for the classes to move from __init__.py
* fix imports based on merged changes
!! only copy & paste of the class definitions - *NO* further change !!

* OMCSessionBase => OMCSession.py
* OMCSessionZMQ => OMCSession.py
* ModelicaSystem => ModelicaSystem.py
* ModelicaSystemError => ModelicaSystem.py
@syntron syntron force-pushed the refactor_file_structure branch from 742ed1c to 5e0569c Compare April 24, 2025 18:24
@syntron
Copy link
Contributor Author

syntron commented Apr 24, 2025

rebased again; ready for merge!

@adeas31 adeas31 self-requested a review April 25, 2025 11:21
@adeas31 adeas31 merged commit 1c50417 into OpenModelica:master Apr 25, 2025
5 checks passed
@syntron syntron deleted the refactor_file_structure branch April 25, 2025 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants