Skip to content

Commit

Permalink
Merge pull request #1143 from lsst/u/timj/fix-boto-numpy-pins
Browse files Browse the repository at this point in the history
Fix s3fs/boto requirements and unpin numpy
  • Loading branch information
timj authored Jan 16, 2025
2 parents 36545c9 + ac1af00 commit e3be3c4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ jobs:
run: |
pip install uv
uv pip install -r requirements.txt
uv pip install fsspec s3fs
# We have two cores so we can speed up the testing with xdist
- name: Install pytest packages
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/daf/butler/registry/obscore/_records.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ def __call__(self, ref: DatasetRef) -> Record | None:
if timespan is not None:
if timespan.begin is not None:
t_min = cast(astropy.time.Time, timespan.begin)
record["t_min"] = t_min.mjd
record["t_min"] = float(t_min.mjd)
if timespan.end is not None:
t_max = cast(astropy.time.Time, timespan.end)
record["t_max"] = t_max.mjd
record["t_max"] = float(t_max.mjd)

region = dataId.region
if self.exposure.name in dataId:
Expand Down
4 changes: 1 addition & 3 deletions requirements/main.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ pydantic >=2,<3.0
deprecated >=1.2
pyarrow >= 0.16
psycopg2

# Numpy 2 is not supported by the stack yet.
numpy < 2
numpy

# Butler CLI dependencies
click >7.0
Expand Down
4 changes: 3 additions & 1 deletion requirements/test.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
matplotlib >= 3.0.3
moto >= 1.3
numpy >= 1.17, <2
numpy >= 1.17
pandas >= 1.0
testing.postgresql
s3fs
fsspec

0 comments on commit e3be3c4

Please sign in to comment.