Skip to content

Commit

Permalink
Merge pull request #73 from astro-informatics/conan1
Browse files Browse the repository at this point in the history
Pin build system to conan1
  • Loading branch information
mdavezac committed Mar 9, 2023
2 parents c1a8aac + 7b67ef8 commit c83fb2a
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
@@ -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`\"


Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.5.1
current_version = 1.5.2
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(rc(?P<rc>\d+))?
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

setup(
name="pyssht",
version="1.5.1",
version="1.5.2",
author=[
"J. D. McEwen",
"C. R. G. Wallis",
Expand Down

0 comments on commit c83fb2a

Please sign in to comment.