diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml index 288a0a1..67c2e4d 100644 --- a/.github/workflows/github-pages.yml +++ b/.github/workflows/github-pages.yml @@ -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 @@ -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 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 62a9e04..ad8d0d2 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -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/action@v3.0.0 \ No newline at end of file + python-version: "3.11" + - uses: pre-commit/action@v3.0.0 diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index ea15e46..6ad882f 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -5,7 +5,7 @@ name: PyPkg on: push: - branches: [ master, dev ] + branches: [master, dev] pull_request: branches: - master @@ -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 diff --git a/.github/workflows/wheel-pypi.yml b/.github/workflows/wheel-pypi.yml index 6957f61..258e1f2 100644 --- a/.github/workflows/wheel-pypi.yml +++ b/.github/workflows/wheel-pypi.yml @@ -21,22 +21,22 @@ 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 @@ -44,18 +44,18 @@ jobs: 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 @@ -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 diff --git a/.github/workflows/wheel-testpypi.yml b/.github/workflows/wheel-testpypi.yml index 08b274d..1985aa5 100644 --- a/.github/workflows/wheel-testpypi.yml +++ b/.github/workflows/wheel-testpypi.yml @@ -18,22 +18,22 @@ 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 @@ -41,18 +41,18 @@ jobs: 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 @@ -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 diff --git a/forestatrisk/__init__.py b/forestatrisk/__init__.py index 9a0d23b..a9bc386 100644 --- a/forestatrisk/__init__.py +++ b/forestatrisk/__init__.py @@ -19,7 +19,7 @@ # https://peps.python.org/pep-0008/#module-level-dunder-names __author__ = "Ghislain Vieilledent" __email__ = "ghislain.vieilledent@cirad.fr" -__version__ = "1.1" +__version__ = "1.1.1" # Local imports # Data diff --git a/setup.py b/setup.py index 6c0962b..c55f378 100644 --- a/setup.py +++ b/setup.py @@ -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",