pyrelukko 0.6.0__tar.gz → 0.6.1__tar.gz

{pyrelukko-0.6.0 → pyrelukko-0.6.1}/.gitlab-ci.yml

@@ -120,6 +120,21 @@ run-shellcheck:
     - ./cicd/run_shellcheck.sh
 
 
+publish:
+  stage: deploy
+  image: "registry.gitlab.com/relukko/py-tox-images/py-3.13-tox"
+  environment: publish
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/ && $CI_PIPELINE_SOURCE == "push"
+  id_tokens:
+    PYPI_ID_TOKEN:
+      aud: pypi
+  before_script:
+    - echo "Publishing to PyPi..."
+  script:
+    - ./cicd/run_publish.sh
+
+
 # pages:
 #   stage: deploy
 #   image: "registry.gitlab.com/relukko/py-tox-images/py-3.13-tox"

{pyrelukko-0.6.0 → pyrelukko-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyrelukko
-Version: 0.6.0
+Version: 0.6.1
 Summary: Relukko client.
 Author-email: Reto Zingg <g.d0b3rm4n@gmail.com>
 Requires-Python: >=3.10

pyrelukko-0.6.1/cicd/run_publish.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Main script execution
+main() {
+    tox run -e publish
+}
+
+# Execute the main function
+main
+
+# vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:

pyrelukko-0.6.1/cicd/tox_publish.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+export FLIT_INDEX_URL="https://upload.pypi.org/legacy/"
+export FLIT_USERNAME="__token__"
+
+# Main script execution
+main() {
+    echo "CI: ${CI}"
+    if [[ "${CI}" == "true" ]]; then
+        echo "Push to PyPi!"
+        # Retrieve the OIDC token from GitLab CI/CD,
+        # and exchange it for a PyPI API token
+        oidc_token=$(python -m id PYPI)
+        resp=$(curl -X POST https://pypi.org/_/oidc/mint-token \
+               -d "{\"token\":\"${oidc_token}\"}")
+        api_token=$(jq --raw-output '.token' <<< "${resp}")
+
+        FLIT_PASSWORD="${api_token}" flit publish
+    else
+        echo "Running local, will not push to PyPi!"
+    fi
+}
+
+# Execute the main function
+main
+
+# vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:

{pyrelukko-0.6.0 → pyrelukko-0.6.1}/pyproject.toml

@@ -37,6 +37,10 @@ lint = [
 coverage = [
     "pytest-cov"
 ]
+publish = [
+    "flit >=3.2,<4",
+    "id"
+]
 
 [tool.flit.sdist]
 exclude = [".gitignore", "demo.py"]
@@ -74,17 +78,32 @@ env_list = [
     "3.11",
     "3.12",
     "3.13",
+    "docs",
+    "publish",
     "pylint",
-    "shellcheck",
-    "docs"
+    "shellcheck"
 ]
 
 [tool.tox.env_run_base]
 description = "Run test under {base_python}"
 commands = [["pytest", "--junit-xml", "pytest-junit-{env_name}.xml", "--junit-prefix", "{env_name}"]]
-pass_env = [ "TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE", "DOCKER_HOST", "CI_HAS_RELUKKO", "CI_RELUKKO_*" ]
+pass_env = [
+    "CI",
+    "CI_HAS_RELUKKO",
+    "CI_RELUKKO_*",
+    "DOCKER_HOST",
+    "GITLAB_CI",
+    "PYPI_ID_TOKEN",
+    "TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE"
+]
 dependency_groups = [ "test" ]
 
+[tool.tox.env.publish]
+description = "Publish PyRelukko to PyPi"
+dependency_groups = [ "publish" ]
+allowlist_externals = ["curl", "jq", "{tox_root}/cicd/tox_publish.sh"]
+commands = [[ "{tox_root}/cicd/tox_publish.sh" ]]
+
 [tool.tox.env.pylint]
 description = "Run PyLint with {base_python}"
 dependency_groups = [ "lint" ]

{pyrelukko-0.6.0 → pyrelukko-0.6.1}/src/pyrelukko/version.py

@@ -1,2 +1,2 @@
 # pylint: disable=all
-__version__ = "0.6.0"
+__version__ = "0.6.1"