Skip to content

Commit dab9a68

Browse files
sbaileysbailey
authored
Merge pull request #199 from desihub/package-updates
Package infrastructure update and other fixes
2 parents 44e0708 + e81dcb3 commit dab9a68

27 files changed

+297
-184
lines changed

‎.coveragerc

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎.github/workflows/python-package.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ jobs:
1818
matrix:
1919
os: [ubuntu-latest]
2020
python-version: ['3.9', '3.10'] #, '3.11'] possible conflicts between numpy & astropy on 3.11.
21-
astropy-version: ['<5.1', '<5.3', '<6.0']
22-
desiutil-version: ['3.3.1', 'main']
21+
astropy-version: ['<6.0', '<6.1', '<7.0']
22+
desiutil-version: ['3.4.3', 'main']
2323

2424
steps:
2525
- name: Checkout code
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727
with:
2828
fetch-depth: 0
2929
- name: Set up Python ${{ matrix.python-version }}
30-
uses: actions/setup-python@v4
30+
uses: actions/setup-python@v5
3131
with:
3232
python-version: ${{ matrix.python-version }}
3333
- name: Install Python dependencies
3434
run: |
35-
python -m pip install --upgrade pip wheel
35+
python -m pip install --upgrade pip setuptools wheel
3636
python -m pip install pytest jinja2
37-
python -m pip install numpy\<1.23
37+
python -m pip install numpy\<2.0
3838
python -m pip install "git+https://github.com/desihub/desiutil.git@${{ matrix.desiutil-version }}#egg=desiutil"
3939
python -m pip install "astropy${{ matrix.astropy-version }}"
4040
- name: Run the test
@@ -52,19 +52,19 @@ jobs:
5252

5353
steps:
5454
- name: Checkout code
55-
uses: actions/checkout@v3
55+
uses: actions/checkout@v4
5656
with:
5757
fetch-depth: 0
5858
- name: Set up Python ${{ matrix.python-version }}
59-
uses: actions/setup-python@v4
59+
uses: actions/setup-python@v5
6060
with:
6161
python-version: ${{ matrix.python-version }}
6262
- name: Install Python dependencies
6363
run: |
64-
python -m pip install --upgrade pip wheel
64+
python -m pip install --upgrade pip setuptools wheel
6565
python -m pip install pytest pytest-cov coveralls
66+
python -m pip install numpy\<2.0
6667
python -m pip install -r requirements.txt
67-
python -m pip install --upgrade numpy\<1.23
6868
- name: Run the test with coverage
6969
run: |
7070
pytest --cov
@@ -86,17 +86,17 @@ jobs:
8686

8787
steps:
8888
- name: Checkout code
89-
uses: actions/checkout@v3
89+
uses: actions/checkout@v4
9090
with:
9191
fetch-depth: 0
9292
- name: Set up Python ${{ matrix.python-version }}
93-
uses: actions/setup-python@v4
93+
uses: actions/setup-python@v5
9494
with:
9595
python-version: ${{ matrix.python-version }}
9696
- name: Install Python dependencies
9797
run: |
98-
python -m pip install --upgrade pip wheel
99-
python -m pip install Sphinx sphinx-toolbox
98+
python -m pip install --upgrade pip setuptools wheel
99+
python -m pip install -r doc/rtd-requirements.txt
100100
- name: Test the documentation
101101
env:
102102
PYTHONPATH: ${{ github.workspace }}/py
@@ -112,15 +112,15 @@ jobs:
112112
matrix:
113113
os: [ubuntu-latest]
114114
python-version: ['3.10']
115-
desiutil-version: ['3.3.0']
115+
desiutil-version: ['3.4.3']
116116

117117
steps:
118118
- name: Checkout code
119-
uses: actions/checkout@v3
119+
uses: actions/checkout@v4
120120
with:
121121
fetch-depth: 0
122122
- name: Set up Python ${{ matrix.python-version }}
123-
uses: actions/setup-python@v4
123+
uses: actions/setup-python@v5
124124
with:
125125
python-version: ${{ matrix.python-version }}
126126
- name: Install Python dependencies
@@ -144,16 +144,16 @@ jobs:
144144

145145
steps:
146146
- name: Checkout code
147-
uses: actions/checkout@v3
147+
uses: actions/checkout@v4
148148
with:
149149
fetch-depth: 0
150150
- name: Set up Python ${{ matrix.python-version }}
151-
uses: actions/setup-python@v4
151+
uses: actions/setup-python@v5
152152
with:
153153
python-version: ${{ matrix.python-version }}
154154
- name: Install Python dependencies
155155
run: |
156-
python -m pip install --upgrade pip wheel
156+
python -m pip install --upgrade pip setuptools wheel
157157
python -m pip install pycodestyle
158158
- name: Test the style
159159
# This is equivalent to an allowed falure.

