From 64d17b341b89128915557babccf0149e893ba8f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 11:51:23 +0000 Subject: [PATCH 1/4] Update pyo3 requirement from 0.22.0 to 0.23.3 Updates the requirements on [pyo3](https://github.com/pyo3/pyo3) to permit the latest version. - [Release notes](https://github.com/pyo3/pyo3/releases) - [Changelog](https://github.com/PyO3/pyo3/blob/main/CHANGELOG.md) - [Commits](https://github.com/pyo3/pyo3/commits) --- updated-dependencies: - dependency-name: pyo3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 47307c7..0172081 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ name = "hifitime" [dependencies] serde = { version = "1.0.155", optional = true } serde_derive = { version = "1.0.155", optional = true } -pyo3 = { version = "0.22.0", features = [ +pyo3 = { version = "0.23.3", features = [ "extension-module", "multiple-pymethods", ], optional = true } From 9dd0bd5e55e23b1b9b0fd26fa4bfbd36ae2e499a Mon Sep 17 00:00:00 2001 From: Christopher Rabotin Date: Mon, 9 Dec 2024 21:20:13 -0700 Subject: [PATCH 2/4] Update pyo3 tests --- .github/workflows/python.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index aa1a046..b31fdfe 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -24,16 +24,17 @@ jobs: strategy: matrix: target: [x86_64, x86, aarch64, armv7, ppc64le] + version: ['3.9', '3.10', '3.11', '3.12', '3.13'] + steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - name: Setup Python ${{ matrix.python-version }} on ${{ matrix.target }} + uses: actions/setup-python@v5 with: - python-version: '3.11' - check-latest: false - allow-prereleases: false + python-version: ${{ matrix.version }} - - name: Fix openssl regression - run: cargo update openssl-src --precise 300.3.1+3.3.1 + # - name: Fix openssl regression + # run: cargo update openssl-src --precise 300.3.1+3.3.1 - name: Build wheels uses: PyO3/maturin-action@v1 From 21425820f2beae7b6560f7f7e624db404f4452cf Mon Sep 17 00:00:00 2001 From: Christopher Rabotin Date: Mon, 9 Dec 2024 21:28:01 -0700 Subject: [PATCH 3/4] Trying to revert to known version of ubuntu --- .github/workflows/python.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index b31fdfe..11787a6 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -20,18 +20,17 @@ permissions: jobs: linux: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: target: [x86_64, x86, aarch64, armv7, ppc64le] - version: ['3.9', '3.10', '3.11', '3.12', '3.13'] steps: - uses: actions/checkout@v4 - - name: Setup Python ${{ matrix.python-version }} on ${{ matrix.target }} + - name: Setup Python on ${{ matrix.target }} uses: actions/setup-python@v5 with: - python-version: ${{ matrix.version }} + python-version: ">=3.9" # - name: Fix openssl regression # run: cargo update openssl-src --precise 300.3.1+3.3.1 From bb8ccc957f48e74050c061094b6aeb94932fa54b Mon Sep 17 00:00:00 2001 From: Christopher Rabotin Date: Mon, 9 Dec 2024 21:57:42 -0700 Subject: [PATCH 4/4] Disable formal verif + increase minimum python version + fix license --- .github/workflows/formal_verification.yml | 4 ++-- Cargo.toml | 2 +- pyproject.toml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/formal_verification.yml b/.github/workflows/formal_verification.yml index 0f4aabf..f7407ec 100644 --- a/.github/workflows/formal_verification.yml +++ b/.github/workflows/formal_verification.yml @@ -27,5 +27,5 @@ jobs: sed '17d' Cargo.toml > Cargo.toml.new mv Cargo.toml.new Cargo.toml - - name: Kani Rust Verifier - uses: model-checking/kani-github-action@0.23 + # - name: Kani Rust Verifier + # uses: model-checking/kani-github-action@0.23 diff --git a/Cargo.toml b/Cargo.toml index 0172081..da4ae65 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://github.com/nyx-space/hifitime" keywords = ["date", "time", "science", "leap-second", "no-std"] categories = ["date-and-time", "no-std"] readme = "README.md" -license = "Apache-2.0" +license = "MPL-2.0" exclude = ["*.tar.gz", "data/"] edition = "2021" diff --git a/pyproject.toml b/pyproject.toml index 1bbac78..3259c8a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["maturin>=1.6,<1.7"] +requires = ["maturin>=1.7,<1.8"] build-backend = "maturin" [tool.maturin] @@ -8,7 +8,7 @@ features = ["python"] [project] name = "hifitime" -requires-python = ">=3.7" +requires-python = ">=3.9" classifiers = [ "Development Status :: 5 - Production/Stable", "Topic :: Scientific/Engineering :: Astronomy",