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

Improved yaml linting and tightened config. Set YAML 1.2 everywhere #1288

Merged
merged 14 commits into from
Jul 8, 2024

Conversation

rhfogh
Copy link
Contributor

@rhfogh rhfogh commented Jul 4, 2024

Companion pull request to mxcubecore PR #957

There may be problems with poetry.lock and/or with mxcubeweb PR #1285.

poetry.lock Outdated
Copy link
Contributor

@fabcor-maxiv fabcor-maxiv Jul 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file (poetry.lock) should not have changed. I do not understand where this change comes from.

Maybe you could restore the file to its previous state and re-run poetry install or something like this.

@elmjag
Copy link
Contributor

elmjag commented Jul 5, 2024

Same comment as for this PR: mxcube/mxcubecore#957

Let's merge this into develop. I don't see a need to intermingle these changes with our XML to YAML conversion work.

@rhfogh rhfogh closed this Jul 5, 2024
@rhfogh rhfogh reopened this Jul 5, 2024
@marcus-oscarsson
Copy link
Member

@rhfogh Did you notice that there is a conflict ?

# Conflicts:
#	test/HardwareObjectsMockup.xml/gphl/gphl-workflow.yml
@rhfogh
Copy link
Contributor Author

rhfogh commented Jul 8, 2024

@marcus-oscarsson The conflict should be fixed now. Thanks for pointing it out.

@marcus-oscarsson marcus-oscarsson merged commit 585f924 into mxcube:xml_yaml_conversion Jul 8, 2024
1 check failed
@marcus-oscarsson marcus-oscarsson mentioned this pull request Jul 8, 2024
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.

5 participants