Skip to content

Commit

Permalink
Merge pull request #9 from jawah/harmonize-deps
Browse files Browse the repository at this point in the history
Harmonize deps
  • Loading branch information
Ousret authored Oct 20, 2024
2 parents 98065df + 4eb731a commit 810b80c
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 25 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:
jobs:

lint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
Expand All @@ -33,7 +33,7 @@ jobs:
test:
strategy:
matrix:
os: [ubuntu-latest, macos-12, windows-latest ]
os: [ubuntu-22.04, macos-12, windows-latest ]
python_version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10']
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -45,16 +45,16 @@ jobs:
- name: Setup dependencies
run: pip install --upgrade pip pytest
- name: Install mkcert (Linux)
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu-22.04'
run: sudo apt-get install mkcert
- name: Install mkcert (MacOS)
if: matrix.os == 'macos-12'
run: brew install mkcert
- name: Inject fake CA in TrustStore
if: matrix.os == 'macos-12' || matrix.os == 'ubuntu-latest'
if: matrix.os == 'macos-12' || matrix.os == 'ubuntu-22.04'
run: mkcert -install
- name: Generate a valid certificate
if: matrix.os == 'macos-12' || matrix.os == 'ubuntu-latest'
if: matrix.os == 'macos-12' || matrix.os == 'ubuntu-22.04'
run: mkcert example.test
- name: Build wheels (Unix, Linux)
if: matrix.os != 'windows-latest'
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
name: Run tests

linux:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs:
- test
- lint
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
needs:
- test
- lint
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Build sdist
Expand All @@ -204,7 +204,7 @@ jobs:
needs:
- test
- lint
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
Expand All @@ -224,7 +224,7 @@ jobs:

checksum:
name: compute hashes
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: [linux, windows, macos, sdist, universal]
if: "startsWith(github.ref, 'refs/tags/')"
outputs:
Expand Down Expand Up @@ -259,7 +259,7 @@ jobs:

release:
name: release
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: "startsWith(github.ref, 'refs/tags/')"
needs: provenance
environment: pypi
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
All notable changes to wassima will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## 1.1.4 (2024-10-20)

### Changed
- Harmonized requirements in project metadata whether you fetch the pure Python wheel or not. (#8)

## 1.1.3 (2024-10-09)

### Changed
Expand Down
18 changes: 9 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wassima"
version = "1.1.3"
version = "1.1.4"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
4 changes: 2 additions & 2 deletions pyproject.fb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ license-files = { paths = ["LICENSE"] }
license = "MIT"
keywords = ["truststore", "ssl", "tls", "root ca", "ca", "trust", "https", "certificate"]
authors = [
{name = "Ahmed R. TAHRI", email="ahmed.tahri@cloudnursery.dev"},
{name = "Ahmed R. TAHRI", email="tahri[email protected]"},
]
maintainers = [
{name = "Ahmed R. TAHRI", email="ahmed.tahri@cloudnursery.dev"},
{name = "Ahmed R. TAHRI", email="tahri[email protected]"},
]
requires-python = ">=3.7"
classifiers = [
Expand Down
7 changes: 5 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ readme = "README.md"
license = {file = "LICENSE"}
keywords = ["truststore", "ssl", "tls", "root ca", "ca", "trust", "https", "certificate"]
authors = [
{name = "Ahmed R. TAHRI", email="ahmed.tahri@cloudnursery.dev"},
{name = "Ahmed R. TAHRI", email="tahri[email protected]"},
]
maintainers = [
{name = "Ahmed R. TAHRI", email="ahmed.tahri@cloudnursery.dev"},
{name = "Ahmed R. TAHRI", email="tahri[email protected]"},
]
requires-python = ">=3.7"
classifiers = [
Expand All @@ -35,6 +35,9 @@ classifiers = [
"License :: OSI Approved :: MIT License",
"Development Status :: 5 - Production/Stable"
]
dependencies = [
"certifi; (platform_python_implementation != 'CPython' or python_full_version < '3.7.10') or (platform_system != 'Darwin' and platform_system != 'Windows' and platform_system != 'Linux') or (platform_machine != 'x86_64' and platform_machine != 's390x' and platform_machine != 'aarch64' and platform_machine != 'armv7l' and platform_machine != 'ppc64le' and platform_machine != 'ppc64' and platform_machine != 'AMD64' and platform_machine != 'arm64' and platform_machine != 'ARM64' and platform_machine != 'i686') or (platform_python_implementation == 'PyPy' and python_version >= '3.11')",
]

[project.urls]
"Changelog" = "https://github.com/jawah/wassima/blob/main/CHANGELOG.md"
Expand Down
2 changes: 1 addition & 1 deletion wassima/_version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import annotations

__version__ = "1.1.3"
__version__ = "1.1.4"
VERSION = __version__.split(".")

0 comments on commit 810b80c

Please sign in to comment.