Bump to v2.2.5 and pin conan to v1

Closes #47

Author: mdavezac

.github/workflows/cmake.yml

@@ -18,16 +18,16 @@ jobs:
         python-version: [3.8]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Create Build Environment
       run: |
-        pip install --upgrade pip wheel conan
+        pip install --upgrade pip wheel "conan<2"
         cmake -E make_directory ${{runner.workspace}}/build
 
     - name: Configure CMake

.github/workflows/python.yml

@@ -9,47 +9,20 @@ name: Python Build
   pull_request:
 
 jobs:
-  development-mode:
-    name: pip development mode on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest]
-        python-version: [3.8]
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install build packages and pytest
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install scikit-build
-
-      - name: Install python s2let
-        run: pip install -e .[dev]
-
-      - name: run pytest
-        run: pytest src/test/python/
-
   from-sdist:
     name: python source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: 3.8
 
       - 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
@@ -60,7 +33,7 @@ jobs:
       - name: run pytest
         run: pytest src/test/python/
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: ${{ startsWith(github.ref, 'refs/tags') }}
         with:
           path: ./dist/*.tar.gz
@@ -76,17 +49,17 @@ jobs:
         python-version: [3.8]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         name: Install Python
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup environment
         run: |
           python -m pip install --upgrade pip wheel
-          python -m pip install conan pytest
+          python -m pip install "conan<2" pytest
           conan profile new default --detect
 
       - name: Build wheels
@@ -98,7 +71,7 @@ jobs:
       - name: run pytests
         run: pytest src/test/python/
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: ${{ startsWith(github.ref, 'refs/tags') }}
         with:
           path: ./dist/*.whl
@@ -111,22 +84,22 @@ jobs:
     needs: [build_wheels, from-sdist]
     steps:
       - name: Download wheels and sdist
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
 
       - name: Move wheels and source distribution to dist/
         run: |
             mkdir -p dist
             mv source-distribution/*.tar.gz  wheel-*/*.whl dist
 
       - name: Publish distribution 📦 to Test PyPI
-        if: ${{ github.ref != 'refs/tags/v2.2.4' }}
+        if: ${{ github.ref != 'refs/tags/v2.2.5' }}
         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/v2.2.4' }}
+        if: ${{ github.ref == 'refs/tags/v2.2.5' }}
         uses: pypa/gh-action-pypi-publish@master
         with:
           password: ${{ secrets.PYPI_TOKEN }}

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12...4.0)
 
 project(
   s2let
-  VERSION "2.2.4"
+  VERSION "2.2.5"
   DESCRIPTION "Fast wavelets on the sphere"
   HOMEPAGE_URL "http://astro-informatics.github.io/s2let/"
   LANGUAGES C)

makefile

@@ -27,7 +27,7 @@ UNAME 	:= $(shell uname)
 
 # Compilers and options for C
 CC	= gcc
-OPT	= -Wall -g -fPIC -fopenmp -DS2LET_VERSION=\"2.2.4\" -DS2LET_BUILD=\"`git rev-parse HEAD`\"
+OPT	= -Wall -g -fPIC -fopenmp -DS2LET_VERSION=\"2.2.5\" -DS2LET_BUILD=\"`git rev-parse HEAD`\"
 
 # Compilers and options for Fortran
 FCC	= gfortran

pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = [
     "setuptools", "wheel", "scikit-build", "cmake>=3.12", "ninja", "cython",
-    "oldest-supported-numpy", "conan"
+    "numpy", "conan<2"
 ]
 [tool.black]
 line-length = 88

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.4
+current_version = 2.2.5
 commit = False
 tag = False
 

setup.py

@@ -20,7 +20,7 @@
 
 setup(
     name="pys2let",
-    version="2.2.4",
+    version="2.2.5",
     author=["Boris Leistedt", "Martin Büttner", "Jennifer Chan", "Jason McEwen"],
     install_requires=["numpy"],
     extras_require={

src/doxygen.config

@@ -31,7 +31,7 @@ PROJECT_NAME           = S2LET
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.2.4
+PROJECT_NUMBER         = 2.2.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # for a project that appears at the top of each page and should give viewer 

src/main/pys2let/pys2let.pyx

@@ -317,8 +317,8 @@ def analysis_axisym_wav_mw(
 	parameters.J_min = J_min
 	J = s2let_j_max(&parameters)
 
-	f_wav = np.zeros(mw_size(L) * (J - J_min + 1), dtype=np.complex)
-	f_scal = np.zeros(mw_size(L), dtype=np.complex)
+	f_wav = np.zeros(mw_size(L) * (J - J_min + 1), dtype=complex)
+	f_scal = np.zeros(mw_size(L), dtype=complex)
 
 	s2let_transform_axisym_wav_analysis_mw(
 		<double complex*> np.PyArray_DATA(f_wav),
@@ -341,7 +341,7 @@ def analysis_adjoint_axisym_wav_mw(
 	parameters.J_min = J_min
 	J = s2let_j_max(&parameters)
 
-	f = np.zeros([L * (2 * L - 1),], dtype=np.complex)
+	f = np.zeros([L * (2 * L - 1),], dtype=complex)
 	s2let_transform_axisym_wav_analysis_adjoint_mw(
 		<double complex*> np.PyArray_DATA(f),
 		<double complex*> np.PyArray_DATA(f_wav),
@@ -405,7 +405,7 @@ def synthesis_axisym_wav_mw(
 	parameters.J_min = J_min
 	J = s2let_j_max(&parameters)
 
-	f = np.zeros(mw_size(L), dtype=np.complex)
+	f = np.zeros(mw_size(L), dtype=complex)
 	s2let_transform_axisym_wav_synthesis_mw(
 		<double complex*> np.PyArray_DATA(f),
 		<double complex*> np.PyArray_DATA(f_wav),
@@ -426,8 +426,8 @@ def synthesis_adjoint_axisym_wav_mw(
 	parameters.J_min = J_min
 	J = s2let_j_max(&parameters)
 
-	f_scal = np.zeros([L * (2 * L - 1),], dtype=np.complex)
-	f_wav = np.zeros([L * (2 * L - 1) * (J - J_min + 1)], dtype=np.complex)
+	f_scal = np.zeros([L * (2 * L - 1),], dtype=complex)
+	f_wav = np.zeros([L * (2 * L - 1) * (J - J_min + 1)], dtype=complex)
 	s2let_transform_axisym_wav_synthesis_adjoint_mw(
 		<double complex*> np.PyArray_DATA(f_wav),
 		<double complex*> np.PyArray_DATA(f_scal),