Skip to content

Commit

Permalink
Update actions and version for building wheels
Browse files Browse the repository at this point in the history
  • Loading branch information
ghislainv committed Dec 18, 2023
1 parent 2f75a8c commit c2c8b42
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 33 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/github-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'
- name: Install system libraries
run: |
sudo add-apt-repository --yes ppa:ubuntugis/ppa
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Adding nojekyll file
run: touch docs/html/.nojekyll
- name: Deploy generated content to GitHub Pages
uses: JamesIves/github-pages-deploy-action@v4.4.1
uses: JamesIves/github-pages-deploy-action@v4
with:
branch: gh-pages
folder: docs/html
8 changes: 4 additions & 4 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.10"
- uses: pre-commit/[email protected]
python-version: "3.11"
- uses: pre-commit/[email protected]
6 changes: 3 additions & 3 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: PyPkg

on:
push:
branches: [ master, dev ]
branches: [master, dev]
pull_request:
branches:
- master
Expand All @@ -17,9 +17,9 @@ jobs:
matrix:
python-version: ['3.9', '3.10', '3.11']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install system libraries
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/wheel-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,41 +21,41 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.10'
python-version: '3.11'
- name: Install NumPy and cibuildwheel
run: |
python3 -m pip install --upgrade pip
python3 -m pip install cibuildwheel==2.12.3
python3 -m pip install cibuildwheel==2.16.2
- name: Build wheels
run: |
python3 -m cibuildwheel --output-dir wheelhouse
env:
CIBW_SKIP: pp* cp27-win*
CIBW_BEFORE_BUILD: pip install numpy
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: ./wheelhouse/*.whl

build_sdist:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.10'
python-version: '3.11'
- name: Install Python dependencies
run: |
python3 -m pip install --upgrade pip setuptools wheel
python3 -m pip install numpy
- name: Build sdist
run: python setup.py sdist
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: dist/*.tar.gz

Expand All @@ -66,7 +66,7 @@ jobs:
needs: [build_wheels, build_sdist]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/wheel-testpypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,41 +18,41 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.10'
python-version: '3.11'
- name: Install NumPy and cibuildwheel
run: |
python3 -m pip install --upgrade pip
python3 -m pip install cibuildwheel==2.12.3
python3 -m pip install cibuildwheel==2.16.2
- name: Build wheels
run: |
python3 -m cibuildwheel --output-dir wheelhouse
env:
CIBW_SKIP: pp* cp27-win*
CIBW_BEFORE_BUILD: pip install numpy
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: ./wheelhouse/*.whl

build_sdist:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.10'
python-version: '3.11'
- name: Install Python dependencies
run: |
python3 -m pip install --upgrade pip setuptools wheel
python3 -m pip install numpy
- name: Build sdist
run: python setup.py sdist
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: dist/*.tar.gz

Expand All @@ -66,7 +66,7 @@ jobs:
needs: [build_wheels, build_sdist]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
Expand Down
2 changes: 1 addition & 1 deletion forestatrisk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# https://peps.python.org/pep-0008/#module-level-dunder-names
__author__ = "Ghislain Vieilledent"
__email__ = "[email protected]"
__version__ = "1.1"
__version__ = "1.1.1"

# Local imports
# Data
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def find_version():
long_description_content_type="text/x-rst",
classifiers=[
"Development Status :: 4 - Beta",
"License :: OSI Approved :: GNU General Public License v3 " "(GPLv3)",
"License :: OSI Approved :: GNU General Public License v3",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 3",
"Operating System :: OS Independent",
Expand Down

0 comments on commit c2c8b42

Please sign in to comment.