From 77e0cac731222e3dcc4cdcb8aa7314d53758c172 Mon Sep 17 00:00:00 2001 From: Bill Dolinar Date: Tue, 20 Dec 2022 15:29:34 -0700 Subject: [PATCH] Automatically set wheel name. See PEP 427. (cherry picked from commit f6f7c386fd2584f79ea77941f97a8039bd535901) --- .github/workflows/XmsExtractor-CI.yaml | 6 +++--- _package/setup.py | 1 + _package/xms/extractor/__init__.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/XmsExtractor-CI.yaml b/.github/workflows/XmsExtractor-CI.yaml index da1aabb..72e0f54 100644 --- a/.github/workflows/XmsExtractor-CI.yaml +++ b/.github/workflows/XmsExtractor-CI.yaml @@ -86,7 +86,7 @@ jobs: 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 - python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1,<2" + python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1.0.4,<2" # Setup Xcode - name: Setup XCode uses: sinoru/actions-setup-xcode@v1.1 @@ -208,7 +208,7 @@ jobs: 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 - python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1,<2" + 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 run: sudo docker login -u ${{ secrets.AQUAVEO_DOCKER_USERNAME_SECRET }} -p ${{ secrets.AQUAVEO_DOCKER_TOKEN }} docker.aquaveo.com @@ -334,7 +334,7 @@ jobs: 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 - python -m pip install -i https://public.aquapi.aquaveo.com/aquaveo/stable/+simple/ "xmsconan>=1,<2" + 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 uses: microsoft/setup-msbuild@v1.0.2 diff --git a/_package/setup.py b/_package/setup.py index ede79da..07f0d1f 100644 --- a/_package/setup.py +++ b/_package/setup.py @@ -33,4 +33,5 @@ dependency_links=[ 'https://public.aquapi.aquaveo.com/aquaveo/stable' ], + has_ext_modules=lambda: True, ) diff --git a/_package/xms/extractor/__init__.py b/_package/xms/extractor/__init__.py index 359283d..8c78538 100644 --- a/_package/xms/extractor/__init__.py +++ b/_package/xms/extractor/__init__.py @@ -2,4 +2,4 @@ from .ugrid_2d_data_extractor import UGrid2dDataExtractor # NOQA: F401 from .ugrid_2d_polyline_data_extractor import UGrid2dPolylineDataExtractor # NOQA: F401 -__version__ = '9.0.2' +__version__ = '9.0.3'