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

Remove DataSpecificationPhysicalUnit #137

Merged

Conversation

zrgt
Copy link
Contributor

@zrgt zrgt commented Oct 10, 2023

As the DataSpecificationPhysicalUnit is not part of V3.0 it was removed from the SDK.

Fixes #136

@zrgt zrgt changed the title Remove/dataspec phys unit Remove DataSpecificationPhysicalUnit Oct 10, 2023
@s-heppner
Copy link
Contributor

Looks good, however, can you fix the conflicts?

@zrgt
Copy link
Contributor Author

zrgt commented Oct 11, 2023

@s-heppner I have no right to do that: "Only those with write access to this repository can merge pull requests."

The conflict problems occur with .aasx files because the are zipped. You can just accept my files.

@jkhsjdhjs
Copy link
Contributor

jkhsjdhjs commented Oct 11, 2023

You could just rebase on improve/V30 and checkout --ours for the conflicting files. That aside, the PR looks good to me as well 👍

EDIT: Ah no, the AASX files will have to be merged manually and can't be checked out via --ours, since improve/V30 has the namespace changes. Otherwise, the tests will fail.

zrgt added 2 commits October 11, 2023 17:59
…_phys_unit

# Conflicts:
#	test/compliance_tool/files/test_demo_full_example_json.aasx
#	test/compliance_tool/files/test_demo_full_example_xml.aasx
#	test/compliance_tool/files/test_demo_full_example_xml_wrong_attribute.aasx
@zrgt
Copy link
Contributor Author

zrgt commented Oct 11, 2023

@jkhsjdhjs thanks for the advice.

I have done the fixes manually in the test files. I had to remove ".www" subdomain in AASX namespace once again

@s-heppner s-heppner merged commit 35bc834 into eclipse-basyx:improve/V30 Oct 12, 2023
5 checks passed
@s-heppner s-heppner deleted the Remove/dataspec_phys_unit branch October 12, 2023 10:51
@s-heppner s-heppner added the v3.0 label Nov 21, 2023
Frosty2500 pushed a commit to rwth-iat/basyx-python-sdk that referenced this pull request Aug 22, 2024
As the DataSpecificationPhysicalUnit is not part of V3.0 it was removed from the SDK.
Fixes eclipse-basyx#136
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants