Packaging updates

.github/workflows/wfssrv-tests.yml

@@ -10,12 +10,11 @@ jobs:
 
   matrix_tests:
     runs-on: ${{ matrix.os }}
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-ver: [7, 8]
-        tox-env: [cov, astropylts, astropydev, numpydev]
+        python-ver: [13]
+        tox-env: [cov, astropydev, numpydev]
     steps:
     - uses: actions/checkout@v1
     - name: Set up python 3.${{ matrix.python-ver }} with tox environment ${{ matrix.tox-env }} on ${{ matrix.os }}
@@ -39,13 +38,12 @@ jobs:
 
   doc_test:
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python to build docs with sphinx
       uses: actions/setup-python@v1
       with:
-        python-version: 3.8
+        python-version: 3.13
     - name: Install base dependencies
       run: |
         python -m pip install --upgrade pip
@@ -57,13 +55,12 @@ jobs:
 
   codestyle:
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
     - uses: actions/checkout@v1
     - name: Python codestyle check
       uses: actions/setup-python@v1
       with:
-        python-version: 3.8
+        python-version: 3.13
     - name: Install base dependencies
       run: |
         python -m pip install --upgrade pip

Dockerfile

@@ -1,13 +1,16 @@
-FROM mmtobservatory/mmtwfs:latest
+FROM python:3.13
 
-MAINTAINER T. E. Pickering "te.pickering@gmail.com"
+LABEL maintainer="te.pickering@gmail.com"
 
 COPY . .
 
-RUN python -m pip install --upgrade pip
-RUN python -m pip install git+https://github.com/MMTObservatory/camsrv.git#egg=camsrv
-RUN python -m pip install git+https://github.com/MMTObservatory/cwfs.git#egg=cwfs
-RUN python -m pip install -e .[all]
+RUN apt-get update
+RUN apt-get install -y git
+
+RUN python -m pip install --upgrade pip setuptools setuptools_scm
+RUN python -m pip install git+https://github.com/MMTObservatory/camsrv#egg=camsrv
+RUN python -m pip install git+https://github.com/MMTObservatory/mmtwfs#egg=mmtwfs
+RUN python -m pip install .
 
 EXPOSE 8080
 

README.md

