Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move requests package from separate group into install_requires #595

Merged
merged 2 commits into from
Dec 11, 2023
Merged

Move requests package from separate group into install_requires #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b8efd1
Move requests package into install_requires
BrianJKoopman Dec 11, 2023
9caa5eb
Remove synacc group from installation docs
BrianJKoopman Dec 11, 2023
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 docs/user/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Install and update with pip::
You may install optional dependencies by including one or more agent group
names on installation, for example::

$ pip3 install -U socs[labjack,synacc]
$ pip3 install -U socs[labjack,pfeiffer]

The different groups, and the agents they provide dependencies for are:

Expand All @@ -34,8 +34,6 @@ The different groups, and the agents they provide dependencies for are:
- Pysmurf Controller Agent
* - ``smurf_sim``
- SMuRF File Emulator, SMuRF Stream Simulator
* - ``synacc``
- Synaccess Agent
* - ``timing_master``
- SMuRF Timing Card Agent

Expand Down
4 changes: 1 addition & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ pyasn1==0.4.8
# common dependencies - used by multiple agents
numpy
pyyaml
requests

# acu agent
soaculib @ git+https://github.com/simonsobs/soaculib.git@master
Expand Down Expand Up @@ -40,9 +41,6 @@ pysmurf @ 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

# synacc agent
requests

# timing master monitor
pyepics

Expand Down
7 changes: 2 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
# SMuRF File Emulator, SMuRF Stream Simulator
smurf_sim_deps = ['so3g']

# Synaccess Agent
synacc_deps = ['requests']

# Timing Master Monitor
timing_master_deps = ['pyepics']

Expand All @@ -61,7 +58,7 @@
# Note: Not including the holograph deps, which are Python 3.8 only. Also not
# including any dependencies with only direct references.
all_deps = acu_deps + labjack_deps + magpie_deps + pfeiffer_deps + \
pysmurf_deps + smurf_sim_deps + synacc_deps + timing_master_deps
pysmurf_deps + smurf_sim_deps + timing_master_deps
all_deps = list(set(all_deps))

setup(
Expand Down Expand Up @@ -109,6 +106,7 @@
'pysnmp',
'pysmi',
'pyyaml',
'requests',
'sqlalchemy>=1.4',
'twisted',
'pyasn1==0.4.8',
Expand All @@ -122,7 +120,6 @@
'pfeiffer': pfeiffer_deps,
'pysmurf': pysmurf_deps,
'smurf_sim': smurf_sim_deps,
'synacc': synacc_deps,
'timing_master': timing_master_deps,
# 'xy_stage': xy_stage_deps,
},
Expand Down