diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 09a0f39..2c32f01 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -30,7 +30,7 @@ jobs: shell: bash run: | python -m pip install wheel - python -m pip install --upgrade pip conan + python -m pip install --upgrade pip "conan<2" cmake -E make_directory ${{runner.workspace}}/build - name: Configure CMake diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index f782dbb..7bf4d29 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -22,7 +22,7 @@ jobs: - name: Install build packages and pytest run: | python -m pip install --upgrade pip wheel setuptools - python -m pip install conan scikit-build pytest cython numpy + python -m pip install "conan<2" scikit-build pytest cython numpy - name: Create sdist run: python setup.py sdist @@ -58,7 +58,7 @@ jobs: - name: Setup environment run: | python -m pip install --upgrade pip wheel - python -m pip install conan pytest ducc0 + python -m pip install "conan<2" pytest ducc0 conan profile new default --detect - name: Build wheels @@ -91,14 +91,14 @@ jobs: mv source-distribution/*.tar.gz wheel-*/*.whl dist - name: Publish distribution 📦 to Test PyPI - if: ${{ github.ref != 'refs/tags/v1.5.1' }} + if: ${{ github.ref != 'refs/tags/v1.5.2' }} uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.TEST_PYPI_TOKEN }} repository_url: https://test.pypi.org/legacy/ - name: Publish distribution 📦 to PyPI - if: ${{ github.ref == 'refs/tags/v1.5.1' }} + if: ${{ github.ref == 'refs/tags/v1.5.2' }} uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.PYPI_TOKEN }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d272d7..f3b92f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12) project( Ssht - VERSION "1.5.1" + VERSION "1.5.2" DESCRIPTION "Fast and exact spin spherical harmonic transforms" HOMEPAGE_URL "http://astro-informatics.github.io/ssht/" LANGUAGES C) diff --git a/makefile b/makefile index cb3bc3c..6e59774 100644 --- a/makefile +++ b/makefile @@ -1,7 +1,7 @@ # ======== COMPILER ======== CC = gcc -OPT = -std=c99 -pedantic -Wall -O3 -fopenmp -DSSHT_VERSION=\"1.5.1\" -DSSHT_BUILD=\"`git rev-parse HEAD`\" +OPT = -std=c99 -pedantic -Wall -O3 -fopenmp -DSSHT_VERSION=\"1.5.2\" -DSSHT_BUILD=\"`git rev-parse HEAD`\" #OPT = -Wall -g -fopenmp -DSSHT_VERSION=\"1.0b1\" -DSSHT_BUILD=\"`git rev-parse HEAD`\" diff --git a/pyproject.toml b/pyproject.toml index d474434..2b5e23d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "setuptools", "wheel", "scikit-build", "cmake>=3.12", "ninja", "cython", - "oldest-supported-numpy", "conan" + "oldest-supported-numpy", "conan<2" ] [tool.isort] diff --git a/setup.cfg b/setup.cfg index 24c528d..a1b09a7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.5.1 +current_version = 1.5.2 commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(rc(?P\d+))? diff --git a/setup.py b/setup.py index 2f22a29..21a4053 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setup( name="pyssht", - version="1.5.1", + version="1.5.2", author=[ "J. D. McEwen", "C. R. G. Wallis",