forked from mxcube/mxcubecore
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Merge main #19
Merged
Merged
Merge main #19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [certifi](https://github.com/certifi/python-certifi) from 2023.5.7 to 2024.7.4. - [Commits](certifi/python-certifi@2023.05.07...2024.07.04) --- updated-dependencies: - dependency-name: certifi dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [zipp](https://github.com/jaraco/zipp) from 3.15.0 to 3.19.1. - [Release notes](https://github.com/jaraco/zipp/releases) - [Changelog](https://github.com/jaraco/zipp/blob/main/NEWS.rst) - [Commits](jaraco/zipp@v3.15.0...v3.19.1) --- updated-dependencies: - dependency-name: zipp dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
* Removed Device and Equipment objects and replaced them with HardwareObject * Removed Device and Equipment objects and replaced them with HardwareObject for configuration files * Fixed ISARA test * Fixed device_uri tags
Bumps [setuptools](https://github.com/pypa/setuptools) from 67.8.0 to 70.0.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](pypa/setuptools@v67.8.0...v70.0.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
The CatsMaintMockup does not inherit Equipment class anymore.
Don't import devtools module for the test collection queue entry. Mxcube-core does not list devtools package as a dependency. Also remove unused import of HardwareRepository.
New MachInfo hardware object, for using at BioMAX and MicroMAX. Based on older HWO used at BioMAX, but updated to follow the new AbstractMachineInfo API.
- mark python 3.11.* as supported for this package. - require later version of greenlet package, as version 1.1.3 does not work with python 3.11. - require later versions of gevent and gipc packages, to statisfy greenlet 3.* requirmets.
erikssod
approved these changes
Dec 3, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review focused on @fhernandezvivanco commits.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
develop
branch into the Australian Synchtrotronmain
BranchAperture
class which was refectored in the upstream branch