Skip to content

Commit

Permalink
test against more versions of python; prepare for PyPI
Browse files Browse the repository at this point in the history
  • Loading branch information
moustakas committed Dec 10, 2024
1 parent 3037042 commit ade4224
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
python-version: ['3.10', '3.11']
python-version: ['3.10', '3.11', '3.12', '3.13']
env:
DESIUTIL_VERSION: 3.4.3

Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
python-version: ['3.10', '3.11']
python-version: ['3.10', '3.11', '3.12', '3.13']
env:
DESIUTIL_VERSION: 3.4.3

Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
python-version: ['3.11']
python-version: ['3.13']

steps:
- name: Checkout code
Expand All @@ -103,7 +103,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
python-version: ['3.11']
python-version: ['3.13']

steps:
- name: Checkout code
Expand Down
6 changes: 6 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ RUN for x in \
&& rm -Rf /root/.cache/pip \
&& echo 1

RUN python -m pip install --index-url https://software.repos.intel.com/python/pypi \
--extra-index-url https://pypi.org/simple mkl_fft

ENV DESIUTIL_VERSION 3.4.3
ENV DESIMODEL_VERSION 0.19.2
ENV DESITARGET_VERSION 2.8.0
Expand All @@ -87,6 +90,9 @@ ENV PATH /src/fastspecfit/bin:/opt/conda/bin:/usr/local/bin:/usr/sbin:/usr/bin:/
RUN mkdir /homedir && chmod 777 /homedir
ENV HOME /homedir

ENV NUMBA_CACHE_DIR=/homedir/numba_cache
RUN chmod 777 /homedir/numba_cache

# set prompt and default shell
SHELL ["/bin/bash", "-c"]
ENTRYPOINT ["/bin/bash", "-c"]
Expand Down
10 changes: 3 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,16 @@ classifiers = [
"Topic :: System :: Software Distribution",
]
dependencies = [
"numpy<2.0",
"astropy>=5.0",
"numpy",
"astropy",
"scipy",
"healpy",
"numba",
"seaborn",
"matplotlib",
"fitsio",
"speclite>=0.20",
"desimodel @ git+https://github.com/desihub/[email protected]",
"desitarget @ git+https://github.com/desihub/[email protected]",
"desispec @ git+https://github.com/desihub/[email protected]"
"speclite",
]
requires-python = ">=3.9"

[project.optional-dependencies]
test = [
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
numpy<2.0
astropy>=5.0
numpy
astropy
scipy
healpy
numba
seaborn
matplotlib
fitsio
speclite>=0.20
speclite
git+https://github.com/desihub/[email protected]
git+https://github.com/desihub/[email protected]
git+https://github.com/desihub/[email protected]

0 comments on commit ade4224

Please sign in to comment.