Skip to content

Commit

Permalink
Merge pull request #1110 from lsst/u/timj/python313
Browse files Browse the repository at this point in the history
Activate python 3.13 in action
  • Loading branch information
timj authored Oct 31, 2024
2 parents 2b0d39d + 38f37d8 commit 6cb0823
Show file tree
Hide file tree
Showing 5 changed files with 257 additions and 341 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13"]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ classifiers = [
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.13",
"Topic :: Scientific/Engineering :: Astronomy",
]
keywords = ["lsst"]
Expand Down Expand Up @@ -231,6 +232,7 @@ exclude = [
'^parserLex\.', # Docstrings are not numpydoc
'^parserYacc\.', # Docstrings are not numpydoc
'^commands\.', # Click docstrings, not numpydoc
'butler.cli$', # This is the main click command
'^__init__$',
'\._[a-zA-Z_]+$', # Private methods.
]
20 changes: 2 additions & 18 deletions python/lsst/daf/butler/cli/butler.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,25 +440,9 @@ def _getCommands(self) -> defaultdict[str, list[str | PluginCommand]]: # type:
@log_label_option()
@ClickProgressHandler.option
def cli(log_level: str, long_log: bool, log_file: str, log_tty: bool, log_label: str, progress: bool) -> None:
"""Command line interface for butler.
"""Butler command-line tools.
Parameters
----------
log_level : `str`
The log level to use by default. ``log_level`` is handled by
``get_command`` and ``list_commands``, and is called in
one of those functions before this is called.
long_log : `bool`
Enable extended log output. ``long_log`` is handled by
``setup_logging``.
log_file : `str`
The log file name.
log_tty : `bool`
Whether to send logs to standard output.
log_label : `str`
Log labels.
progress : `bool`
Whether to use progress bar.
Log options apply to all subcommands.
"""
pass

Expand Down
20 changes: 10 additions & 10 deletions requirements/docker-test.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --generate-hashes --output-file=./docker-test.txt ./docker-test.in
Expand All @@ -8,15 +8,15 @@ asn1crypto==1.5.1 \
--hash=sha256:13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c \
--hash=sha256:db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67
# via scramp
boto3==1.35.44 \
--hash=sha256:18416d07b41e6094101a44f8b881047dcec6b846dad0b9f83b9bbf2f0cd93d07 \
--hash=sha256:7f8e8a252458d584d8cf7877c372c4f74ec103356eedf43d2dd9e479f47f3639
boto3==1.35.52 \
--hash=sha256:68299da8ab2bb37cc843d61b9f4c1c9367438406cfd65a8f593afc7b3bfe226d \
--hash=sha256:ec0e797441db56af63b1150bba49f114b0f885f5d76c3b6dc18075f73030d2bb
# via
# -c ./docker.txt
# moto
botocore==1.35.44 \
--hash=sha256:1fcd97b966ad8a88de4106fe1bd3bbd6d8dadabe99bbd4a6aadcf11cb6c66b39 \
--hash=sha256:55388e80624401d017a9a2b8109afd94814f7e666b53e28fce51375cfa8d9326
botocore==1.35.52 \
--hash=sha256:1fe7485ea13d638b089103addd818c12984ff1e4d208de15f180b1e25ad944c5 \
--hash=sha256:cdbb5e43c9c3a977763e2a10d3b8b9c405d51279f9fcfd4ca4800763b22acba5
# via
# -c ./docker.txt
# boto3
Expand Down Expand Up @@ -919,9 +919,9 @@ urllib3==2.2.3 \
# botocore
# requests
# responses
werkzeug==3.0.4 \
--hash=sha256:02c9eb92b7d6c06f31a782811505d2157837cea66aaede3e217c7c27c039476c \
--hash=sha256:34f2371506b250df4d4f84bfe7b0921e4762525762bbd936614909fe25cd7306
werkzeug==3.0.6 \
--hash=sha256:1bc0c2310d2fbb07b1dd1105eba2f7af72f322e1e455f2f93c993bee8c8a5f17 \
--hash=sha256:a8dd59d4de28ca70471a34cba79bed5f7ef2e036a76b3ab0835474246eb41f8d
# via moto
xmltodict==0.14.2 \
--hash=sha256:201e7c28bb210e374999d1dde6382923ab0ed1a8a5faeece48ab525b7810a553 \
Expand Down
Loading

0 comments on commit 6cb0823

Please sign in to comment.