Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/test_docker.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Run tests on Fedora and Ubuntu Docker images using GIFT CORP and GIFT PPA on commit
# Run tests on Fedora and Ubuntu Docker images using GIFT COPR and GIFT PPA on commit
name: test_docker
on: [push]
permissions: read-all
Expand All @@ -11,7 +11,7 @@ jobs:
container:
image: registry.fedoraproject.org/fedora:${{ matrix.version }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up container
run: |
dnf install -y dnf-plugins-core langpacks-en
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
container:
image: ubuntu:${{ matrix.version }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up container
env:
DEBIAN_FRONTEND: noninteractive
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/test_docs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Run docs tox tests on Ubuntu Docker images using GIFT PPA
# Run docs tox tests on Ubuntu Docker images using the deadsnakes and GIFT PPAs
name: test_docs
on:
pull_request:
Expand All @@ -13,13 +13,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- python-version: '3.12'
toxenv: 'docs'
python-version: ['3.12']
container:
image: ubuntu:24.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up container
env:
DEBIAN_FRONTEND: noninteractive
Expand All @@ -41,4 +39,4 @@ jobs:
env:
LANG: en_US.UTF-8
run: |
tox -e${{ matrix.toxenv }}
tox -e docs
2 changes: 1 addition & 1 deletion .github/workflows/test_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
python-version: '3.14'
toxenv: 'py314'
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Install dependencies
run: |
brew update -q
Expand Down
36 changes: 16 additions & 20 deletions .github/workflows/test_tox.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Run tox tests on Ubuntu Docker images using GIFT PPA
# Run tox tests on Ubuntu Docker images using the deadsnakes and GIFT PPAs
name: test_tox
on:
pull_request:
Expand All @@ -15,19 +15,19 @@ jobs:
matrix:
include:
- python-version: '3.10'
toxenv: 'py310,wheel'
toxenv: 'py310'
- python-version: '3.11'
toxenv: 'py311,wheel'
toxenv: 'py311'
- python-version: '3.12'
toxenv: 'py312,wheel'
toxenv: 'py312'
- python-version: '3.13'
toxenv: 'py313,wheel'
toxenv: 'py313'
- python-version: '3.14'
toxenv: 'py314,wheel'
toxenv: 'py314'
container:
image: ubuntu:24.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up container
env:
DEBIAN_FRONTEND: noninteractive
Expand All @@ -49,18 +49,16 @@ jobs:
env:
LANG: en_US.UTF-8
run: |
tox -e${{ matrix.toxenv }}
tox -e ${{ matrix.toxenv }},wheel
coverage:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- python-version: '3.12'
toxenv: 'coverage'
python-version: ['3.12']
container:
image: ubuntu:24.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up container
env:
DEBIAN_FRONTEND: noninteractive
Expand All @@ -77,27 +75,25 @@ jobs:
add-apt-repository -y ppa:deadsnakes/ppa
add-apt-repository -y ppa:gift/dev
apt-get update -q
apt-get install -y build-essential git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
apt-get install -y build-essential curl git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
- name: Run tests with coverage
env:
LANG: en_US.UTF-8
run: |
tox -e${{ matrix.toxenv }}
tox -e coverage
- name: Upload coverage report to Codecov
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v6
with:
token: ${{ secrets.CODECOV_TOKEN }}
lint:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- python-version: '3.12'
toxenv: 'lint'
python-version: ['3.12']
container:
image: ubuntu:24.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up container
env:
DEBIAN_FRONTEND: noninteractive
Expand All @@ -119,4 +115,4 @@ jobs:
env:
LANG: en_US.UTF-8
run: |
tox -e${{ matrix.toxenv }}
tox -e lint
1 change: 0 additions & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,6 @@ confidence=HIGH,
# --disable=W".
disable=assignment-from-none,
bad-inline-option,
consider-using-f-string,
deprecated-pragma,
duplicate-code,
file-ignored,
Expand Down
2 changes: 1 addition & 1 deletion dfdatetime/cocoa_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def CopyFromDateTimeString(self, time_string):
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

timestamp = self._GetNumberOfSecondsFromElements(
year, month, day_of_month, hours, minutes, seconds)
Expand Down
2 changes: 1 addition & 1 deletion dfdatetime/delphi_date_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def CopyFromDateTimeString(self, time_string):
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

if year > 9999:
raise ValueError(f'Unsupported year value: {year:d}.')
Expand Down
2 changes: 1 addition & 1 deletion dfdatetime/dotnet_datetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def CopyFromDateTimeString(self, time_string):
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

if year > 9999:
raise ValueError(f'Unsupported year value: {year:d}.')
Expand Down
4 changes: 2 additions & 2 deletions dfdatetime/fake_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ def CopyFromDateTimeString(self, time_string):
hours = date_time_values.get('hours', 0)
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', None)
time_zone_offset = date_time_values.get('time_zone_offset', None)
nanoseconds = date_time_values.get('nanoseconds')
time_zone_offset = date_time_values.get('time_zone_offset')

self._normalized_timestamp = None
self._number_of_seconds = self._GetNumberOfSecondsFromElements(
Expand Down
4 changes: 2 additions & 2 deletions dfdatetime/fat_date_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def CopyFromDateTimeString(self, time_string):
hours = date_time_values.get('hours', 0)
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

if year < 1980 or year > (1980 + 0x7f):
raise ValueError(f'Year value not supported: {year!s}.')
Expand Down Expand Up @@ -265,7 +265,7 @@ def CopyFromDateTimeString(self, time_string):
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

if year < 1980 or year > (1980 + 0x7f):
raise ValueError(f'Year value not supported: {year!s}.')
Expand Down
2 changes: 1 addition & 1 deletion dfdatetime/filetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def CopyFromDateTimeString(self, time_string):
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

if year < 1601:
raise ValueError(f'Year value not supported: {year!s}.')
Expand Down
2 changes: 1 addition & 1 deletion dfdatetime/golang_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def CopyFromDateTimeString(self, time_string):
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

if year < 0:
raise ValueError(f'Year value not supported: {year!s}.')
Expand Down
2 changes: 1 addition & 1 deletion dfdatetime/hfs_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def CopyFromDateTimeString(self, time_string):
hours = date_time_values.get('hours', 0)
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

if year < 1904 or year > 2040:
raise ValueError('Year value not supported.')
Expand Down
8 changes: 4 additions & 4 deletions dfdatetime/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ def _GetNumberOfDaysInCentury(self, year):
year, _ = divmod(year, 100)
year *= 100

number_of_days = definitions.DAYS_PER_CENTURY.get(year, None)
number_of_days = definitions.DAYS_PER_CENTURY.get(year)
if number_of_days is not None:
return number_of_days

Expand All @@ -763,7 +763,7 @@ def _GetNumberOfDaysInYear(self, year):
Returns:
int: number of days in the year.
"""
number_of_days = definitions.DAYS_PER_YEAR.get(year, None)
number_of_days = definitions.DAYS_PER_YEAR.get(year)
if number_of_days is not None:
return number_of_days

Expand Down Expand Up @@ -809,7 +809,7 @@ def _GetNumberOfSecondsFromElements(
elif seconds not in range(0, 60):
raise ValueError(f'Seconds value: {seconds!s} out of bounds.')

number_of_days = definitions.DAYS_PER_YEAR_IN_POSIX_EPOCH.get(year, None)
number_of_days = definitions.DAYS_PER_YEAR_IN_POSIX_EPOCH.get(year)
if number_of_days is None:
raise ValueError(f'Year value: {year!s} out of bounds.')

Expand Down Expand Up @@ -896,7 +896,7 @@ def CopyToPosixTimestampWithFractionOfSecond(self):
if normalized_timestamp is None:
return None, None

remainder_multiplier = self._REMAINDER_MULTIPLIER.get(self._precision, None)
remainder_multiplier = self._REMAINDER_MULTIPLIER.get(self._precision)
if not remainder_multiplier:
remainder = None
elif normalized_timestamp >= 0:
Expand Down
2 changes: 1 addition & 1 deletion dfdatetime/ole_automation_date.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def CopyFromDateTimeString(self, time_string):
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

timestamp = self._GetNumberOfSecondsFromElements(
year, month, day_of_month, hours, minutes, seconds)
Expand Down
8 changes: 4 additions & 4 deletions dfdatetime/posix_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def CopyFromDateTimeString(self, time_string):
hours = date_time_values.get('hours', 0)
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

self._timestamp = self._GetNumberOfSecondsFromElements(
year, month, day_of_month, hours, minutes, seconds)
Expand Down Expand Up @@ -187,7 +187,7 @@ def CopyFromDateTimeString(self, time_string):
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

milliseconds, _ = divmod(
nanoseconds, definitions.NANOSECONDS_PER_MILLISECOND)
Expand Down Expand Up @@ -293,7 +293,7 @@ def CopyFromDateTimeString(self, time_string):
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

milliseconds, _ = divmod(
nanoseconds, definitions.NANOSECONDS_PER_MICROSECOND)
Expand Down Expand Up @@ -399,7 +399,7 @@ def _CopyFromDateTimeString(self, time_string):
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

timestamp = self._GetNumberOfSecondsFromElements(
year, month, day_of_month, hours, minutes, seconds)
Expand Down
2 changes: 1 addition & 1 deletion dfdatetime/precisions.py
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ def CreatePrecisionHelper(cls, precision):
Raises:
ValueError: if the precision value is unsupported.
"""
precision_helper_class = cls._PRECISION_CLASSES.get(precision, None)
precision_helper_class = cls._PRECISION_CLASSES.get(precision)
if not precision_helper_class:
raise ValueError(f'Unsupported precision: {precision!s}')

Expand Down
2 changes: 1 addition & 1 deletion dfdatetime/rfc2579_date_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def CopyFromDateTimeString(self, time_string):
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

deciseconds, _ = divmod(
nanoseconds, definitions.NANOSECONDS_PER_DECISECOND)
Expand Down
12 changes: 6 additions & 6 deletions dfdatetime/serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def ConvertJSONToDateTimeValues(cls, json_dict):
Returns:
dfdatetime.DateTimeValues: date and time values.
"""
class_name = json_dict.get('__class_name__', None)
class_name = json_dict.get('__class_name__')
if class_name:
del json_dict['__class_name__']

Expand All @@ -193,25 +193,25 @@ def ConvertJSONToDateTimeValues(cls, json_dict):
if class_name not in (
'TimeElements', 'TimeElementsInMilliseconds',
'TimeElementsInMicroseconds'):
is_delta = json_dict.get('is_delta', None)
is_delta = json_dict.get('is_delta')
if is_delta is not None:
del json_dict['is_delta']

is_local_time = json_dict.get('is_local_time', None)
is_local_time = json_dict.get('is_local_time')
if is_local_time is not None:
del json_dict['is_local_time']

time_zone_hint = json_dict.get('time_zone_hint', None)
time_zone_hint = json_dict.get('time_zone_hint')
if time_zone_hint is not None:
del json_dict['time_zone_hint']

if class_name in ('InvalidTime', 'Never', 'NotSet'):
string = json_dict.get('string', None)
string = json_dict.get('string')
if string is not None:
del json_dict['string']

if class_name in ('GolangTime', 'RFC2579DateTime'):
time_zone_offset = json_dict.get('time_zone_offset', None)
time_zone_offset = json_dict.get('time_zone_offset')
if time_zone_offset is not None:
del json_dict['time_zone_offset']

Expand Down
2 changes: 1 addition & 1 deletion dfdatetime/systemtime.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def CopyFromDateTimeString(self, time_string):
minutes = date_time_values.get('minutes', 0)
seconds = date_time_values.get('seconds', 0)
nanoseconds = date_time_values.get('nanoseconds', 0)
time_zone_offset = date_time_values.get('time_zone_offset', None)
time_zone_offset = date_time_values.get('time_zone_offset')

milliseconds, _ = divmod(
nanoseconds, definitions.NANOSECONDS_PER_MILLISECOND)
Expand Down
Loading
Loading