Skip to content

Commit

Permalink
Merge branch 'master' into fast_desihealpix
Browse files Browse the repository at this point in the history
  • Loading branch information
Waelthus committed Sep 17, 2024
2 parents afcacd4 + 7b6cac9 commit 6ca719e
Show file tree
Hide file tree
Showing 9 changed files with 548 additions and 197 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 9.1.1
current_version = 9.3.1
commit = True

[bumpversion:file:py/picca/_version.py]
8 changes: 4 additions & 4 deletions .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Pylint

on:
on:
push:
paths-ignore:
- '**/*.md'
pull_request:
pull_request:
paths-ignore:
- '**/*.md'
merge_group:
Expand All @@ -16,10 +16,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3.12
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.12
- name: Install dependencies
run: |
sudo apt-get -y install libbz2-dev
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/python_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11", "3.12"]
# env:
# OMP_NUM_THREADS: 1
# MKL_NUM_THREADS: 1
Expand All @@ -40,12 +40,6 @@ jobs:
python -m pip install --upgrade pip
pip install wheel pytest pytest-cov coveralls
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
# TODO: the section below can be removed if the compile step is fixed otherwise
- name: Reinstall fitsio to ensure the numpy version during compilation matches the one at runtime
run: |
pip uninstall fitsio -y
pip cache purge
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Install picca
run: pip install -e .
- name: Test with pytest
Expand All @@ -63,15 +57,15 @@ jobs:
# the following bit will save results tests as an artifact if [ci save] has been in the commit msg
- name: Archive test results
if: ${{ failure() }}
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: test-results_v${{ matrix.python-version }}
path: /tmp/last_run_picca_test


- name: Archive test results delta_extraction
if: ${{ failure() }}
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: test-results-de_v${{ matrix.python-version }}
path: /home/runner/work/picca/picca/py/picca/tests/delta_extraction/results
Expand Down
2 changes: 1 addition & 1 deletion py/picca/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '9.1.1'
__version__ = '9.3.1'
Loading

0 comments on commit 6ca719e

Please sign in to comment.