Skip to content
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

Attempt to solve issue 902 #940

Merged
merged 4 commits into from
Jul 12, 2024
Merged

Attempt to solve issue 902 #940

merged 4 commits into from
Jul 12, 2024

Conversation

marcus-oscarsson
Copy link
Member

@marcus-oscarsson marcus-oscarsson commented Jun 14, 2024

Attempt to resolve #902. If accepted everybody have to update their local configuration files and use <object> instead of <equipment> or <device>

#issue 902

@marcus-oscarsson marcus-oscarsson changed the title issue 902 https://github.com/mxcube/mxcubecore/issues/902 #issue 902 Jun 14, 2024
@marcus-oscarsson marcus-oscarsson changed the title #issue 902 Attempt to solve issue 902 Jun 14, 2024
@fabcor-maxiv
Copy link
Contributor

If accepted everybody have to update their local configuration file and use instead of or

Missing some words here? :D

@marcus-oscarsson
Copy link
Member Author

I'm not sure this is the best way to do this; I would suggest that each site goes through their specific files and the common files to check if the proposed changes are alright. Or we can open a PR per site and for common files if its more digestible ?

@marcus-oscarsson
Copy link
Member Author

If accepted everybody have to update their local configuration file and use instead of or

Missing some words here? :D

Its the < tags that made the "words" go missing :)

@beteva
Copy link
Member

beteva commented Jun 14, 2024

There are two aspects of this issue - one is to change everywhere in the python code Device and Equipment inheritance and remove the two classes.The other is to change all the device and equipment to object keyword in the xml files.
Agree with @marcus-oscarsson that the local configuration has to be changed by each site. Just to confirm that this can be done even without changing the inheritance in the python files. We've already doing it at ESRF. once this done, we could do in one go the python inheritance,

@marcus-oscarsson marcus-oscarsson marked this pull request as ready for review June 19, 2024 06:11
@marcus-oscarsson
Copy link
Member Author

So what do you think, are we ready to make the jump to Object in this way or is to drastic ?

@marcus-oscarsson marcus-oscarsson merged commit 2348cf3 into develop Jul 12, 2024
10 checks passed
@marcus-oscarsson marcus-oscarsson deleted the mo-issue-902 branch July 12, 2024 12:20
@marcus-oscarsson
Copy link
Member Author

No regrets :)

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.

Remove device and equipment classes
3 participants