Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
ce2c78d
update workflow to use updated docker actions; pin dockerfile to use …
tepickering May 11, 2022
ea73a10
add null forces file
tepickering May 19, 2022
3242607
initial add of class for communicating with the mmt cell
tepickering May 19, 2022
94ffcc0
initial fleshing out of cell interface
tepickering Jun 4, 2022
c2c58f3
add file checking and perform ident upon connection in mmtcell.py
tepickering Aug 2, 2022
da4a708
photutils now requires filter sizes to be odd in both axes
tepickering Sep 15, 2022
11aea0a
replace deprecated photutils.make_source_mask() with our own slightly…
tepickering Apr 28, 2023
fea3d40
remove redundant python version checking
tepickering Apr 28, 2023
cfbb7eb
switch to absolute import paths; specify ax for colorbar
tepickering Apr 28, 2023
62dac11
switch to absolute imports; specify colorbar ax; disable 3D contour p…
tepickering Apr 28, 2023
87dd5ad
change to absolute imports; fix photutils import paths to be more spe…
tepickering Apr 28, 2023
41b5d88
remove unneeded and now missing codecov package; that's all handled w…
tepickering Apr 28, 2023
2747caa
notebook updates
tepickering Apr 28, 2023
bc3ac26
clean up tests: switch to absolute imports; remove deprecated matplot…
tepickering Apr 28, 2023
2671656
update tox.ini to be valid for tox >= 4
tepickering Apr 28, 2023
6332632
codestyle fixes
tepickering Apr 28, 2023
a9e35f7
excise more astropy_helpers cruft; fix warning about invalid escape s…
tepickering Apr 28, 2023
467cc00
specify poppy dependency to be installed from main branch on github t…
tepickering Apr 28, 2023
55d17cb
notebook updates; add ipympl to extra deps
tepickering Apr 29, 2023
fd22457
add config for ruff as possible replacement for flake8
tepickering May 2, 2023
ded4405
catch case if lines is None in reanalyze.py
tepickering Nov 21, 2023
9b29ac9
fixed Nones in reanalyze.py, but for real this time
tepickering Nov 21, 2023
30e9eed
fix pixel scales for mmirs and binospec. binospec based on zemax calc…
tepickering Jan 29, 2024
a6ae405
Merge remote-tracking branch 'refs/remotes/origin/docker_updates' int…
tepickering Jan 29, 2024
fe4910c
fix broken fits files when reanalyzing
tepickering Jan 30, 2024
084d2ab
apply verify=fix more deeply
tepickering Jan 30, 2024
62c8924
another attempt at getting bad files to work
tepickering Jan 30, 2024
75d25b8
change verify to output_verify
tepickering Jan 30, 2024
a7456e7
yet another try to get verify to work
tepickering Jan 30, 2024
a4bb4c9
and another one
tepickering Jan 30, 2024
7259d22
will this fix it?
tepickering Jan 30, 2024
94ac888
more mmirs fixes
tepickering Feb 8, 2024
51521a9
update mmirs test to reflect config change; bump min python to 3.10 t…
tepickering Mar 21, 2024
8e90914
change photutils imports to match new package api; tweak some test ex…
tepickering Oct 23, 2024
c09385c
add pandas to extra deps
tepickering Nov 1, 2024
110cc23
migrate away from deprecated levmarlsqfitter
tepickering Dec 4, 2024
2f6b805
make setuptools required dep until pkg_resources is migrated away from
tepickering Dec 4, 2024
49fa26b
switch to using simplex fitter since SLSQP was generating garbage
tepickering Dec 5, 2024
6eb879b
switch to using better fitter with single model. subtract background …
tepickering Dec 6, 2024
b589b1c
set up notebook for exploring how to fit 2D models to wfs spot images
tepickering Dec 6, 2024
874e377
ignore spot.fits
tepickering Dec 6, 2024
b6d79bc
notebook updates
tepickering Dec 6, 2024
3110d74
notebook updates
tepickering Dec 6, 2024
133688d
notebook updates; add notebook to characterize bug in astropy.modeling
tepickering Dec 6, 2024
fe2e4e4
migrate from pkg_resources to importlib for fetching data files from …
tepickering Dec 7, 2024
d5aabb1
fix docs breakage due to not properly importing version
tepickering Dec 7, 2024
a5d28cc
dumb codestyle fixes
tepickering Dec 7, 2024
82790af
update docker to python 3.12
tepickering Dec 7, 2024
aabc93c
slim image is missing git; update docker workflow
tepickering Dec 7, 2024
2fb3b06
only build docker image when tag is pushed
tepickering Dec 7, 2024
fcca205
add test for python 3.13
tepickering Dec 13, 2024
6374231
clean up and reformat config.py with black
tepickering Dec 13, 2024
e8cdc3f
black reformatting
tepickering Dec 13, 2024
36c1289
tweak flake8 config to be black-compatible; bump tox.ini python versi…
tepickering Dec 16, 2024
c69a956
bump default to 3.13; make 3.11 the minimum
tepickering Dec 16, 2024
edbe2d5
spot analysis notebook stuff
tepickering Jan 30, 2025
1c154de
spot analysis notebook updates
tepickering Feb 4, 2025
767c45b
add black as an optional dep
tepickering Feb 5, 2025
b76380d
notebook updates to explore and test new way of measuring seeing from…
tepickering Feb 5, 2025
8fb3826
more notebook edits
tepickering Feb 5, 2025
fcef3f2
add vlt_seeing method to measure seeing the way the VLT does with the…
tepickering Feb 5, 2025
65fb6ae
update reanalyze script to log vlt_seeing outputs and save coadded sp…
tepickering Feb 5, 2025
49c90d5
notebook edits
tepickering Feb 6, 2025
f179a3e
update effective wavelengths for binospec and mmirs
tepickering Feb 6, 2025
9ec4d33
mod reanalyze to log elliticity from gaussian fits and ignore coadded…
tepickering Feb 6, 2025
708e2c3
fix spot diffraction psf to include diffraction at the aperture; do e…
tepickering Feb 6, 2025
2033b53
notebook edits; expand gitignore to include all fits files in noteboo…
tepickering Feb 6, 2025
8e563b5
black codestyle fixes
tepickering Feb 7, 2025
a46112e
bug fixes to get tests to pass: catch gaussian fit error; catch if is…
tepickering Feb 7, 2025
b859875
notebook edits
tepickering Feb 8, 2025
ccf9eac
capture warnings and ignore them when doing ellipse fits; fix scale b…
tepickering Feb 8, 2025
1a2bed7
.github/workflows/mmtwfs-tests.yml
tepickering Feb 8, 2025
14b9b38
trim CI tests more (was timing out in github actions); docstring edits
tepickering Feb 9, 2025
86631fa
remove telescope connection in test; was causing github actions to hang
tepickering Feb 13, 2025
52635dc
remove test_connect from secondary tests
tepickering Feb 13, 2025
233ba67
turn off connect test for wfs as well
tepickering Feb 13, 2025
9f0a1bc
save notebook without outputs; comment out mmirs_blank test that was …
tepickering Feb 17, 2025
f2c6ec9
silentfix fits files; port from setup.cfg to pyproject.toml
tepickering Feb 17, 2025
1f36c6e
codestyle fixes
tepickering Feb 17, 2025
cc57d1d
fix docs build
tepickering Feb 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
name: Publish to Docker

