Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
# Don't test in 3.12 until #1035 is fixed
# https://github.com/simonsobs/socs/issues/1035
python: ["3.8", "3.9", "3.10", "3.11"]
python: ["3.10", "3.11", "3.12"]

steps:
- name: Set up Python ${{ matrix.python }}
Expand Down
91 changes: 0 additions & 91 deletions docs/agents/holo_fpga.rst

This file was deleted.

96 changes: 0 additions & 96 deletions docs/agents/holo_synth.rst

This file was deleted.

2 changes: 0 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ API Reference Full API documentation for core parts of the SOCS library.
agents/hwp_pid
agents/hwp_pmx
agents/hwp_supervisor_agent
agents/holo_fpga
agents/holo_synth
agents/ibootbar
agents/ifm_sbn246_flowmeter
agents/kikusui_pcr500ma
Expand Down
2 changes: 0 additions & 2 deletions docs/user/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ If you would like to install all optional dependencies use the special varient
trying to run for more details.

- :ref:`ACU Agent<acu_deps>`
- :ref:`Holography FPGA Agent<holo_fpga_deps>`
- :ref:`Holography Synthesizer Agent<holo_synth_deps>`
- :ref:`Pysmurf Controller Agent<pysmurf_controller_deps>`
- :ref:`LATRt XY Stage Agent<latrt_xy_stage_deps>`

Expand Down
18 changes: 6 additions & 12 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ name = "socs"
dynamic = ["version"]
description = "Simons Observatory Control System"
readme = "README.rst"
requires-python = ">=3.8"
requires-python = ">=3.10"
classifiers = [
"Framework :: Twisted",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: BSD License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
Expand Down Expand Up @@ -49,8 +47,7 @@ acu = [
"so3g",
# "soaculib @ git+https://github.com/simonsobs/soaculib.git@master",
]
# Note: Not including the holography deps, which are Python 3.8 only. Also not
# including any dependencies with only direct references.
# Note: Not including any dependencies with only direct references.
all = [
"imutils",
"labjack-ljm",
Expand All @@ -62,12 +59,9 @@ all = [
"pyepics",
"scipy",
"so3g",
"sodetlib",
"sotodlib",
]
# Holography FPGA and Synthesizer Agents
# holography = [ # Note: supports python 3.8 only!
# "casperfpga @ git+https://github.com/casper-astro/casperfpga.git@py38",
# "holog_daq @ git+https://github.com/McMahonCosmologyGroup/holog_daq.git@main",
# ]
# Labjack Agent
labjack = [
"labjack-ljm",
Expand All @@ -93,8 +87,8 @@ pfeiffer = [
pysmurf = [
"pyepics",
# "pysmurf-slac @ git+https://github.com/slaclab/pysmurf.git@main",
# "sodetlib @ git+https://github.com/simonsobs/sodetlib.git@master",
# "sotodlib @ git+https://github.com/simonsobs/sotodlib.git@master",
"sodetlib",
"sotodlib",
]
# SMuRF File Emulator, SMuRF Stream Simulator
smurf_sim = [
Expand Down
8 changes: 2 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ soaculib @ git+https://github.com/simonsobs/soaculib.git@master
so3g
pixell

# holography agent - python 3.8 only!
# -r requirements/holography.txt

# LabJack Agent
numexpr
scipy
Expand All @@ -43,9 +40,8 @@ pfeiffer-vacuum-protocol==0.4
# pysmurf controller
pyepics
pysmurf-slac @ git+https://github.com/slaclab/pysmurf.git@main
sodetlib @ git+https://github.com/simonsobs/sodetlib.git@master
# pin to just before 3.8 support dropped
sotodlib @ git+https://github.com/simonsobs/sotodlib.git@5d613d5915b1716c401abecb5446088bce5fc1a4
sodetlib
sotodlib

# timing master monitor
pyepics
Expand Down
2 changes: 0 additions & 2 deletions requirements/holography.txt

This file was deleted.

Empty file removed socs/agents/holo_fpga/__init__.py
Empty file.
Loading
Loading