Merge pull request #27 from astro-informatics/conan1

Pin build system to conan1

Author: mdavezac

.github/workflows/cmake.yml

@@ -29,7 +29,7 @@ jobs:
     - name: Create Build Environment
       run: |
           pip install --upgrade pip wheel
-          pip install conan
+          pip install "conan<2"
           cmake -E make_directory ${{runner.workspace}}/build
 
     - name: Configure CMake

.github/workflows/python.yml

@@ -9,33 +9,6 @@ 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 so3
-        run: pip install -e .[dev]
-
-      - name: run pytest
-        run: pytest tests/
-
   from-sdist:
     name: python source distribution
     runs-on: ubuntu-latest
@@ -49,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
@@ -86,7 +59,7 @@ jobs:
       - 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
@@ -119,14 +92,14 @@ jobs:
             mv source-distribution/*.tar.gz  wheel-*/*.whl dist
 
       - name: Publish distribution 📦 to Test PyPI
-        if: ${{ github.ref != 'refs/tags/v1.3.5' }}
+        if: ${{ github.ref != 'refs/tags/v1.3.6' }}
         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.3.5' }}
+        if: ${{ github.ref == 'refs/tags/v1.3.6' }}
         uses: pypa/gh-action-pypi-publish@master
         with:
           password: ${{ secrets.PYPI_TOKEN }}

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12)
 project(
   so3
-  VERSION "1.3.5"
+  VERSION "1.3.6"
   DESCRIPTION "Fast and exact Wigner transforms"
   HOMEPAGE_URL "http://astro-informatics.github.io/so3/"
   LANGUAGES C)

makefile

@@ -4,7 +4,7 @@
 CC	= gcc
 
 #OPT	= -Wall -O3 -fopenmp -DSO3_VERSION=\"0.1\" -DSO3_BUILD=\"`git rev-parse HEAD`\"
-OPT	= -Wall -g -fopenmp -DSO3_VERSION=\"1.3.5\" -DSO3_BUILD=\"`git rev-parse HEAD`\"
+OPT	= -Wall -g -fopenmp -DSO3_VERSION=\"1.3.6\" -DSO3_BUILD=\"`git rev-parse HEAD`\"
 
 
 # ======== LINKS ========

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]

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.5
+current_version = 1.3.6
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(rc(?P<rc>\d+))?

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name="so3",
-    version="1.3.5",
+    version="1.3.6",
     author="Jason McEwen",
     install_requires=["numpy", "scipy"],
     extras_require={