Update CI build config

SINTEF · Feb 7, 2024 · 1874cb5 · 1874cb5
1 parent 8e9bc82
commit 1874cb5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -48,17 +48,16 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.9'
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip wheel
-          pip install cibuildwheel
+          python -m pip install --upgrade pip wheel poetry cibuildwheel
       - name: Build wheels
         run: |
           python -m cibuildwheel --output-dir wheelhouse
         env:
           CIBW_BUILD: cp39-* cp310-* cp311-* cp312-*
-          CIBW_SKIP: '*musllinux* *i686'
+          CIBW_SKIP: '*musllinux* *i686*'
           CIBW_BEFORE_BUILD: pip install -r requirements.dev.txt
       - uses: actions/upload-artifact@v3
         with:
@@ -74,16 +73,15 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.9'
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r requirements.dev.txt
+          python -m pip install --upgrade pip wheel poetry
       - name: Build sdist
-        run: python setup.py sdist
+        run: make sdist
       - uses: actions/upload-artifact@v3
         with:
-          path: dist/*.tar.gz
+          path: ./dist/*.tar.gz
 
   deploy:
     name: Deploy

diff --git a/Makefile b/Makefile
@@ -27,3 +27,13 @@ test: pytest
 
 doc:
 	$(MAKE) -C doc html
+
+# Build targets (used from CI)
+
+sdist:
+	poetry build -f sdist
+
+wheel:
+	poetry build -f wheel
+
+build: sdist wheel