Merge branch 'master' into refresh

Author: Secrus

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Get tag
       id: tag
       run: |
@@ -29,7 +29,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
 
     steps:
     - uses: actions/checkout@v2
@@ -43,8 +43,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install and set up Poetry
       run: |
-        curl -fsS -o get-poetry.py https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py
-        python get-poetry.py -y
+        curl -fsS https://install.python-poetry.org | python - --preview -y
     - name: Build distributions
       run: |
         source $HOME/.poetry/env
@@ -59,7 +58,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
 
     steps:
     - uses: actions/checkout@v2
@@ -74,8 +73,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install and setup Poetry
       run: |
-        Invoke-WebRequest https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -O get-poetry.py
-        python get-poetry.py -y
+        (Invoke-WebRequest -Uri https://install.python-poetry.org -UseBasicParsing).Content | python - --preview -y
     - name: Build distributions
       run: |
         $env:Path += ";$env:Userprofile\.poetry\bin"
@@ -104,8 +102,7 @@ jobs:
           path: dist
       - name: Install and set up Poetry
         run: |
-          curl -fsS -o get-poetry.py https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py
-          python get-poetry.py -y
+          curl -fsS https://install.python-poetry.org | python - --preview -y
       - name: Set up cache
         uses: actions/cache@v1
         with:

.github/workflows/tests.yml

@@ -13,83 +13,64 @@ on:
       - '**'
 
 jobs:
-  Linting:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.9
-      - name: Linting
-        run: |
-          pip install pre-commit
-          pre-commit run --all-files
-
   Tests:
-    needs: Linting
     name: ${{ matrix.os }} / ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}-latest
     strategy:
       matrix:
         os: [Ubuntu, MacOS, Windows]
         python-version: [3.7, 3.8, 3.9, "3.10"]
+    defaults:
+      run:
+        shell: bash
+
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Get full Python version
         id: full-python-version
-        shell: bash
-        run: echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")
+        run: |
+          echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")
 
       - name: Install poetry
-        shell: bash
         run: |
-          curl -fsS -o install-poetry.py https://raw.githubusercontent.com/sdispater/poetry/master/install-poetry.py
-          python install-poetry.py --preview -y
+          curl -fsS https://install.python-poetry.org | python - --preview -y
 
       - name: Update PATH
         if: ${{ matrix.os != 'Windows' }}
-        shell: bash
         run: echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Update Path for Windows
         if: ${{ matrix.os == 'Windows' }}
-        shell: bash
         run: echo "$APPDATA\Python\Scripts" >> $GITHUB_PATH
 
       - name: Configure poetry
-        shell: bash
         run: poetry config virtualenvs.in-project true
 
       - name: Set up cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: cache
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }}
 
       - name: Ensure cache is healthy
-        if: steps.cache.outputs.cache-hit == 'true'
-        shell: bash
-        run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
+        # MacOS does not come with `timeout` command out of the box
+        if: steps.cache.outputs.cache-hit == 'true' && matrix.os != 'MacOS'
+        run: timeout 10s poetry run pip --version || rm -rf .venv
 
       - name: Install dependencies
-        shell: bash
-        run: poetry install --only default --only test -vvv
+        run: poetry install --only main --only test -vvv
 
       - name: Test Pure Python
-        shell: bash
         run: |
           PENDULUM_EXTENSIONS=0 poetry run pytest -q tests
 
       - name: Test
-        shell: bash
         run: |
           poetry run pytest -q tests

.pre-commit-config.yaml

@@ -1,3 +1,6 @@
+ci:
+  autofix_prs: false
+
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1
@@ -19,6 +22,12 @@ repos:
     hooks:
       - id: black
 
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+        args: [--add-import, from __future__ import annotations]
+
   - repo: https://github.com/pycqa/flake8
     rev: 4.0.1
     hooks:
@@ -42,12 +51,6 @@ repos:
       - id: yesqa
         additional_dependencies: *flake8_deps
 
-  - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
-    hooks:
-      - id: isort
-        args: [--add-import, from __future__ import annotations]
-
   - repo: https://github.com/asottile/pyupgrade
     rev: v2.37.3
     hooks:

README.rst

@@ -10,9 +10,10 @@ Pendulum
 .. image:: https://img.shields.io/codecov/c/github/sdispater/pendulum/master.svg
     :target: https://codecov.io/gh/sdispater/pendulum/branch/master
 
-.. image:: https://travis-ci.org/sdispater/pendulum.svg
+.. image:: https://github.com/sdispater/pendulum/actions/workflows/tests.yml/badge.svg
     :alt: Pendulum Build status
-    :target: https://travis-ci.org/sdispater/pendulum
+    :target: https://github.com/sdispater/pendulum/actions
+
 
 Python datetimes made easy.
 
@@ -36,7 +37,7 @@ Supports Python **2.7** and **3.4+**.
 
    >>> past = pendulum.now().subtract(minutes=2)
    >>> past.diff_for_humans()
-   >>> '2 minutes ago'
+   '2 minutes ago'
 
    >>> delta = past - last_week
    >>> delta.hours
@@ -73,55 +74,6 @@ and by default in ``UTC`` for ease of use.
 
 Pendulum also improves the standard ``timedelta`` class by providing more intuitive methods and properties.
 
