Merge pull request #50 from desihub/daily-nightlog

Transfer nightlog data with daily engineering data.
desihub · Dec 16, 2022 · 5c1c2e7 · 5c1c2e7
2 parents a258b0a + 27cc19e
commit 5c1c2e7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -17,7 +17,7 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+                python-version: ['3.8', '3.9', '3.10']
 
         steps:
             - name: Checkout code
@@ -30,7 +30,7 @@ jobs:
                 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
                 if [ -f requirements.txt ]; then python -m pip install -r requirements.txt; fi
             - name: Run the test
@@ -56,7 +56,7 @@ jobs:
                 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
                 if [ -f requirements.txt ]; then python -m pip install -r requirements.txt; fi
             - name: Run the test with coverage
@@ -86,7 +86,7 @@ jobs:
               with:
                 python-version: ${{ matrix.python-version }}
             - name: Install Python dependencies
-              run: python -m pip install --upgrade pip wheel Sphinx
+              run: python -m pip install --upgrade pip setuptools wheel Sphinx
             - name: Test the documentation
               run: sphinx-build -W --keep-going -b html doc doc/_build/html
 

diff --git a/doc/Makefile b/doc/Makefile
@@ -2,7 +2,7 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    =
+SPHINXOPTS    = -W --keep-going
 # For macports, use the second line...
 SPHINXBUILD   = sphinx-build
 # SPHINXBUILD   = sphinx-build-2.7

diff --git a/doc/changes.rst b/doc/changes.rst
@@ -6,11 +6,17 @@ Change Log
 ------------------
 
 * *Planned*: refactor package to deprecate ``setup.py``.
+* *Planned*: remove deprecated code such as ``nightlog.py``.
 
-0.8.1 (unreleased)
+0.9.0 (unreleased)
 ------------------
 
-* No changes yet.
+* Nightlog data is now included in the daily transfer, instead of a
+  separate process (PR `#50`_).
+* Add annual transfer statistics script.
+* Tweak mail handling for Tucson transfer.
+
+.. _`#50`: https://github.com/desihub/desitransfer/pull/50
 
 0.8.0 (2022-09-21)
 ------------------

diff --git a/py/desitransfer/daily.py b/py/desitransfer/daily.py
@@ -110,15 +110,21 @@ def _config():
     """Wrap configuration so that module can be imported without
     environment variables set.
     """
+    nightlog_include = resource_filename('desitransfer',
+                                         'data/desi_nightlog_transfer_kpno.txt')
     nightwatch_exclude = resource_filename('desitransfer',
                                            'data/desi_nightwatch_transfer_exclude.txt')
     engineering = os.path.realpath(os.path.join(os.environ['DESI_ROOT'],
                                                 'engineering'))
     spectro = os.path.realpath(os.path.join(os.environ['DESI_ROOT'],
                                             'spectro'))
+    survey = os.path.realpath(os.path.join(os.environ['DESI_ROOT'], 'survey'))
     return [DailyDirectory('/data/dts/exposures/lost+found',
                            os.path.join(spectro, 'staging', 'lost+found'),
                            dirlinks=True),
+            DailyDirectory('/software/www2/html/nightlogs',
+                           os.path.join(survey, 'ops', 'nightlogs'),
+                           extra=['--include-from', nightlog_include, '--exclude', '*']),
             DailyDirectory('/data/focalplane/calibration',
                            os.path.join(engineering, 'focalplane', 'calibration')),
             DailyDirectory('/data/focalplane/logs/calib_logs',

diff --git a/py/desitransfer/data/desi_nightlog_transfer_kpno.txt b/py/desitransfer/data/desi_nightlog_transfer_kpno.txt
@@ -1,3 +1,4 @@
+20??????
 *kpno*
 NightSummary????????.html
 images