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

Wrap for shp2msh and msh2vtu #66

Open
wants to merge 28 commits into
base: main
Choose a base branch
from

Conversation

tStehling
Copy link
Collaborator

No description provided.

Copy link
Collaborator

@bernt-matthias bernt-matthias left a comment

Choose a reason for hiding this comment

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

Can you clean this up a bit? There is a msh2vtu.xml in the tools dir and there is a ogstools directory in the ogs_tools dir ... :)

Copy link
Collaborator

@bernt-matthias bernt-matthias left a comment

Choose a reason for hiding this comment

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

ogstools is now in conda

Copy link
Collaborator

@bernt-matthias bernt-matthias left a comment

Choose a reason for hiding this comment

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

Can you add a macros file with version tokens like here

<token name="@TOOL_VERSION@">5.18.0</token>

In order to use them, just import in the tools:

<import>macros.xml</import>

Can be used in the tool tag and for the requirement.

tools/ogstools/msh2vtu.xml Outdated Show resolved Hide resolved
tools/ogstools/shp2msh.xml Outdated Show resolved Hide resolved
tools/ogstools/msh2vtu.xml Outdated Show resolved Hide resolved
tools/ogstools/msh2vtu.xml Outdated Show resolved Hide resolved
tools/ogstools/shp2msh.xml Outdated Show resolved Hide resolved
tools/ogstools/shp2msh.xml Outdated Show resolved Hide resolved
tools/ogstools/.shed.yml Outdated Show resolved Hide resolved
@bernt-matthias
Copy link
Collaborator

@tStehling please start a new PR for the last commit.

To finish this one, just respond / fix according to the comments of @rmassei .

@@ -0,0 +1,18 @@
<macros>
<!-- for historic reasons the omero-py version is used as the version for all tools -->
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
<!-- for historic reasons the omero-py version is used as the version for all tools -->

<macros>
<!-- for historic reasons the omero-py version is used as the version for all tools -->
<token name="@TOOL_VERSION@">0.4.0</token>
<token name="@PROFILE@">21.05</token>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
<token name="@PROFILE@">21.05</token>
<token name="@PROFILE@">23.0</token>

tools/ogstools/Converter/msh2vtu.xml Outdated Show resolved Hide resolved
tools/ogstools/Converter/msh2vtu.xml Outdated Show resolved Hide resolved
tools/ogstools/Converter/msh2vtu.xml Outdated Show resolved Hide resolved
tools/ogstools/Converter/shp2msh.xml Outdated Show resolved Hide resolved
tools/ogstools/Converter/shp2msh.xml Outdated Show resolved Hide resolved
tools/ogstools/Converter/macros.xml Outdated Show resolved Hide resolved
tools/ogstools/Converter/msh2vtu.xml Outdated Show resolved Hide resolved
tools/ogstools/Converter/shp2msh.xml Outdated Show resolved Hide resolved
long_description: |
A suite of tools for ogs.
categories:
- Ecology
Copy link
Collaborator

Choose a reason for hiding this comment

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

We need to find a fitting category. I'm going to ask Lars.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Copy link
Collaborator

@bernt-matthias bernt-matthias left a comment

Choose a reason for hiding this comment

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

Fix category

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.

3 participants