on:
push:
branches:
- master
tags:
- 'v*'

jobs:
build:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[docker skip]')"
steps:
- uses: actions/checkout@master
- name: Publish to Registry
uses: docker/build-push-action@v1
- uses: actions/checkout@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v3
with:
repository: mmtobservatory/mmtwfs
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_TOKEN }}
tags: latest
- name: Build and Push
uses: docker/build-push-action@v6
with:
context: .
push: true
tags: mmtobservatory/mmtwfs:latest
18 changes: 8 additions & 10 deletions .github/workflows/mmtwfs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,15 @@ jobs:
envs: |
- linux: codestyle
pytest: false
- linux: py39-alldeps-cov
name: py39
- macos: py39
name: py39-macos
- linux: py38-astropylts
name: py38-astropyLTS
- linux: py313-alldeps-cov
name: py313
- linux: py313-astropydev
name: py313-astropy-latest
continue-on-error: true
- linux: py313-numpydev
name: py313-numpy-latest
continue-on-error: true
- linux: build_docs
- linux: linkcheck
# - linux: py310-astropydev-numpydev
# name: py310-dev
# continue-on-error: true
coverage: 'codecov'
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,4 @@ ENV/
# Rope project settings
.ropeproject
.tmp
notebooks/*.fits
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM python:latest
FROM python:3.13

LABEL maintainer="te.pickering@gmail.com"

COPY . .

RUN pip install -e .[all,test]
RUN pip install -e .[test]
38 changes: 10 additions & 28 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,14 @@
import datetime
from importlib import import_module

from mmtwfs.version import version as __version__

try:
from sphinx_astropy.conf.v1 import * # noqa
except ImportError:
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.
Expand All @@ -67,22 +62,22 @@
# -- Project information ------------------------------------------------------

# This does not *have* to match the package name, but typically does
project = setup_cfg['name']
author = setup_cfg['author']
project = "mmtwfs"
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("mmtwfs")
package = sys.modules["mmtwfs"]

# The short X.Y version.
version = package.__version__.split('-', 1)[0]
version = __version__.split('-', 1)[0]
# The full version, including alpha/beta/rc tags.
release = package.__version__
release = __version__


# -- Options for HTML output --------------------------------------------------
Expand Down Expand Up @@ -151,21 +146,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("mmtwfs")

# -- Turn on nitpicky mode for sphinx (to warn about references not found) ----
#
Expand Down
25 changes: 0 additions & 25 deletions mmtwfs/__init__.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,3 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
"""
The ``mmtwfs`` package is a collection of code that for analyzing Shack-Hartmann wavefront sensor data for the MMTO
"""

# Affiliated packages may add whatever they like to this file, but
# should keep this content at the top.
# ----------------------------------------------------------------------------
from ._astropy_init import * # noqa
# ----------------------------------------------------------------------------

# Enforce Python version check during package import.
# This is the same check as the one at the top of setup.py
import sys
from distutils.version import LooseVersion

__minimum_python_version__ = "3.7"

__all__ = []


class UnsupportedPythonError(Exception):
pass


if LooseVersion(sys.version) < LooseVersion(__minimum_python_version__):
raise UnsupportedPythonError("mmtwfs does not support Python < {}"
.format(__minimum_python_version__))
52 changes: 0 additions & 52 deletions mmtwfs/_astropy_init.py

This file was deleted.

Loading