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.

Sign up for GitHub

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

Jump to bottom

Change version from 3.0-rc.2 to 3.0 #1765

Merged
merged 5 commits into from
May 10, 2022
Merged

Change version from 3.0-rc.2 to 3.0 #1765

merged 5 commits into from
May 10, 2022

Conversation

andreas-junghanns
Copy link
Contributor

No description provided.

@andreas-junghanns andreas-junghanns self-assigned this May 9, 2022
@andreas-junghanns andreas-junghanns added this to the v3.0 milestone May 9, 2022
@andreas-junghanns andreas-junghanns linked an issue May 9, 2022 that may be closed by this pull request
Relax fmiVersion attribute constraint to "3.*" #1660
Closed
@andreas-junghanns
Copy link
Contributor Author

All: If we want to publish 3.0 today, we should get this PR approved by more than my eyes... please try to make the time soon today.

chrbertsch
chrbertsch reviewed May 10, 2022
View reviewed changes
Copy link
Collaborator

@chrbertsch chrbertsch left a comment •
edited

Choose a reason for hiding this comment

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

Are the two "dots" in the change in the xsd files correct? <xs:pattern value="3[.](.*)"/>
(I am no expert in XML)

@andreas-junghanns
Copy link
Contributor Author

Are the two "dots" in the change in the xsd files correct? <xs:pattern value="3[.](.*)"/> (I am no expert in XML)

In this case it is reg-ex: the [.] asks for the . after the 3 - the next one is the any character, with * asked for any number of times, including 0 (I just realized). :|

@pmai : is the XSD reg-ex powerful enought to have +?

@andreas-junghanns
Copy link
Contributor Author

Also added to fmi3TerminalsAndIcons.xsd.

@pmai
Copy link
Collaborator

pmai commented May 10, 2022

Shouldn't the modeDescription schema for fmiVersion also be changed accordingly?

@andreas-junghanns
Copy link
Contributor Author

Shouldn't the modeDescription schema for fmiVersion also be changed accordingly?

Please check the proposal...

@chrbertsch chrbertsch requested a review from pmai May 10, 2022 15:38
@t-sommer
Copy link
Collaborator

I ran a quick test with FMPy.
The following versions match the fmiVersion regex: 3.0, 3.1, 3.0.1, 3.1-alpha.2, 3.0.1-rc.1
These don't: 3.x.1-rc.1, 31

@t-sommer t-sommer merged commit 526166d into modelica:master May 10, 2022
@andreas-junghanns andreas-junghanns linked an issue May 11, 2022 that may be closed by this pull request
Tag and release 3.0 #1766
Closed
@andreas-junghanns andreas-junghanns deleted the Remove_rc2 branch June 2, 2022 07:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t-sommer t-sommer t-sommer approved these changes

@chrbertsch chrbertsch chrbertsch approved these changes

@pmai pmai Awaiting requested review from pmai

Assignees

@andreas-junghanns andreas-junghanns

Labels
None yet
Projects
None yet
Milestone
v3.0
Development

Successfully merging this pull request may close these issues.

Tag and release 3.0 Relax fmiVersion attribute constraint to "3.*"
4 participants
@andreas-junghanns @pmai @t-sommer @chrbertsch