-
-Why not Arrow?
-==============
-
-Arrow is the most popular datetime library for Python right now, however its behavior
-and API can be erratic and unpredictable. The ``get()`` method can receive pretty much anything
-and it will try its best to return something while silently failing to handle some cases:
-
-.. code-block:: python
-
-    arrow.get('2016-1-17')
-    # <Arrow [2016-01-01T00:00:00+00:00]>
-
-    pendulum.parse('2016-1-17')
-    # <Pendulum [2016-01-17T00:00:00+00:00]>
-
-    arrow.get('20160413')
-    # <Arrow [1970-08-22T08:06:53+00:00]>
-
-    pendulum.parse('20160413')
-    # <Pendulum [2016-04-13T00:00:00+00:00]>
-
-    arrow.get('2016-W07-5')
-    # <Arrow [2016-01-01T00:00:00+00:00]>
-
-    pendulum.parse('2016-W07-5')
-    # <Pendulum [2016-02-19T00:00:00+00:00]>
-
-    # Working with DST
-    just_before = arrow.Arrow(2013, 3, 31, 1, 59, 59, 999999, 'Europe/Paris')
-    just_after = just_before.replace(microseconds=1)
-    '2013-03-31T02:00:00+02:00'
-    # Should be 2013-03-31T03:00:00+02:00
-
-    (just_after.to('utc') - just_before.to('utc')).total_seconds()
-    -3599.999999
-    # Should be 1e-06
-
-    just_before = pendulum.datetime(2013, 3, 31, 1, 59, 59, 999999, 'Europe/Paris')
-    just_after = just_before.add(microseconds=1)
-    '2013-03-31T03:00:00+02:00'
-
-    (just_after.in_timezone('utc') - just_before.in_timezone('utc')).total_seconds()
-    1e-06
-
-Those are a few examples showing that Arrow cannot always be trusted to have a consistent
-behavior with the data you are passing to it.
-
-
 Limitations
 ===========
 
@@ -186,7 +138,7 @@ Getting started
 ---------------
 
 To work on the Pendulum codebase, you'll want to clone the project locally
-and install the required depedendencies via `poetry <https://poetry.eustace.io>`_.
+and install the required dependencies via `poetry <https://poetry.eustace.io>`_.
 
 .. code-block:: bash
 

docs/docs/comparison.md

@@ -64,7 +64,7 @@ the `now()` is created in the same timezone as the instance.
 
 >>> born = pendulum.datetime(1987, 4, 23)
 >>> not_birthday = pendulum.datetime(2014, 9, 26)
->>> birthday = pendulum.datetime(2014, 2, 23)
+>>> birthday = pendulum.datetime(2014, 4, 23)
 >>> past_birthday = pendulum.now().subtract(years=50)
 
 >>> born.is_birthday(not_birthday)

docs/docs/period.md

@@ -27,7 +27,7 @@ instances that generated it, so that it can give access to more methods and prop
 2 # 832 for the duration
 
 # However the days property will still remain the same
-# to keep the compatiblity with the timedelta class
+# to keep the compatibility with the timedelta class
 >>> period.days
 5829
 ```

pendulum/formatting/formatter.py

@@ -65,7 +65,7 @@ class Formatter:
         "Mo": None,
         "DDDo": None,
         "Do": lambda locale: tuple(
-            fr"\d+{o}" for o in locale.get("custom.ordinal").values()
+            rf"\d+{o}" for o in locale.get("custom.ordinal").values()
         ),
         "dddd": "days.wide",
         "ddd": "days.abbreviated",
@@ -106,24 +106,24 @@ class Formatter:
         # Hour
         "HH": lambda dt: f"{dt.hour:02d}",
         "H": lambda dt: f"{dt.hour:d}",
-        "hh": lambda dt: "{:02d}".format(dt.hour % 12 or 12),
-        "h": lambda dt: "{:d}".format(dt.hour % 12 or 12),
+        "hh": lambda dt: f"{dt.hour % 12 or 12:02d}",
+        "h": lambda dt: f"{dt.hour % 12 or 12:d}",
         # Minute
         "mm": lambda dt: f"{dt.minute:02d}",
         "m": lambda dt: f"{dt.minute:d}",
         # Second
         "ss": lambda dt: f"{dt.second:02d}",
         "s": lambda dt: f"{dt.second:d}",
         # Fractional second
-        "S": lambda dt: "{:01d}".format(dt.microsecond // 100000),
-        "SS": lambda dt: "{:02d}".format(dt.microsecond // 10000),
-        "SSS": lambda dt: "{:03d}".format(dt.microsecond // 1000),
-        "SSSS": lambda dt: "{:04d}".format(dt.microsecond // 100),
-        "SSSSS": lambda dt: "{:05d}".format(dt.microsecond // 10),
+        "S": lambda dt: f"{dt.microsecond // 100000:01d}",
+        "SS": lambda dt: f"{dt.microsecond // 10000:02d}",
+        "SSS": lambda dt: f"{dt.microsecond // 1000:03d}",
+        "SSSS": lambda dt: f"{dt.microsecond // 100:04d}",
+        "SSSSS": lambda dt: f"{dt.microsecond // 10:05d}",
         "SSSSSS": lambda dt: f"{dt.microsecond:06d}",
         # Timestamp
         "X": lambda dt: f"{dt.int_timestamp:d}",
-        "x": lambda dt: "{:d}".format(dt.int_timestamp * 1000 + dt.microsecond // 1000),
+        "x": lambda dt: f"{dt.int_timestamp * 1000 + dt.microsecond // 1000:d}",
         # Timezone
         "zz": lambda dt: "{}".format(dt.tzname() if dt.tzinfo is not None else ""),
         "z": lambda dt: "{}".format(dt.timezone_name or ""),