Update dependencies & build for Python 3.11 (#6)

* Update dependencies

* Add Python 3.11 to build pipeline

* Update build pipeline

Author: m1so

.github/workflows/CI.yaml

@@ -16,19 +16,16 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          target: aarch64-apple-darwin
-          profile: minimal
-          default: true
+          targets: aarch64-apple-darwin
       - name: Build Rust crate
         run: cargo build --release
       - name: Run Rust unit tests
@@ -37,25 +34,25 @@ jobs:
         uses: messense/maturin-action@v1
         with:
           target: x86_64
-          args: -i python --release --out dist
+          args: -i python --release --out dist --sdist
       - name: Install Python wheels (x86_64)
         run: |
           pip install fastdatetime --no-index --find-links dist --force-reinstall
       - name: Build Python wheels (universal2)
-        if: ${{ matrix.python-version >= '3.8' || matrix.python-version == '3.10' }}
+        if: ${{ matrix.python-version >= '3.8' || contains(fromJson('["3.10", "3.11"]'), matrix.python-version) }}
         uses: messense/maturin-action@v1
         with:
-          args: -i python --release --universal2 --out dist --no-sdist
+          args: -i python --release --universal2 --out dist
       - name: Install Python wheels (universal2)
-        if: ${{ matrix.python-version >= '3.8' }}
+        if: ${{ matrix.python-version >= '3.8' || contains(fromJson('["3.10", "3.11"]'), matrix.python-version) }}
         run: |
           pip install fastdatetime --no-index --find-links dist --force-reinstall
       - name: Run Python unit tests
         run: |
           pip install -r python/requirements-dev.txt
           python -m pytest -v python/tests/unit
       - name: Upload Python wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -64,22 +61,16 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         target: [x64]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           architecture: ${{ matrix.target }}
-      - name: Update rustup
-        run: rustup self update
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          default: true
+        uses: dtolnay/rust-toolchain@stable
       - name: Build Rust crate
         if: matrix.target == 'x64'
         run: cargo build --release
@@ -90,7 +81,7 @@ jobs:
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: -i python --release --out dist --no-sdist
+          args: -i python --release --out dist
       - name: Install Python wheels
         run: |
           pip install fastdatetime --no-index --find-links dist --force-reinstall
@@ -99,7 +90,7 @@ jobs:
           pip install -r python/requirements-dev.txt
           python -m pytest -v python/tests/unit
       - name: Upload Python wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -108,29 +99,25 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         target: [x86_64, i686]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install Rust toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        profile: minimal
-        default: true
+      uses: dtolnay/rust-toolchain@stable
     - name: Build Rust crate
       run: cargo build --release
     - name: Run Rust unit tests
       run: cargo test --no-default-features --release
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Build Python wheels
       uses: messense/maturin-action@v1
       with:
         target: ${{ matrix.target }}
         manylinux: auto
-        args: -i python${{ matrix.python-version }} --release --out dist --no-sdist
+        args: -i python${{ matrix.python-version }} --release --out dist
     - name: Run Python unit tests
       if: matrix.target == 'x86_64'
       run: |
@@ -143,7 +130,7 @@ jobs:
         pip install -r python/requirements-dev.txt
         python -m pytest -v --benchmark-only python/tests/perf
     - name: Upload Python wheels
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheels
         path: dist
@@ -153,35 +140,22 @@ jobs:
     strategy:
       matrix:
         python: [
-          { version: '3.7', abi: 'cp37-cp37m' },
-          { version: '3.8', abi: 'cp38-cp38' },
-          { version: '3.9', abi: 'cp39-cp39' },
-          { version: '3.10', abi: 'cp310-cp310' },
+          '3.7',
+          '3.8',
+          '3.9',
+          '3.10',
+          '3.11',
         ]
-        target: [aarch64, armv7, s390x, ppc64le, ppc64]
-        include:
-          - python:
-              version: 3.7
-              abi: pp37-pypy37_pp73
-            target: aarch64
-          - python:
-              version: 3.8
-              abi: pp38-pypy38_pp73
-            target: aarch64
+        target: [aarch64, armv7]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build Python wheels
       uses: messense/maturin-action@v1
-      env:
-        PYO3_CROSS_LIB_DIR: /opt/python/${{ matrix.python.abi }}
       with:
         target: ${{ matrix.target }}
         manylinux: auto
-        args: -i python3.9 --release --out dist --no-sdist 
-    - uses: uraimo/run-on-arch-action@v2.0.5
-      # run-on-arch-action doesn't have ppc64 support
-      # skipped cross compiled pypy wheel tests for now
-      if: ${{ matrix.target != 'ppc64' && !startsWith(matrix.python.abi, 'pp') }}
+        args: -i ${{ matrix.python }} --release --out dist
+    - uses: uraimo/run-on-arch-action@v2.3.0
       name: Install Python wheels
       with:
         arch: ${{ matrix.target }}
@@ -195,77 +169,16 @@ jobs:
           apt-get install -y --no-install-recommends python3 python3-venv software-properties-common
           add-apt-repository ppa:deadsnakes/ppa
           apt-get update
-          apt-get install -y curl python3.7-venv python3.9-venv python3.10-venv
+          apt-get install -y curl python3.7-venv python3.9-venv python3.10-venv python3.11-venv
         run: |
           ls -lrth /artifacts
-          PYTHON=python${{ matrix.python.version }}
+          PYTHON=python${{ matrix.python }}
           $PYTHON -m venv venv
           venv/bin/pip install -U pip
           venv/bin/pip install fastdatetime --no-index --find-links /artifacts --force-reinstall
           venv/bin/python -c 'import fastdatetime'
     - name: Upload Python wheels
-      uses: actions/upload-artifact@v2
-      with:
-        name: wheels
-        path: dist
-
-  pypy-linux:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python: [
-          { version: pypy-3.7, abi: pp37-pypy37_pp73 },
-          { version: pypy-3.8, abi: pp38-pypy38_pp73 },
-        ]
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python.version }}
-    - name: Build Pypy wheels
-      uses: messense/maturin-action@v1
-      with:
-        target: ${{ matrix.target }}
-        manylinux: auto
-        args: -i /opt/python/${{ matrix.python.abi }}/bin/pypy --release --out dist --no-sdist 
-    - name: Run Pypy import check
-      run: |
-        pip install fastdatetime --no-index --find-links dist
-        pypy -c "import fastdatetime"
-    - name: Upload Pypy wheels
-      uses: actions/upload-artifact@v2
-      with:
-        name: wheels
-        path: dist
-
-  pypy-macos:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        python-version: [ pypy-3.7, pypy-3.8 ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install Rust toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        profile: minimal
-        default: true
-    - uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install maturin
-      run: pip install maturin
-    - name: Build Pypy wheels
-      run: |
-        maturin build -i $(which pypy) --release --out dist
-        ls -l dist
-    - name: Run Pypy import check
-      run: |
-        pip install fastdatetime --no-index --find-links dist
-        pypy -c "import fastdatetime"
-    - name: Upload Pypy wheels
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheels
         path: dist
@@ -274,18 +187,18 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     if: "startsWith(github.ref, 'refs/tags/')"
-    needs: [ macos, windows, linux, linux-cross, pypy-linux, pypy-macos ]
+    needs: [ macos, windows, linux, linux-cross ]
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: '3.10'
       - name: Publish to PyPi
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
-          pip install --upgrade wheel pip setuptools twine
+          pip install --upgrade twine
           twine upload --skip-existing *

Cargo.toml

@@ -1,25 +1,21 @@
 [package]
 name = "fastdatetime"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 
 [lib]
 name = "fastdatetime"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = {version = "~0.16", features = ["extension-module"]}
-chrono = "~0.4"
-time = {version = "~0.3", features = ["parsing", "formatting"]}
-time-fmt = "~0.3.7"
+pyo3 = {version = "~0.18.2", features = ["extension-module"]}
+chrono = "~0.4.24"
+time = {version = "~0.3.20", features = ["parsing", "formatting"]}
+time-fmt = "~0.3.8"
 time-tz = "~0.5"
 dtparse = "1.2.0"
 
 [profile.release]
 lto = "fat"
 codegen-units = 1
 opt-level = 3
-
-[package.metadata.maturin]
-python-source = "python"
-project-url = { homepage = "https://github.com/m1so/fastdatetime" }

pyproject.toml

@@ -1,9 +1,10 @@
 [project]
 name = "fastdatetime"
-version = "0.3.1"
+version = "0.3.2"
 description = "Like datetime, but fast"
 keywords = ["datetime", "parsing", "iso8601", "rfc3339"]
 requires-python = ">=3.7"
+repository = "https://github.com/m1so/fastdatetime"
 readme = "README.md"
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -14,5 +15,8 @@ classifiers = [
 text = "MIT OR Apache-2.0"
 
 [build-system]
-requires = ["maturin>=0.12,<0.13"]
-build-backend = "maturin"
+requires = ["maturin>=0.14,<0.15"]
+build-backend = "maturin"
+
+[tool.maturin]
+python-source = "src"

src/lib.rs

@@ -1,6 +1,7 @@
 use chrono::format::{parse, Parsed, StrftimeItems};
 
-use pyo3::{once_cell::GILOnceCell, prelude::*};
+use pyo3::once_cell::GILOnceCell;
+use pyo3::prelude::*;
 use time_fmt::parse::{
     parse_date_time_maybe_with_zone, parse_strict_date_time_maybe_with_zone, TimeZoneSpecifier,
 };
@@ -13,8 +14,9 @@ use interop::TryIntoPy;
 
 static DEFAULT_PARSER: GILOnceCell<dtparse::Parser> = GILOnceCell::new();
 
-#[pyfunction(date_string, "/", "*", dayfirst = "false", yearfirst = "false")]
+#[pyfunction]
 #[pyo3(name = "parse")]
+#[pyo3(signature = (date_string, /, *, dayfirst=false, yearfirst=false))]
 fn parse_from_py(
     py: Python<'_>,
     date_string: &str,