keygen-py 0.0.1.dev5__tar.gz → 0.0.1.dev6__tar.gz

{keygen_py-0.0.1.dev5 → keygen_py-0.0.1.dev6}/.github/workflows/pr-checks.yml

@@ -9,9 +9,22 @@ on:
 permissions:
   contents: read
 
+# Make sure CI fails on all warnings, including Clippy lints
+env:
+  RUSTFLAGS: "-Dwarnings"
+
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run Clippy
+        run: cargo clippy --all-targets --all-features
+
   build:
     name: ${{ matrix.platform.runner }} ${{ matrix.platform.target }} ${{ matrix.platform.manylinux }}
+    needs:
+      - lint
     runs-on: ${{ matrix.platform.runner }}
     strategy:
       fail-fast: true
@@ -19,8 +32,10 @@ jobs:
         platform:
           - runner: ubuntu-latest
             target: x86_64
+            target-platform: linux-64
             before: 'yum install --assumeyes perl-core'
             manylinux: 'auto'
+            create-conda-package: true
           - runner: ubuntu-latest
             target: x86_64
             before: 'apt update && apt install -y libssl-dev'
@@ -54,23 +69,37 @@ jobs:
             manylinux: 'musllinux_1_2'
           - runner: windows-latest
             target: x64
+            target-platform: win-64
+            create-conda-package: true
           - runner: windows-latest
             target: x86
           - runner: macos-latest
             target: x86_64
+            target-platform: osx-64
+            create-conda-package: true
           - runner: macos-latest
             target: aarch64
+            target-platform: osx-arm64
+            create-conda-package: true
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         if: runner.os == 'Windows'
         with:
-          python-version: 3.*
+          python-version: |
+            3.9
+            3.10
+            3.11
+            3.12
           architecture: ${{ matrix.platform.target }}
       - uses: actions/setup-python@v5
         if: runner.os != 'Windows'
         with:
-          python-version: 3.*
+          python-version: |
+            3.9
+            3.10
+            3.11
+            3.12
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
@@ -79,9 +108,19 @@ jobs:
           sccache: 'true'
           manylinux: ${{ matrix.platform.manylinux }}
           before-script-linux: ${{ matrix.platform.before }}
+      - name: Build conda package
+        if: matrix.platform.create-conda-package
+        uses: prefix-dev/rattler-build-action@v0.2.19
+        with:
+          upload-artifact: false
+          artifact-name: conda-${{ matrix.platform.runner }}-${{ matrix.platform.target }}
+          recipe-path: 'conda-recipe/recipe.yaml'
+          build-args: '--target-platform ${{ matrix.platform.target-platform }} --experimental'
 
   sdist:
     runs-on: ubuntu-latest
+    needs:
+      - lint
     steps:
       - uses: actions/checkout@v4
       - name: Build sdist

{keygen_py-0.0.1.dev5 → keygen_py-0.0.1.dev6}/.github/workflows/release.yml

@@ -18,8 +18,10 @@ jobs:
         platform:
           - runner: ubuntu-latest
             target: x86_64
+            target-platform: linux-64
             before: 'yum install --assumeyes perl-core'
             manylinux: 'auto'
+            create-conda-package: true
           - runner: ubuntu-latest
             target: x86_64
             before: 'apt update && apt install -y libssl-dev'
@@ -53,23 +55,37 @@ jobs:
             manylinux: 'musllinux_1_2'
           - runner: windows-latest
             target: x64
+            target-platform: win-64
+            create-conda-package: true
           - runner: windows-latest
             target: x86
           - runner: macos-latest
             target: x86_64
+            target-platform: osx-64
+            create-conda-package: true
           - runner: macos-latest
             target: aarch64
+            target-platform: osx-arm64
+            create-conda-package: true
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         if: runner.os == 'Windows'
         with:
