Skip to content

Commit

Permalink
Merge pull request #549 from PyFstat/python-3.12
Browse files Browse the repository at this point in the history
Python 3.12
  • Loading branch information
dbkeitel authored Jun 28, 2024
2 parents b26ec4b + 3d2ccf2 commit bcc06f1
Show file tree
Hide file tree
Showing 12 changed files with 1,090 additions and 458 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check_notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']
steps:
- uses: actions/checkout@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -40,7 +40,7 @@ jobs:
python setup.py sdist bdist_wheel
check-wheel-contents dist/*.whl
- name: upload artifacts
if: matrix.python-version == 3.8 # only upload from one version (oldest, for max compatibility)
if: matrix.python-version == 3.9 # only upload from one version (oldest, for max compatibility)
uses: actions/upload-artifact@v3
with:
name: python-package-distributions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_lalsuite_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Latest development versions can
or [from a local git clone](#install-pyfstat-from-source-zenodo-or-git-clone).

If you don't have a matching `python` installation
(currently `3.8` to `3.11`)
(currently `3.9` to `3.12`)
on your system,
then `Docker` or `conda` are the easiest paths.

Expand Down Expand Up @@ -172,7 +172,7 @@ For a general introduction to installing modules, see
[here](https://docs.python.org/3/installing/index.html).

NOTE: currently we have pinned to
`numpy<1.24.0` (due to an incompatibility with ptemcee).
`numpy<2.0` (same as LALSuite).

NOTE: We require a recent LALSuite (>=7.13) / lalpulsar (>=6.0).
If you need to work with older versions,
Expand Down Expand Up @@ -248,7 +248,7 @@ Here's what you need to know:

This sets up everything for automated code quality tests (see below)
to be checked for you at every commit.
* The github automated tests currently run on `python` [3.8,3.9,3.10,3.11]
* The github automated tests currently run on `python` [3.9,3.10,3.11,3.12]
and new PRs need to pass all these.
* You can also run the full test suite locally via `pytest tests/`,
or run individual tests as explained
Expand Down
4 changes: 2 additions & 2 deletions etc/pyfstat-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ dependencies:
- dill
- lalpulsar >=6.0
- matplotlib-base >=3.3
- numpy <1.24.0
- numpy <2.0
- pathos
- pip
- ptemcee
- python >=3.8,<3.12
- python >=3.9,<3.12
- python-lal >=7.1.5
- python-lalpulsar >=6.0
- scipy
Expand Down
2 changes: 1 addition & 1 deletion etc/pyfstat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ name: pyfstat
channels:
- conda-forge
dependencies:
- python >=3.8,<3.12
- python >=3.9,<3.12
- pyfstat
3 changes: 3 additions & 0 deletions pyfstat/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"Proceeding without default logging."
)

from . import _version
from .core import (
BaseSearchClass,
ComputeFstat,
Expand Down Expand Up @@ -52,3 +53,5 @@
)
from .snr import DetectorStates, SignalToNoiseRatio
from .tcw_fstat_map_funcs import pyTransientFstatMap

__version__ = _version.get_versions()["version"]
Loading

0 comments on commit bcc06f1

Please sign in to comment.