‎.readthedocs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,5 @@ sphinx:
2222

2323
# Optionally set the version of Python and requirements required to build your docs
2424
python:
25-
# version: 3
26-
# system_packages: true
2725
install:
2826
- requirements: doc/rtd-requirements.txt

‎LICENSE.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014-2022, DESI Collaboration <[email protected]>
1+
Copyright (c) 2014-2024, DESI Collaboration <[email protected]>
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,

‎MANIFEST.in

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,2 @@
1-
include LICENSE.rst
2-
include README.rst
3-
include requirements.txt
4-
5-
graft bin
6-
graft doc
7-
graft etc
8-
9-
prune build
10-
prune dist
11-
prune htmlcov
12-
prune doc/_build
1+
prune .github
2+
global-exclude .gitignore .readthedocs.yml

‎doc/DESI_SPECTRO_REDUX/SPECPROD/calibnight/NIGHT/fiberflatnight-CAMERA-NIGHT.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ Required Header Keywords
434434
TPR2TEMP [1]_ 0.0 float [deg] Telescope probe2 temperature
435435
TPMAVERT [1]_ 4.781 float [deg] Telescope mirror averagetemperature
436436
DOMEBLOW [1]_ 11.8 float [deg C] temperature at dome back, lower
437-
SKYLEVEL [1]_ 8.153 float counts?] ETC sky level
437+
SKYLEVEL [1]_ 8.153 float [counts?] ETC sky level
438438
============= =========================================================== ======= ====================================================
439439

440440
Data: FITS image [float32, 2751x500]

‎doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/cframe-CAMERA-EXPID.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ Required Header Keywords
510510
SP3BLUT [1]_ 163.02 float [K] SP3 blue temperature
511511
SP8NIRP [1]_ 4.831e-08 float [mb] SP8 NIR pressure
512512
SP9BLUP [1]_ 1.208e-07 float [mb] SP9 blue pressure
513-
SKYLEVEL [1]_ 1.133 float counts?] ETC sky level
513+
SKYLEVEL [1]_ 1.133 float [counts?] ETC sky level
514514
TCSKRA [1]_ 0.3 0.003 0.00003 str TCS Kalman (RA)
515515
SP4BLUP [1]_ 6.109e-08 float [mb] SP4 blue pressure
516516
SP2NIRT [1]_ 139.96 float [K] SP2 NIR temperature

‎doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/fiberflat-CAMERA-EXPID.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ Header keywords are inherited from the input Frame file.
435435
TCSPIRA [1]_ 1.0,0.0,0.0,0.0 str TCS PI settings (P, I (gain, error window, satu
436436
TRANSPAR [1]_ None Unknown ETC/PM transparency
437437
SEEING [1]_ None Unknown [arcsec] ETC/PM seeing
438-
SKYLEVEL [1]_ 8.153 float counts?] ETC sky level
438+
SKYLEVEL [1]_ 8.153 float [counts?] ETC sky level
439439
============= ============================================================ ======= ====================================================
440440

441441
Data: FITS image [float32, 2881x500]

‎doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/fiberflatexp-CAMERA-EXPID.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ Required Header Keywords
434434
CALFHUM [1]_ 14.32350765258646 float dome flat humidity from flat fit
435435
EXPTHUM [1]_ 16.63 float exposure humidity from telemetry
436436
EPOCH [1]_ 2000.0 float Epoch of observation
437-
SKYLEVEL [1]_ 6.268 float counts?] ETC sky level
437+
SKYLEVEL [1]_ 6.268 float [counts?] ETC sky level
438438
TRANSPAR [1]_ None Unknown ETC/PM transparency
439439
SEEING [1]_ None Unknown [arcsec] ETC/PM seeing
440440
============= ============================================================ ======= ====================================================

‎doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/fluxcalib-CAMERA-EXPID.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ Required Header Keywords
559559
SP3BLUP [1]_ 9.345e-08 float [mb] SP3 blue pressure
560560
PMTRANS [1]_ 93.76 float [%] PlateMaker GFAPROC transparency
561561
SP1REDT [1]_ 139.89 float [K] SP1 red temperature
562-
SKYLEVEL [1]_ 0.933 float counts?] ETC sky level
562+
SKYLEVEL [1]_ 0.933 float [counts?] ETC sky level
563563
SP4NIRP [1]_ 6.915e-08 float [mb] SP4 NIR pressure
564564
REQTEFF [1]_ 1000.0 float [s] Requested effective exposure time
565565
SP7BLUT [1]_ 163.02 float [K] SP7 blue temperature

