Skip to content

Commit

Permalink
Merge pull request #199 from desihub/package-updates
Browse files Browse the repository at this point in the history 
Package infrastructure update and other fixes
  • Loading branch information
@sbailey
sbailey authored Oct 11, 2024
2 parents 44e0708 + e81dcb3 commit dab9a68
Show file tree
Hide file tree
Showing 27 changed files with 297 additions and 184 deletions.
28 changes: 0 additions & 28 deletions .coveragerc
View file

This file was deleted.

40 changes: 20 additions & 20 deletions .github/workflows/python-package.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@ jobs:
matrix:
os: [ubuntu-latest]
python-version: ['3.9', '3.10'] #, '3.11'] possible conflicts between numpy & astropy on 3.11.
astropy-version: ['<5.1', '<5.3', '<6.0']
desiutil-version: ['3.3.1', 'main']
astropy-version: ['<6.0', '<6.1', '<7.0']
desiutil-version: ['3.4.3', 'main']

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Python dependencies
run: |
python -m pip install --upgrade pip wheel
python -m pip install --upgrade pip setuptools wheel
python -m pip install pytest jinja2
python -m pip install numpy\<1.23
python -m pip install numpy\<2.0
python -m pip install "git+https://github.com/desihub/desiutil.git@${{ matrix.desiutil-version }}#egg=desiutil"
python -m pip install "astropy${{ matrix.astropy-version }}"
- name: Run the test
Expand All @@ -52,19 +52,19 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Python dependencies
run: |
python -m pip install --upgrade pip wheel
python -m pip install --upgrade pip setuptools wheel
python -m pip install pytest pytest-cov coveralls
python -m pip install numpy\<2.0
python -m pip install -r requirements.txt
python -m pip install --upgrade numpy\<1.23
- name: Run the test with coverage
run: |
pytest --cov
Expand All @@ -86,17 +86,17 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Python dependencies
run: |
python -m pip install --upgrade pip wheel
python -m pip install Sphinx sphinx-toolbox
python -m pip install --upgrade pip setuptools wheel
python -m pip install -r doc/rtd-requirements.txt
- name: Test the documentation
env:
PYTHONPATH: ${{ github.workspace }}/py
Expand All @@ -112,15 +112,15 @@ jobs:
matrix:
os: [ubuntu-latest]
python-version: ['3.10']
desiutil-version: ['3.3.0']
desiutil-version: ['3.4.3']

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Python dependencies
Expand All @@ -144,16 +144,16 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Python dependencies
run: |
python -m pip install --upgrade pip wheel
python -m pip install --upgrade pip setuptools wheel
python -m pip install pycodestyle
- name: Test the style
# This is equivalent to an allowed falure.
Expand Down
2 changes: 0 additions & 2 deletions .readthedocs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,5 @@ sphinx:

# Optionally set the version of Python and requirements required to build your docs
python:
# version: 3
# system_packages: true
install:
- requirements: doc/rtd-requirements.txt
2 changes: 1 addition & 1 deletion LICENSE.rst
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2014-2022, DESI Collaboration <[email protected]>
Copyright (c) 2014-2024, DESI Collaboration <[email protected]>
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down
14 changes: 2 additions & 12 deletions MANIFEST.in
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,2 @@
include LICENSE.rst
include README.rst
include requirements.txt

graft bin
graft doc
graft etc

prune build
prune dist
prune htmlcov
prune doc/_build
prune .github
global-exclude .gitignore .readthedocs.yml
2 changes: 1 addition & 1 deletion doc/DESI_SPECTRO_REDUX/SPECPROD/calibnight/NIGHT/fiberflatnight-CAMERA-NIGHT.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ Required Header Keywords
TPR2TEMP [1]_ 0.0 float [deg] Telescope probe2 temperature
TPMAVERT [1]_ 4.781 float [deg] Telescope mirror averagetemperature
DOMEBLOW [1]_ 11.8 float [deg C] temperature at dome back, lower
SKYLEVEL [1]_ 8.153 float counts?] ETC sky level
SKYLEVEL [1]_ 8.153 float [counts?] ETC sky level
============= =========================================================== ======= ====================================================

