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

Xmsgrid master #49

Merged
merged 2 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/XmsMesher-CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
- name: Install Python Dependencies
run: |
python -m pip install --upgrade pip
pip install conan==1.60.0 conan-package-tools==0.39.0 devpi-client wheel MarkupSafe==2.0.0
pip install pyYAML==5.3.1 conan==1.60.0 conan-package-tools==0.39.0 devpi-client wheel MarkupSafe==2.0.0
python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2"
# Setup Conan
- name: Setup Conan Directory
Expand Down Expand Up @@ -202,7 +202,7 @@ jobs:
- name: Install Python Dependencies
run: |
python -m pip install --upgrade pip
pip install conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
pip install pyYAML==5.3.1 conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2"
# Login to Aquaveo Docker
- name: Login to Aquaveo Docker
Expand Down Expand Up @@ -328,7 +328,7 @@ jobs:
- name: Install Python Dependencies
run: |
python -m pip install --upgrade pip
pip install conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
pip install pyYAML==5.3.1 conan==1.41.0 conan-package-tools==0.35.1 devpi-client wheel MarkupSafe==2.0.0
python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2"
# Setup Visual Studio
- name: Setup Visual Studio
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class XmsmesherConan(XmsConanFile):
description = 'Mesher library for XMS products'
xms_dependencies = [
'xmscore/[>=6.0.1 <7.0.0]@aquaveo/stable',
'xmsgrid/[>=7.0.1 <8.0.0]@aquaveo/stable',
'xmsgrid/[>=7.7.5 <8.0.0]@aquaveo/stable',
'xmsinterp/[>=6.0.1 <7.0.0]@aquaveo/stable',
]
extra_export_sources = [
Expand Down
Loading
Loading