Skip to content

Commit

Permalink
MVP? Unit tests pass. Now to try some real-world testing.
Browse files Browse the repository at this point in the history
  • Loading branch information
athornton committed Apr 6, 2024
1 parent 5045d14 commit 8b17c4a
Show file tree
Hide file tree
Showing 42 changed files with 1,773 additions and 269 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ clean:
.PHONY: init
init:
pip install --upgrade uv
uv pip install --upgrade pip tox pre-commit
uv pip install --upgrade pip tox tox-uv pre-commit
uv pip install --editable .
uv pip install -r requirements/main.txt -r requirements/dev.txt
rm -rf .tox
Expand All @@ -25,7 +25,7 @@ update: update-deps init
.PHONY: update-deps
update-deps:
pip install --upgrade uv
uv pip install pre-commit
uv pip install pre-commit tox-uv
pre-commit autoupdate
uv pip compile --upgrade --generate-hashes \
--output-file requirements/main.txt requirements/main.in
Expand Down
7 changes: 7 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ dynamic = ["version"]
name = "Association of Universities for Research in Astronomy, Inc. (AURA)"
email = "sqre-admin@lists.lsst.org"

[project.scripts]
runlab = "lsst.rsp.startup.cli:main"

[project.urls]
Homepage = "https://rsp.lsst.io/"
Source = "https://github.com/lsst-sqre/lsst-rsp"
Expand Down Expand Up @@ -92,6 +95,7 @@ exclude_lines = [
[tool.mypy]
disallow_untyped_defs = true
disallow_incomplete_defs = true
exclude = "tests/support/files"
ignore_missing_imports = true
local_partial_types = true
no_implicit_reexport = true
Expand Down Expand Up @@ -123,6 +127,9 @@ python_files = ["tests/*.py", "tests/*/*.py"]
[tool.ruff]
line-length = 79
target-version = "py311"
exclude = [
"tests/support/files/*"
]

[tool.ruff.lint]
ignore = [
Expand Down
6 changes: 3 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ types-deprecated==1.2.9.20240311 \
types-requests==2.31.0.20240403 \
--hash=sha256:06abf6a68f5c4f2a62f6bb006672dfb26ed50ccbfddb281e1ee6f09a65707d5d \
--hash=sha256:e1e0cd0b655334f39d9f872b68a1310f0e343647688bf2cee932ec4c2b04de59
typing-extensions==4.10.0 \
--hash=sha256:69b1a937c3a517342112fb4c6df7e72fc39a38e7891a5730ed4985b5214b5475 \
--hash=sha256:b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb
typing-extensions==4.11.0 \
--hash=sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0 \
--hash=sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a
# via mypy
urllib3==2.2.1 \
--hash=sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d \
Expand Down
1 change: 1 addition & 0 deletions requirements/main.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ Deprecated
IPython
pyvo
structlog
symbolicmode
37 changes: 18 additions & 19 deletions requirements/main.txt
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@ packaging==24.0 \
--hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \
--hash=sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9
# via astropy
parso==0.8.3 \
--hash=sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0 \
--hash=sha256:c001d4636cd3aecdaf33cbb40aebb59b094be2a74c556778ef5576c175e19e75
parso==0.8.4 \
--hash=sha256:a418670a20291dacd2dddc80c377c5c3791378ee1e8d12bffc35420643d43f18 \
--hash=sha256:eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d
# via jedi
pexpect==4.9.0 \
--hash=sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523 \
Expand All @@ -225,18 +225,18 @@ pure-eval==0.2.2 \
--hash=sha256:01eaab343580944bc56080ebe0a674b39ec44a945e6d09ba7db3cb8cec289350 \
--hash=sha256:2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3
# via stack-data
pyerfa==2.0.1.1 \
--hash=sha256:08b5abb90b34e819c1fca69047a76c0d344cb0c8fe4f7c8773f032d8afd623b4 \
--hash=sha256:0e95cf3d11f76f473bf011980e9ea367ca7e68ca675d8b32499814fb6e387d4c \
--hash=sha256:1c0c1efa701cab986aa58d03c58f77e47ea1898bff2684377d29580a055f836a \
--hash=sha256:1ce322ac30673c2aeb0ee22ced4938c1e9e26db0cbe175912a213aaff42383df \
--hash=sha256:1db85db72ab352da6ffc790e41209d8f41feb5b175d682cf1f0e3e60e9e5cdf8 \
--hash=sha256:30649047b7a8ce19f43e4d18a26b8a44405a6bb406df16c687330a3b937723b2 \
--hash=sha256:34ee545780246fb0d1d3f7e46a6daa152be06a26b2d27fbfe309cab9ab488ea7 \
--hash=sha256:67dfc00dcdea87a9b3c0bb4596fb0cfb54ee9c1c75fdcf19411d1029a18f6eec \
--hash=sha256:94df7566ce5a5abb14e2dd1fe879204390639e9a76383ec27f10598eb24be760 \
--hash=sha256:c50b7cdb005632931b7b56a679cf25361ed6b3aa7c21e491e65cc89cb337e66a \
--hash=sha256:dbac74ef8d3d3b0f22ef0ad3bbbdb30b2a9e10570b1fa5a98be34c7be36c9a6b
pyerfa==2.0.1.3 \
--hash=sha256:053ed25fdb7deb9d3d7cebecbb3d3dfbeea37c8c0011cc0616293e03d2c308eb \
--hash=sha256:359327c88f1e5dea3974b284dabef141824ac54753c5cab6b3f23acd9d52071b \
--hash=sha256:58c3a971a9fba8663b49dcc54c3419e837837140d81cc6be9f1c21fc56322f7b \
--hash=sha256:60c0a73db5a42927fbafd12c623699c2c1b1233b6e1be1963970a5ad47e463c4 \
--hash=sha256:779caac3737da68f4db43b0dec026ac479719e02d25b8c4e7b0756abadbcd416 \
--hash=sha256:b0f621f26b5f31b3fb6bb113fb48a428e56eb00c7d729a242672dc4f886c8d18 \
--hash=sha256:b7a85ac9d807ea71550e831e873916ed3a44300fe6e20e0b3ca0f2784c0b2757 \
--hash=sha256:ba5eb932341beaf222726de8dce2b1645c97b48c321efb2af8a535a7eb90ebfa \
--hash=sha256:ef6c5d2206f134bd95329a0c17d46c449c9b68e9828e97e9bc43b29cd8789f5d \
--hash=sha256:f4472d2a2622e47d220a9436c953a487d8c051157f7b44b1f71964de17ee443b \
--hash=sha256:fc554151de564b567e391b7c9c3b545efac63674ab1954382d38f886254c01fb
# via astropy
pygments==2.17.2 \
--hash=sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c \
Expand Down Expand Up @@ -313,16 +313,15 @@ stack-data==0.6.3 \
structlog==24.1.0 \
--hash=sha256:3f6efe7d25fab6e86f277713c218044669906537bb717c1807a09d46bca0714d \
--hash=sha256:41a09886e4d55df25bdcb9b5c9674bccfab723ff43e0a86a1b7b236be8e57b16
symbolicmode==2.0.1 \
--hash=sha256:1f88547b48eb7551c19b459b771b8f4de27f0109dedf68c7f0aea4caeadf85d1 \
--hash=sha256:9f3e4bfa7ad0709fd3b21cfb0a6e6ef9d842eca29460e4796b5e65e72d49ba55
traitlets==5.14.2 \
--hash=sha256:8cdd83c040dab7d1dee822678e5f5d100b514f7b72b01615b26fc5718916fdf9 \
--hash=sha256:fcdf85684a772ddeba87db2f398ce00b40ff550d1528c03c14dbf6a02003cd80
# via
# ipython
# matplotlib-inline
typing-extensions==4.10.0 \
--hash=sha256:69b1a937c3a517342112fb4c6df7e72fc39a38e7891a5730ed4985b5214b5475 \
--hash=sha256:b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb
# via ipython
urllib3==2.2.1 \
--hash=sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d \
--hash=sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19
Expand Down
11 changes: 11 additions & 0 deletions src/lsst/rsp/startup/cli.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
"""Launcher for the Lab Runner."""

from .services.labrunner import LabRunner


def main() -> None:
"""Make a LabRunner and call its single public method. All settings are
in the environment.
"""
lr = LabRunner()
lr.go()
4 changes: 2 additions & 2 deletions src/lsst/rsp/startup/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@

__all__ = [
"app_name",
"etc",
"logging_checksums",
"max_number_outputs",
"noninteractive_config",
"profile_path",
"top_dir",
]

app_name = "nublado"
etc = Path("/etc")
logging_checksums = [
"2997fe99eb12846a1b724f0b82b9e5e6acbd1d4c29ceb9c9ae8f1ef5503892ec"
]
max_number_outputs = 10000
profile_path = Path("/etc/profile.d/local05-path.sh")
top_dir = Path("/opt/lsst/software")
noninteractive_config = Path(
top_dir / "jupyterlab" / "noninteractive" / "command" / "command.json"
Expand Down
Loading

0 comments on commit 8b17c4a

Please sign in to comment.