Data: FITS image [float32, 2751x500]
Expand Down
2 changes: 1 addition & 1 deletion doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/cframe-CAMERA-EXPID.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ Required Header Keywords
SP3BLUT [1]_ 163.02 float [K] SP3 blue temperature
SP8NIRP [1]_ 4.831e-08 float [mb] SP8 NIR pressure
SP9BLUP [1]_ 1.208e-07 float [mb] SP9 blue pressure
SKYLEVEL [1]_ 1.133 float counts?] ETC sky level
SKYLEVEL [1]_ 1.133 float [counts?] ETC sky level
TCSKRA [1]_ 0.3 0.003 0.00003 str TCS Kalman (RA)
SP4BLUP [1]_ 6.109e-08 float [mb] SP4 blue pressure
SP2NIRT [1]_ 139.96 float [K] SP2 NIR temperature
Expand Down
2 changes: 1 addition & 1 deletion doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/fiberflat-CAMERA-EXPID.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ Header keywords are inherited from the input Frame file.
TCSPIRA [1]_ 1.0,0.0,0.0,0.0 str TCS PI settings (P, I (gain, error window, satu
TRANSPAR [1]_ None Unknown ETC/PM transparency
SEEING [1]_ None Unknown [arcsec] ETC/PM seeing
SKYLEVEL [1]_ 8.153 float counts?] ETC sky level
SKYLEVEL [1]_ 8.153 float [counts?] ETC sky level
============= ============================================================ ======= ====================================================

Data: FITS image [float32, 2881x500]
Expand Down
2 changes: 1 addition & 1 deletion ...DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/fiberflatexp-CAMERA-EXPID.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ Required Header Keywords
CALFHUM [1]_ 14.32350765258646 float dome flat humidity from flat fit
EXPTHUM [1]_ 16.63 float exposure humidity from telemetry
EPOCH [1]_ 2000.0 float Epoch of observation
SKYLEVEL [1]_ 6.268 float counts?] ETC sky level
SKYLEVEL [1]_ 6.268 float [counts?] ETC sky level
TRANSPAR [1]_ None Unknown ETC/PM transparency
SEEING [1]_ None Unknown [arcsec] ETC/PM seeing
============= ============================================================ ======= ====================================================
Expand Down
2 changes: 1 addition & 1 deletion doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/fluxcalib-CAMERA-EXPID.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ Required Header Keywords
SP3BLUP [1]_ 9.345e-08 float [mb] SP3 blue pressure
PMTRANS [1]_ 93.76 float [%] PlateMaker GFAPROC transparency
SP1REDT [1]_ 139.89 float [K] SP1 red temperature
SKYLEVEL [1]_ 0.933 float counts?] ETC sky level
SKYLEVEL [1]_ 0.933 float [counts?] ETC sky level
SP4NIRP [1]_ 6.915e-08 float [mb] SP4 NIR pressure
REQTEFF [1]_ 1000.0 float [s] Requested effective exposure time
SP7BLUT [1]_ 163.02 float [K] SP7 blue temperature
Expand Down
2 changes: 1 addition & 1 deletion doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/frame-CAMERA-EXPID.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ Required Header Keywords
SP5NIRT [1]_ 139.94 float [K] SP5 NIR temperature
TGFAPROC [1]_ 9.0024 float [s] PlateMaker GFAPROC processing time
SP7BLUP [1]_ 9.947e-08 float [mb] SP7 blue pressure
SKYLEVEL [1]_ 1.364 float counts?] ETC sky level
SKYLEVEL [1]_ 1.364 float [counts?] ETC sky level
SP0REDT [1]_ 139.96 float [K] SP0 red temperature
USEOPENL [1]_ T bool DOS Control: use open loop move
SP0BLUT [1]_ 163.02 float [K] SP0 blue temperature
Expand Down
2 changes: 1 addition & 1 deletion doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/sframe-CAMERA-EXPID.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ Required Header Keywords
SP0REDP [1]_ 4.265e-08 float [mb] SP0 red pressure
SUNRA [1]_ 45.595565 float [deg] Sun RA at start of exposure
SP5BLUP [1]_ 1.153e-07 float [mb] SP5 blue pressure
SKYLEVEL [1]_ 0.83 float counts?] ETC sky level
SKYLEVEL [1]_ 0.83 float [counts?] ETC sky level
SP2NIRT [1]_ 139.99 float [K] SP2 NIR temperature
SP6REDP [1]_ 6.491e-08 float [mb] SP6 red pressure
TCSPIRA [1]_ 1.0,0.0,0.0,0.0 str TCS PI settings (P, I (gain, error window, satu
Expand Down
2 changes: 1 addition & 1 deletion doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/sky-CAMERA-EXPID.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ Required Header Keywords
SP2BLUP [1]_ 6.432e-08 float [mb] SP2 blue pressure
SUNDEC [1]_ 6.890581 float [deg] Sun declination at start of exposure
SP1BLUP [1]_ 8.039e-08 float [mb] SP1 blue pressure
SKYLEVEL [1]_ 1.398 float counts?] ETC sky level
SKYLEVEL [1]_ 1.398 float [counts?] ETC sky level
TCSMFRA [1]_ 1 int TCS moving filter length (RA)
SP3BLUP [1]_ 8.133e-08 float [mb] SP3 blue pressure
SP5REDT [1]_ 139.99 float [K] SP5 red temperature
Expand Down
2 changes: 1 addition & 1 deletion doc/DESI_SPECTRO_REDUX/SPECPROD/preproc/NIGHT/EXPID/fibermap-EXPID.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ Required Header Keywords
SP0NIRT [1]_ 139.99 float [K] SP0 NIR temperature
VISITIDS [1]_ 91383 str List of expids for a visit (same tile)
SP7BLUT [1]_ 162.97 float [K] SP7 blue temperature
SKYLEVEL [1]_ 0.829 float counts?] ETC sky level
SKYLEVEL [1]_ 0.829 float [counts?] ETC sky level
GOALTYPE [1]_ DARK str
PMTRANS [1]_ 96.38 float [%] PlateMaker GFAPROC transparency
ROLE [1]_ GUIDERMAN str
Expand Down
2 changes: 1 addition & 1 deletion doc/DESI_SPECTRO_REDUX/SPECPROD/preproc/NIGHT/EXPID/preproc-CAMERA-EXPID.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ Required Header Keywords
SP1NIRT [1]_ 139.99 float [K] SP1 NIR temperature
USEOPENL [1]_ T bool DOS Control: use open loop move
SP4BLUT [1]_ 162.99 float [K] SP4 blue temperature
SKYLEVEL [1]_ 1.359 float counts?] ETC sky level
SKYLEVEL [1]_ 1.359 float [counts?] ETC sky level
USEGUIDR [1]_ T bool DOS Control: use guider
VISITIDS [1]_ 91269 str List of expids for a visit (same tile)
SP4BLUP [1]_ 6.4e-08 float [mb] SP4 blue pressure
Expand Down
4 changes: 3 additions & 1 deletion doc/changes.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ desidatamodel Change Log
24.10 (unreleased)
------------------

* No changes yet.
* Update package infrastructure, fix search function, add missing columns (PR `#199`_).

.. _`#199`: https://github.com/desihub/desidatamodel/pull/199

24.9 (2024-09-12)
-----------------
Expand Down
Loading

0 comments on commit dab9a68

Please sign in to comment.