Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace hardcoded time units with named constants #861

Closed
wants to merge 6 commits into from
Closed

Replace hardcoded time units with named constants #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
32ce6fa
Refactor: Replace hardcoded time units with named constants
Minku-Koo Nov 17, 2024
eee1ebc
Refactor: Use direct reference to constants instead of `self`
Minku-Koo Nov 27, 2024
1a77963
Fix: Resolve code style issues using pre-commit hooks
Minku-Koo Dec 9, 2024
6095771
Refactor: Move define declarations from class level to class methods
Minku-Koo Dec 10, 2024
fcd45df
Refactor: Move define declarations from global level to class methods
Minku-Koo Dec 10, 2024
c8f097b
Fix release builds
Minku-Koo Dec 10, 2024
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
89 changes: 54 additions & 35 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,62 @@ jobs:
include:
- os: ubuntu
platform: linux
- os: windows
ls: dir
interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 pypy3.8 pypy3.9 pypy3.10
- os: windows
ls: dir
target: aarch64
interpreter: 3.11 3.12
- os: macos
target: aarch64
interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 pypy3.8 pypy3.9 pypy3.10
- os: ubuntu
platform: linux
target: aarch64
# mimalloc not supported on manylinux2014 cross-compile container
extra-build-args: --no-default-features
# musllinux
- os: ubuntu
platform: linux
target: x86_64
manylinux: musllinux_1_1
- os: ubuntu
platform: linux
target: aarch64
manylinux: musllinux_1_1
- os: ubuntu
platform: linux
target: ppc64le
interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 3.13
# mimalloc not supported on manylinux2014 cross-compile container
extra-build-args: --no-default-features
- os: ubuntu
platform: linux
target: s390x
interpreter: 3.7 3.8 3.9 3.10 3.11 3.12
interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 3.13
# mimalloc not supported on manylinux2014 cross-compile container
extra-build-args: --no-default-features

# musllinux
- os: ubuntu
platform: linux
target: x86_64
manylinux: musllinux_1_1
- os: ubuntu
platform: linux
target: aarch64
manylinux: musllinux_1_1

# - os: windows
# ls: dir
# interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.8 pypy3.9 pypy3.10
# - os: windows
# ls: dir
# target: aarch64
# interpreter: 3.11 3.12

- os: windows
target: x86_64
interpreter: pypy3.9 pypy3.10
- os: windows
target: i686
python-architecture: x86
interpreter: 3.8 3.9 3.10 3.11 3.12 3.13
- os: windows
target: aarch64
interpreter: 3.11 3.12 3.13


- os: macos
target: x86_64
- os: macos
target: aarch64
interpreter: 3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.8 pypy3.9 pypy3.10



runs-on: ${{ matrix.os }}-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -71,7 +90,7 @@ jobs:
target: ${{ matrix.target }}
manylinux: ${{ matrix.manylinux || 'auto' }}
container: ${{ matrix.container }}
args: --release --out dist --interpreter ${{ matrix.interpreter || '3.7 3.8 3.9 3.10 3.11 3.12 pypy3.7 pypy3.8 pypy3.9 pypy3.10' }} ${{ matrix.extra-build-args }}
args: --release --out dist --interpreter ${{ matrix.interpreter || '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.7 pypy3.8 pypy3.9 pypy3.10' }} ${{ matrix.extra-build-args }}
rust-toolchain: stable
docker-options: -e CI