‎doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/frame-CAMERA-EXPID.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ Required Header Keywords
454454
SP5NIRT [1]_ 139.94 float [K] SP5 NIR temperature
455455
TGFAPROC [1]_ 9.0024 float [s] PlateMaker GFAPROC processing time
456456
SP7BLUP [1]_ 9.947e-08 float [mb] SP7 blue pressure
457-
SKYLEVEL [1]_ 1.364 float counts?] ETC sky level
457+
SKYLEVEL [1]_ 1.364 float [counts?] ETC sky level
458458
SP0REDT [1]_ 139.96 float [K] SP0 red temperature
459459
USEOPENL [1]_ T bool DOS Control: use open loop move
460460
SP0BLUT [1]_ 163.02 float [K] SP0 blue temperature

‎doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/sframe-CAMERA-EXPID.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ Required Header Keywords
554554
SP0REDP [1]_ 4.265e-08 float [mb] SP0 red pressure
555555
SUNRA [1]_ 45.595565 float [deg] Sun RA at start of exposure
556556
SP5BLUP [1]_ 1.153e-07 float [mb] SP5 blue pressure
557-
SKYLEVEL [1]_ 0.83 float counts?] ETC sky level
557+
SKYLEVEL [1]_ 0.83 float [counts?] ETC sky level
558558
SP2NIRT [1]_ 139.99 float [K] SP2 NIR temperature
559559
SP6REDP [1]_ 6.491e-08 float [mb] SP6 red pressure
560560
TCSPIRA [1]_ 1.0,0.0,0.0,0.0 str TCS PI settings (P, I (gain, error window, satu

‎doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/sky-CAMERA-EXPID.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ Required Header Keywords
559559
SP2BLUP [1]_ 6.432e-08 float [mb] SP2 blue pressure
560560
SUNDEC [1]_ 6.890581 float [deg] Sun declination at start of exposure
561561
SP1BLUP [1]_ 8.039e-08 float [mb] SP1 blue pressure
562-
SKYLEVEL [1]_ 1.398 float counts?] ETC sky level
562+
SKYLEVEL [1]_ 1.398 float [counts?] ETC sky level
563563
TCSMFRA [1]_ 1 int TCS moving filter length (RA)
564564
SP3BLUP [1]_ 8.133e-08 float [mb] SP3 blue pressure
565565
SP5REDT [1]_ 139.99 float [K] SP5 red temperature

‎doc/DESI_SPECTRO_REDUX/SPECPROD/preproc/NIGHT/EXPID/fibermap-EXPID.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ Required Header Keywords
492492
SP0NIRT [1]_ 139.99 float [K] SP0 NIR temperature
493493
VISITIDS [1]_ 91383 str List of expids for a visit (same tile)
494494
SP7BLUT [1]_ 162.97 float [K] SP7 blue temperature
495-
SKYLEVEL [1]_ 0.829 float counts?] ETC sky level
495+
SKYLEVEL [1]_ 0.829 float [counts?] ETC sky level
496496
GOALTYPE [1]_ DARK str
497497
PMTRANS [1]_ 96.38 float [%] PlateMaker GFAPROC transparency
498498
ROLE [1]_ GUIDERMAN str

‎doc/DESI_SPECTRO_REDUX/SPECPROD/preproc/NIGHT/EXPID/preproc-CAMERA-EXPID.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ Required Header Keywords
519519
SP1NIRT [1]_ 139.99 float [K] SP1 NIR temperature
520520
USEOPENL [1]_ T bool DOS Control: use open loop move
521521
SP4BLUT [1]_ 162.99 float [K] SP4 blue temperature
522-
SKYLEVEL [1]_ 1.359 float counts?] ETC sky level
522+
SKYLEVEL [1]_ 1.359 float [counts?] ETC sky level
523523
USEGUIDR [1]_ T bool DOS Control: use guider
524524
VISITIDS [1]_ 91269 str List of expids for a visit (same tile)
525525
SP4BLUP [1]_ 6.4e-08 float [mb] SP4 blue pressure

‎doc/changes.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ desidatamodel Change Log
55
24.10 (unreleased)
66
------------------
77

8-
* No changes yet.
8+
* Update package infrastructure, fix search function, add missing columns (PR `#199`_).
9+
10+
.. _`#199`: https://github.com/desihub/desidatamodel/pull/199
911

1012
24.9 (2024-09-12)
1113
-----------------

0 commit comments

Comments
 (0)