@@ -3,6 +3,4 @@ MMT Wavefront Sensor Analysis Interface
 
 ![Python Tests](https://github.com/MMTObservatory/WFSsrv/workflows/Python%20Tests/badge.svg)
 
-![Publish to Docker](https://github.com/MMTObservatory/WFSsrv/workflows/Publish%20to%20Docker/badge.svg)
-
 [![codecov](https://codecov.io/gh/MMTObservatory/WFSsrv/branch/master/graph/badge.svg)](https://codecov.io/gh/MMTObservatory/WFSsrv)

docs/conf.py

@@ -36,13 +36,6 @@
     print('ERROR: the documentation requires the sphinx-astropy package to be installed')
     sys.exit(1)
 
-# Get configuration information from setup.cfg
-from configparser import ConfigParser
-conf = ConfigParser()
-
-conf.read([os.path.join(os.path.dirname(__file__), '..', 'setup.cfg')])
-setup_cfg = dict(conf.items('metadata'))
-
 # -- General configuration ----------------------------------------------------
 
 # By default, highlight as Python 3.
@@ -67,17 +60,17 @@
 # -- Project information ------------------------------------------------------
 
 # This does not *have* to match the package name, but typically does
-project = setup_cfg['name']
-author = setup_cfg['author']
+project = "wfssrv"
+author = "T. E. Pickering"
 copyright = '{0}, {1}'.format(
-    datetime.datetime.now().year, setup_cfg['author'])
+    datetime.datetime.now().year, "T. E. Pickering")
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 
-import_module(setup_cfg['name'])
-package = sys.modules[setup_cfg['name']]
+import_module("wfssrv")
+package = sys.modules["wfssrv"]
 
 # The short X.Y version.
 version = package.__version__.split('-', 1)[0]
@@ -106,7 +99,7 @@
 
 
 html_theme_options = {
-    'logotext1': 'mmtwfs',  # white,  semi-bold
+    'logotext1': 'wfssrv',  # white,  semi-bold
     'logotext2': '',  # orange, light
     'logotext3': ':docs'   # white,  light
     }
@@ -151,21 +144,8 @@
 man_pages = [('index', project.lower(), project + u' Documentation',
               [author], 1)]
 
-
-# -- Options for the edit_on_github extension ---------------------------------
-
-if setup_cfg.get('edit_on_github').lower() == 'true':
-
-    extensions += ['sphinx_astropy.ext.edit_on_github']
-
-    edit_on_github_project = setup_cfg['github_project']
-    edit_on_github_branch = "master"
-
-    edit_on_github_source_root = ""
-    edit_on_github_doc_root = "docs"
-
 # -- Resolving issue number to links in changelog -----------------------------
-github_issues_url = 'https://github.com/{0}/issues/'.format(setup_cfg['github_project'])
+github_issues_url = 'https://github.com/{0}/issues/'.format("wfssrv")
 
 # -- Turn on nitpicky mode for sphinx (to warn about references not found) ----
 #

pyproject.toml

@@ -1,7 +1,111 @@
-[build-system]
+[project]
+name = "wfssrv"
+dynamic = ["version"]
+authors = [
+    { name = "T. E. Pickering", email = "te.pickering@gmail.com"}
+]
+license = {file = "licenses/LICENSE.rst"}
+readme = "README.rst"
+description = "MMTO Wavefront Sensor Analysis Server"
+requires-python = ">=3.12"
+dependencies = [
+    "tornado",
+    "redis",
+    "matplotlib",
+    "camsrv@git+https://github.com/MMTObservatory/camsrv",
+    "mmtwfs@git+https://github.com/MMTObservatory/mmtwfs",
+]
+
+[project.optional-dependencies]
+test = [
+    "tox",
+    "coverage",
+    "pytest-astropy",
+    "black",
+    "flake8",
+    "codecov",
+]
+docs = [
+    "sphinx-astropy",
+]
+
+[project.scripts]
+"wfs_header.py" = "wfssrv.scripts.wfs_header:main"
+wfssrv = "wfssrv.wfssrv:main"
+
+[project.urls]
+Repository = "https://github.com/mmtobservatory/wfssrv.git"
+Documentation = "https://wfssrv.readthedocs.io/"
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.package-data]
+"wfssrv.templates" = ["**"]
+"wfssrv.static" = ["**"]
+
+[tool.setuptools.packages]
+find = {}
 
-requires = ["setuptools",
-            "setuptools_scm",
-            "wheel"]
+[tool.setuptools_scm]
+version_file = "wfssrv/version.py"
+
+[build-system]
+requires = [
+    "setuptools",
+    "setuptools_scm",
+]
 
 build-backend = 'setuptools.build_meta'
+
+[tool.pytest.ini_options]
+minversion = 7.0
+testpaths = [
+    "wfssrv/tests",
+]
+astropy_header = true
+doctest_plus = "enabled"
+text_file_format = "rst"
+addopts = [
+    "--color=yes",
+    "--doctest-rst",
+]
+xfail_strict = true
+filterwarnings = [
+    "error",
+    "ignore:numpy\\.ufunc size changed:RuntimeWarning",
+    "ignore:numpy\\.ndarray size changed:RuntimeWarning",
+    # weird no event loop deprecation warning
+    "ignore:.*There is no current event loop:DeprecationWarning",
+]
+
+[tool.coverage]
+
+    [tool.coverage.run]
+        omit = [
+            "wfssrv/_astropy_init*",
+            "wfssrv/conftest.py",
+            "wfssrv/tests/*",
+            "wfssrv/version*",
+            "*/wfssrv/_astropy_init*",
+            "*/wfssrv/conftest.py",
+            "*/wfssrv/tests/*",
+            "*/wfssrv/version*",
+        ]
+
+    [tool.coverage.report]
+        exclude_lines = [
+            # Have to re-enable the standard pragma
+            "pragma: no cover",
+            # Don't complain about packages we have installed
+            "except ImportError",
+            # Don't complain if tests don't hit defensive assertion code:
+            "raise AssertionError",
+            "raise NotImplementedError",
+            # Don't complain about script hooks
+            "'def main(.*):'",
+            # Ignore branches that don't pertain to this version of Python
+            "pragma: py{ignore_python_version}",
+            # Don't complain about IPython completion helper
+            "def _ipython_key_completions_",
+        ]

scripts/sao-wfs-server

@@ -13,7 +13,7 @@ if {[info exists env(WFSROOT)]} {
 if {[info exists env(CONDA_PREFIX)]} {
     set header_script [file join $env(CONDA_PREFIX) bin wfs_header.py]
 } else {
-    set header_script /mmt/conda/bin/wfs_header.py
+    set header_script /mmt/condaforge/envs/mmtwfs/bin/wfs_header.py
 }
 
 # nominally the port should be 9876, but query for it via DNS to be sure and in case it gets moved