Expand Down Expand Up @@ -130,16 +149,16 @@ jobs:
[[ "${GITHUB_REF#refs/tags/}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] \
|| echo ::set-output name=prerelease::true

- name: Create Release
uses: ncipollo/release-action@v1
with:
artifacts: "dist/*"
token: ${{ secrets.GITHUB_TOKEN }}
draft: false
prerelease: steps.check-version.outputs.prerelease == 'true'

- name: Publish to PyPI
env:
POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
run: |
poetry publish
# - name: Create Release
# uses: ncipollo/release-action@v1
# with:
# artifacts: "dist/*"
# token: ${{ secrets.GITHUB_TOKEN }}
# draft: false
# prerelease: steps.check-version.outputs.prerelease == 'true'

# - name: Publish to PyPI
# env:
# POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
# run: |
# poetry publish
51 changes: 36 additions & 15 deletions src/pendulum/formatting/difference_formatter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,42 +32,64 @@ def format(
:param absolute: Whether it's an absolute difference or not
:param locale: The locale to use
"""
DAYS_THRESHOLD_FOR_HALF_WEEK = 3
DAYS_THRESHOLD_FOR_HALF_MONTH = 15
MONTHS_THRESHOLD_FOR_HALF_YEAR = 6

HOURS_IN_NEARLY_A_DAY = 22
DAYS_IN_NEARLY_A_MONTH = 27
MONTHS_IN_NEARLY_A_YEAR = 11

DAYS_OF_WEEK = 7
SECONDS_OF_MINUTE = 60
FEW_SECONDS_MAX = 10

KEY_FUTURE = ".future"
KEY_PAST = ".past"
KEY_AFTER = ".after"
KEY_BEFORE = ".before"

locale = self._locale if locale is None else Locale.load(locale)

if diff.years > 0:
unit = "year"
count = diff.years

if diff.months > 6:
if diff.months > MONTHS_THRESHOLD_FOR_HALF_YEAR:
count += 1
elif diff.months == 11 and (diff.weeks * 7 + diff.remaining_days) > 15:
elif (diff.months == MONTHS_IN_NEARLY_A_YEAR) and (
(diff.weeks * DAYS_OF_WEEK + diff.remaining_days)
> DAYS_THRESHOLD_FOR_HALF_MONTH
):
unit = "year"
count = 1
elif diff.months > 0:
unit = "month"
count = diff.months

if (diff.weeks * 7 + diff.remaining_days) >= 27:
if (
diff.weeks * DAYS_OF_WEEK + diff.remaining_days
) >= DAYS_IN_NEARLY_A_MONTH:
count += 1
elif diff.weeks > 0:
unit = "week"
count = diff.weeks

if diff.remaining_days > 3:
if diff.remaining_days > DAYS_THRESHOLD_FOR_HALF_WEEK:
count += 1
elif diff.remaining_days > 0:
unit = "day"
count = diff.remaining_days

if diff.hours >= 22:
if diff.hours >= HOURS_IN_NEARLY_A_DAY:
count += 1
elif diff.hours > 0:
unit = "hour"
count = diff.hours
elif diff.minutes > 0:
unit = "minute"
count = diff.minutes
elif 10 < diff.remaining_seconds <= 59:
elif FEW_SECONDS_MAX < diff.remaining_seconds < SECONDS_OF_MINUTE:
unit = "second"
count = diff.remaining_seconds
else:
Expand All @@ -86,9 +108,9 @@ def format(
key += ".ago"
else:
if is_future:
key += ".after"
key += KEY_AFTER
else:
key += ".before"
key += KEY_BEFORE

return t.cast(str, locale.get(key).format(time))
else:
Expand All @@ -109,19 +131,19 @@ def format(
key = f"translations.relative.{unit}"

if is_future:
key += ".future"
key += KEY_FUTURE
else:
key += ".past"
key += KEY_PAST
else:
# Absolute comparison
# So we have to use the custom locale data

# Checking for special pluralization rules
key = "custom.units_relative"
if is_future:
key += f".{unit}.future"
key += f".{unit}{KEY_FUTURE}"
else:
key += f".{unit}.past"
key += f".{unit}{KEY_PAST}"

trans = locale.get(key)
if not trans:
Expand All @@ -133,10 +155,9 @@ def format(

key = "custom"
if is_future:
key += ".after"
key += KEY_AFTER
else:
key += ".before"

key += KEY_BEFORE
return t.cast(str, locale.get(key).format(time))

key += f".{locale.plural(count)}"
Expand Down
Loading