-          python-version: 3.*
+          python-version: |
+            3.9
+            3.10
+            3.11
+            3.12
           architecture: ${{ matrix.platform.target }}
       - uses: actions/setup-python@v5
         if: runner.os != 'Windows'
         with:
-          python-version: 3.*
+          python-version: |
+            3.9
+            3.10
+            3.11
+            3.12
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
@@ -83,6 +99,14 @@ jobs:
         with:
           name: wheels-${{ matrix.platform.runner }}-${{ matrix.platform.manylinux }}-${{ matrix.platform.target }}
           path: dist
+      - name: Build conda package
+        if: matrix.platform.create-conda-package
+        uses: prefix-dev/rattler-build-action@v0.2.19
+        with:
+          upload-artifact: true
+          artifact-name: conda-${{ matrix.platform.runner }}-${{ matrix.platform.target }}
+          recipe-path: 'conda-recipe/recipe.yaml'
+          build-args: '--target-platform ${{ matrix.platform.target-platform }} --experimental'
 
   sdist:
     runs-on: ubuntu-latest
@@ -99,6 +123,7 @@ jobs:
           name: wheels-sdist
           path: dist
 
+
   release:
     name: Release
     runs-on: ubuntu-latest
@@ -109,16 +134,30 @@ jobs:
       attestations: write
     steps:
       - uses: actions/checkout@v4
+      - name: Install rattler-build
+        run: |
+          mkdir -p ${{ runner.temp }}/rattler-build
+          curl -Ls \
+            https://github.com/prefix-dev/rattler-build/releases/latest/download/rattler-build-x86_64-unknown-linux-musl \
+            -o ${{ runner.temp }}/rattler-build/rattler-build
+          chmod +x ${{ runner.temp }}/rattler-build/rattler-build
+          echo ${{ runner.temp }}/rattler-build >> $GITHUB_PATH
       - uses: actions/download-artifact@v4
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v1
         with:
-          subject-path: 'wheels-*/*'
-
+          subject-path: |
+            wheels-*/*
+            conda-*/*
       - name: Get project version
         id: 'pyproject_version'
         run: echo "version=v$(grep -m 1 version pyproject.toml | tr -s ' ' | tr -d '"' | tr -d "'" | cut -d' ' -f3)" >> $GITHUB_OUTPUT
