Skip to content

Commit

Permalink
UTC deprecation.
Browse files Browse the repository at this point in the history
Package metadata update.
  • Loading branch information
coady committed Jul 4, 2024
1 parent bec355c commit 647b795
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
## Unreleased
### Changed
* Python >=3.9 required
* `DateTimeField.within` defaults to local time

### Fixed
* Deprecation warnings
Expand Down
6 changes: 3 additions & 3 deletions lupyne/engine/documents.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,17 +206,17 @@ def duration(self, date, days=0, **delta) -> Query:
delta = datetime.timedelta(days, **delta) # type: ignore
return self.range(*sorted([date, date + delta]), upper=True)

def within(self, days=0, weeks=0, utc=True, **delta) -> Query:
def within(self, days=0, weeks=0, tz=None, **delta) -> Query:
"""Return date range query within current time and delta.
If the delta is an exact number of days, then dates will be used.
Args:
days weeks: number of days to offset from today
utc: optionally use utc instead of local time
tz: optional timezone
**delta: additional timedelta parameters
"""
date = datetime.datetime.utcnow() if utc else datetime.datetime.now()
date = datetime.datetime.now(tz)
if not (isinstance(days + weeks, float) or delta):
date = date.date() # type: ignore
return self.duration(date, days, weeks=weeks, **delta)
Expand Down
3 changes: 2 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import sys
import tempfile
from datetime import datetime
from importlib import metadata
from pathlib import Path
import pytest
import lucene
Expand All @@ -14,7 +15,7 @@


def pytest_report_header(config):
return 'PyLucene ' + lucene.VERSION
return 'lucene: ' + metadata.version('lucene')


def pytest_configure(config):
Expand Down
6 changes: 2 additions & 4 deletions tests/test_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -563,10 +563,8 @@ def test_numeric(indexer, constitution):
query = field.range(datetime.date(1919, 1, 1), datetime.date(1921, 12, 31))
hits = indexer.search(query)
assert [hit['amendment'] for hit in hits] == [18, 19]
assert [datetime.datetime.utcfromtimestamp(float(hit['date'])).year for hit in hits] == [
1919,
1920,
]
dates = [datetime.datetime.fromtimestamp(float(hit['date'])).year for hit in hits]
assert dates == [1919, 1920]
assert indexer.count(field.within(seconds=100)) == indexer.count(field.within(weeks=1)) == 0
query = field.duration([2009], days=-100 * 365)
assert indexer.count(query) == 12
Expand Down

0 comments on commit 647b795

Please sign in to comment.