-
+      - name: Publish to prefix.dev channel
+        run: |
+          for pkg in $(find conda-*/* -type f \( -name "*.conda" -o -name "*.tar.bz2" \) ); do
+            echo "Uploading ${pkg}"
+            rattler-build upload prefix -c terraquantumag "${pkg}" 
+          done
       - name: Publish to PyPI
         uses: PyO3/maturin-action@v1
         env:

{keygen_py-0.0.1.dev5 → keygen_py-0.0.1.dev6}/.gitignore

@@ -2,4 +2,7 @@
 .idea
 
 .venv
-venv
+venv
+
+dist
+output

{keygen_py-0.0.1.dev5 → keygen_py-0.0.1.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: keygen-py
-Version: 0.0.1.dev5
+Version: 0.0.1.dev6
 License-File: LICENSE
 Summary: Unofficial Keygen SDK for Python. Integrate license activation and offline licensing. Wrapper around keygen-rs rust crate
 Author-email: Terra Quantum AG <info@terraquantum.swiss>, Cedric Kring <ck@terraquantum.swiss>, Steven Beckers <sb@terraquantum.swiss>

keygen_py-0.0.1.dev6/conda-recipe/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Terra Quantum AG
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

keygen_py-0.0.1.dev6/conda-recipe/recipe.yaml

@@ -0,0 +1,46 @@
+schema_version: 1
+
+context:
+  name: ${{ load_from_file("pyproject.toml").project.name }}
+  version: ${{ load_from_file("pyproject.toml").project.version }}
+
+package:
+  name: ${{ name|lower }}
+  version: ${{ version }}
+
+source:
+  path: ../dist
+  use_gitignore: false
+
+build:
+  script: pip install --find-links . keygen-py
+  number: 0
+
+requirements:
+  build:
+    - python
+  host:
+    - python
+    - pip
+    - setuptools
+    - wheel
+  run:
+    - python
+
+tests:
+  - python:
+      imports:
+        - keygen_sh
+      pip_check: true
+
+about:
+  summary: Unofficial Keygen SDK for Python. Integrate license activation and offline licensing. Wrapper around keygen-rs rust crate
+  license: MIT
+  license_file: LICENSE
+  homepage: https://github.com/terra-quantum-public/keygen-py
+
+extra:
+  recipe-maintainers:
+    - sbtq
+    - cedrictq
+

keygen_py-0.0.1.dev6/conda-recipe/variants.yaml

@@ -0,0 +1,5 @@
+python:
+  - 3.9
+  - 3.10
+  - 3.11
+  - 3.12

{keygen_py-0.0.1.dev5 → keygen_py-0.0.1.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "keygen-py"
-version = "0.0.1.dev5"
+version = "0.0.1.dev6"
 license = "MIT"
 description = "Unofficial Keygen SDK for Python. Integrate license activation and offline licensing. Wrapper around keygen-rs rust crate"
 requires-python = ">=3.9"

{keygen_py-0.0.1.dev5 → keygen_py-0.0.1.dev6}/src/config.rs

@@ -13,6 +13,7 @@ impl KeygenConfig {
     #[pyo3(signature = (api_url, api_version, api_prefix, account, product, package=None, environment=None, license_key=None, token=None, public_key=None, platform=None, user_agent=None, max_clock_drift=5)
     )]
     #[new]
+    #[allow(clippy::too_many_arguments)]
     pub fn new(api_url: String,
                api_version: String,
                api_prefix: String,
@@ -34,7 +35,7 @@ impl KeygenConfig {
                 api_prefix,
                 account,
                 product,
-                package: package.or(Some("".to_string())).unwrap(),
+                package: package.unwrap_or("".to_string()),
                 environment,
                 license_key,
                 token,
@@ -47,8 +48,8 @@ impl KeygenConfig {
     }
 }
 
-impl Into<config::KeygenConfig> for KeygenConfig {
-    fn into(self) -> config::KeygenConfig {
-        self.inner
+impl From<KeygenConfig> for config::KeygenConfig {
+    fn from(val: KeygenConfig) -> Self {
+        val.inner
     }
 }

{keygen_py-0.0.1.dev5 → keygen_py-0.0.1.dev6}/src/lib.rs

@@ -29,8 +29,8 @@ fn validate<'a>(py: Python<'a>, fingerprints: Option<Bound<'a, PyList>>, entitle
     let fingerprints = fingerprints.unwrap_or_else(|| PyList::empty_bound(py));
     let entitlements = entitlements.unwrap_or_else(|| PyList::empty_bound(py));
 
-    let fingerprints_vec = pylist_to_string_slice(fingerprints.into())?;
-    let entitlements_vec = pylist_to_string_slice(entitlements.into())?;
+    let fingerprints_vec = pylist_to_string_slice(fingerprints)?;
+    let entitlements_vec = pylist_to_string_slice(entitlements)?;
 
     pyo3_async_runtimes::tokio::future_into_py(py, async move {
         let result = keygen_rs::validate(&fingerprints_vec, &entitlements_vec).await;

{keygen_py-0.0.1.dev5 → keygen_py-0.0.1.dev6}/src/license.rs

@@ -36,9 +36,9 @@ impl License {
     }
 }
 
-impl Into<license::SchemeCode> for SchemeCode {
-    fn into(self) -> license::SchemeCode {
-        match self {
+impl From<SchemeCode> for license::SchemeCode {
+    fn from(val: SchemeCode) -> Self {
+        match val {
             SchemeCode::Ed25519Sign => license::SchemeCode::Ed25519Sign,
         }
     }