pyrelukko 0.6.0__tar.gz → 0.7.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of pyrelukko might be problematic. Click here for more details.

Files changed (31) hide show
  1. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/.gitlab-ci.yml +15 -0
  2. pyrelukko-0.7.0/PKG-INFO +40 -0
  3. pyrelukko-0.7.0/README.md +19 -0
  4. pyrelukko-0.7.0/cicd/run_publish.sh +11 -0
  5. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/cicd/run_pytest.sh +1 -1
  6. pyrelukko-0.7.0/cicd/tox_publish.sh +27 -0
  7. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/pyproject.toml +24 -5
  8. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/src/pyrelukko/testcontainers.py +5 -2
  9. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/src/pyrelukko/version.py +1 -1
  10. pyrelukko-0.6.0/PKG-INFO +0 -24
  11. pyrelukko-0.6.0/README.md +0 -3
  12. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/LICENSE +0 -0
  13. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/cicd/run_docs_pages.sh +0 -0
  14. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/cicd/run_pylint.sh +0 -0
  15. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/cicd/run_shellcheck.sh +0 -0
  16. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/cicd/tox_docs_pages.sh +0 -0
  17. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/cicd/tox_shellcheck.sh +0 -0
  18. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/src/pyrelukko/__init__.py +0 -0
  19. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/src/pyrelukko/pyrelukko.py +0 -0
  20. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/src/pyrelukko/retry.py +0 -0
  21. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/tests/cert/5d868fca.0 +0 -0
  22. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/tests/cert/README.md +0 -0
  23. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/tests/cert/relukko.crt +0 -0
  24. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/tests/cert/relukko.csr +0 -0
  25. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/tests/cert/relukko.key +0 -0
  26. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/tests/cert/rootCA.crt +0 -0
  27. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/tests/cert/rootCA.der +0 -0
  28. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/tests/cert/rootCA.key +0 -0
  29. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/tests/cert/rootCA.srl +0 -0
  30. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/tests/conftest.py +0 -0
  31. {pyrelukko-0.6.0 → pyrelukko-0.7.0}/tests/test_relukko.py +0 -0
{pyrelukko-0.6.0 → pyrelukko-0.7.0}/.gitlab-ci.yml RENAMED
@@ -120,6 +120,21 @@ run-shellcheck:
120
120
  - ./cicd/run_shellcheck.sh
121
121
 
122
122
 
123
+ publish:
124
+ stage: deploy
125
+ image: "registry.gitlab.com/relukko/py-tox-images/py-3.13-tox"
126
+ environment: publish
127
+ rules:
128
+ - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/ && $CI_PIPELINE_SOURCE == "push"
129
+ id_tokens:
130
+ PYPI_ID_TOKEN:
131
+ aud: pypi
132
+ before_script:
133
+ - echo "Publishing to PyPi..."
134
+ script:
135
+ - ./cicd/run_publish.sh
136
+
137
+
123
138
  # pages:
124
139
  # stage: deploy
125
140
  # image: "registry.gitlab.com/relukko/py-tox-images/py-3.13-tox"
pyrelukko-0.7.0/PKG-INFO ADDED
@@ -0,0 +1,40 @@
1
+ Metadata-Version: 2.3
2
+ Name: pyrelukko
3
+ Version: 0.7.0
4
+ Summary: Relukko client.
5
+ Author-email: Reto Zingg <g.d0b3rm4n@gmail.com>
6
+ Requires-Python: >=3.11
7
+ Description-Content-Type: text/markdown
8
+ Classifier: Development Status :: 4 - Beta
9
+ Classifier: Intended Audience :: Developers
10
+ Classifier: License :: OSI Approved :: MIT License
11
+ Classifier: Topic :: Internet :: WWW/HTTP
12
+ Classifier: Topic :: Software Development :: Libraries :: Python Modules
13
+ Classifier: Programming Language :: Python :: 3.11
14
+ Classifier: Programming Language :: Python :: 3.12
15
+ Classifier: Programming Language :: Python :: 3.13
16
+ Requires-Dist: requests >=2.32.3
17
+ Requires-Dist: websockets >= 14.1
18
+ Project-URL: Homepage, https://gitlab.com/relukko/pyrelukko
19
+ Project-URL: Issues, https://gitlab.com/relukko/pyrelukko/-/issues
20
+
21
+ # PyRelukko
22
+
23
+ [![PyPI - Version](https://img.shields.io/pypi/v/pyrelukko.svg)](https://pypi.org/project/pyrelukko)
24
+ [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pyrelukko.svg)](https://pypi.org/project/pyrelukko)
25
+ ![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fgitlab.com%2Frelukko%2Fpyrelukko%2F-%2Fraw%2Fmaster%2Fpyproject.toml%3Fref_type%3Dheads)
26
+ ![Gitlab Pipeline Status](https://img.shields.io/gitlab/pipeline-status/relukko%2Fpyrelukko?branch=master)
27
+ ![PyPI - Downloads](https://img.shields.io/pypi/dm/pyrelukko)
28
+ ![PyPI - License](https://img.shields.io/pypi/l/pyrelukko)
29
+ ![GitLab License](https://img.shields.io/gitlab/license/relukko%2Fpyrelukko)
30
+ ![PyPI - Format](https://img.shields.io/pypi/format/pyrelukko)
31
+ ![PyPI - Status](https://img.shields.io/pypi/status/pyrelukko)
32
+ ![PyPI - Implementation](https://img.shields.io/pypi/implementation/pyrelukko)
33
+ ![PyPI - Wheel](https://img.shields.io/pypi/wheel/pyrelukko)
34
+ ![GitLab Stars](https://img.shields.io/gitlab/stars/relukko%2Fpyrelukko)
35
+ ![GitLab Forks](https://img.shields.io/gitlab/forks/relukko%2Fpyrelukko)
36
+ -----
37
+
38
+ Python library to access a
39
+ [Relukko back-end](https://gitlab.com/relukko/relukko).
40
+
pyrelukko-0.7.0/README.md ADDED
@@ -0,0 +1,19 @@
1
+ # PyRelukko
2
+
3
+ [![PyPI - Version](https://img.shields.io/pypi/v/pyrelukko.svg)](https://pypi.org/project/pyrelukko)
4
+ [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pyrelukko.svg)](https://pypi.org/project/pyrelukko)
5
+ ![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fgitlab.com%2Frelukko%2Fpyrelukko%2F-%2Fraw%2Fmaster%2Fpyproject.toml%3Fref_type%3Dheads)
6
+ ![Gitlab Pipeline Status](https://img.shields.io/gitlab/pipeline-status/relukko%2Fpyrelukko?branch=master)
7
+ ![PyPI - Downloads](https://img.shields.io/pypi/dm/pyrelukko)
8
+ ![PyPI - License](https://img.shields.io/pypi/l/pyrelukko)
9
+ ![GitLab License](https://img.shields.io/gitlab/license/relukko%2Fpyrelukko)
10
+ ![PyPI - Format](https://img.shields.io/pypi/format/pyrelukko)
11
+ ![PyPI - Status](https://img.shields.io/pypi/status/pyrelukko)
12
+ ![PyPI - Implementation](https://img.shields.io/pypi/implementation/pyrelukko)
13
+ ![PyPI - Wheel](https://img.shields.io/pypi/wheel/pyrelukko)
14
+ ![GitLab Stars](https://img.shields.io/gitlab/stars/relukko%2Fpyrelukko)
15
+ ![GitLab Forks](https://img.shields.io/gitlab/forks/relukko%2Fpyrelukko)
16
+ -----
17
+
18
+ Python library to access a
19
+ [Relukko back-end](https://gitlab.com/relukko/relukko).
pyrelukko-0.7.0/cicd/run_publish.sh ADDED
@@ -0,0 +1,11 @@
1
+ #!/bin/bash
2
+
3
+ # Main script execution
4
+ main() {
5
+ tox run -e publish
6
+ }
7
+
8
+ # Execute the main function
9
+ main
10
+
11
+ # vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
{pyrelukko-0.6.0 → pyrelukko-0.7.0}/cicd/run_pytest.sh RENAMED
@@ -2,7 +2,7 @@
2
2
 
3
3
  # Main script execution
4
4
  main() {
5
- tox run --skip-missing-interpreters --skip-env 'pylint|shellcheck|docs'
5
+ tox run --skip-missing-interpreters --skip-env 'pylint|shellcheck|docs|publish'
6
6
  }
7
7
 
8
8
  # Execute the main function
pyrelukko-0.7.0/cicd/tox_publish.sh ADDED
@@ -0,0 +1,27 @@
1
+ #!/bin/bash
2
+
3
+ export FLIT_INDEX_URL="https://upload.pypi.org/legacy/"
4
+ export FLIT_USERNAME="__token__"
5
+
6
+ # Main script execution
7
+ main() {
8
+ echo "CI: ${CI}"
9
+ if [[ "${CI}" == "true" ]]; then
10
+ echo "Push to PyPi!"
11
+ # Retrieve the OIDC token from GitLab CI/CD,
12
+ # and exchange it for a PyPI API token
13
+ oidc_token=$(python -m id PYPI)
14
+ resp=$(curl -X POST https://pypi.org/_/oidc/mint-token \
15
+ -d "{\"token\":\"${oidc_token}\"}")
16
+ api_token=$(jq --raw-output '.token' <<< "${resp}")
17
+
18
+ FLIT_PASSWORD="${api_token}" flit publish
19
+ else
20
+ echo "Running local, will not push to PyPi!"
21
+ fi
22
+ }
23
+
24
+ # Execute the main function
25
+ main
26
+
27
+ # vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
{pyrelukko-0.6.0 → pyrelukko-0.7.0}/pyproject.toml RENAMED
@@ -16,7 +16,7 @@ classifiers = [
16
16
  "Programming Language :: Python :: 3.12",
17
17
  "Programming Language :: Python :: 3.13",
18
18
  ]
19
- requires-python = ">=3.10"
19
+ requires-python = ">=3.11"
20
20
  dynamic = ["version", "description"]
21
21
  dependencies = [
22
22
  "requests >=2.32.3",
@@ -37,9 +37,13 @@ lint = [
37
37
  coverage = [
38
38
  "pytest-cov"
39
39
  ]
40
+ publish = [
41
+ "flit >=3.2,<4",
42
+ "id"
43
+ ]
40
44
 
41
45
  [tool.flit.sdist]
42
- exclude = [".gitignore", "demo.py"]
46
+ exclude = [".gitignore", "demo.py", "utils"]
43
47
 
44
48
  [project.urls]
45
49
  Homepage = "https://gitlab.com/relukko/pyrelukko"
@@ -74,17 +78,32 @@ env_list = [
74
78
  "3.11",
75
79
  "3.12",
76
80
  "3.13",
81
+ "docs",
82
+ "publish",
77
83
  "pylint",
78
- "shellcheck",
79
- "docs"
84
+ "shellcheck"
80
85
  ]
81
86
 
82
87
  [tool.tox.env_run_base]
83
88
  description = "Run test under {base_python}"
84
89
  commands = [["pytest", "--junit-xml", "pytest-junit-{env_name}.xml", "--junit-prefix", "{env_name}"]]
85
- pass_env = [ "TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE", "DOCKER_HOST", "CI_HAS_RELUKKO", "CI_RELUKKO_*" ]
90
+ pass_env = [
91
+ "CI",
92
+ "CI_HAS_RELUKKO",
93
+ "CI_RELUKKO_*",
94
+ "DOCKER_HOST",
95
+ "GITLAB_CI",
96
+ "PYPI_ID_TOKEN",
97
+ "TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE"
98
+ ]
86
99
  dependency_groups = [ "test" ]
87
100
 
101
+ [tool.tox.env.publish]
102
+ description = "Publish PyRelukko to PyPi"
103
+ dependency_groups = [ "publish" ]
104
+ allowlist_externals = ["curl", "jq", "{tox_root}/cicd/tox_publish.sh"]
105
+ commands = [[ "{tox_root}/cicd/tox_publish.sh" ]]
106
+
88
107
  [tool.tox.env.pylint]
89
108
  description = "Run PyLint with {base_python}"
90
109
  dependency_groups = [ "lint" ]
{pyrelukko-0.6.0 → pyrelukko-0.7.0}/src/pyrelukko/testcontainers.py RENAMED
@@ -14,6 +14,7 @@ def relukko_backend():
14
14
  base_url=backend.get_api_url(), api_key="somekey")
15
15
  yield relukko, backend
16
16
  """
17
+ import os
17
18
  import socket
18
19
 
19
20
  from testcontainers.core.network import Network
@@ -24,10 +25,12 @@ from testcontainers.postgres import PostgresContainer
24
25
 
25
26
  class RelukkoContainer(ServerContainer):
26
27
  def __init__(self, net: Network,
27
- image="registry.gitlab.com/relukko/relukko:latest", db_url=None):
28
+ image="registry.gitlab.com/relukko/relukko:latest",
29
+ db_url=None):
30
+ container_image = os.environ.get('CI_RELUKKO_CONTAINER_IMAGE') or image
28
31
  self.db_url = db_url
29
32
  self.net = net
30
- super(RelukkoContainer, self).__init__(image=image, port=3000)
33
+ super(RelukkoContainer, self).__init__(image=container_image, port=3000)
31
34
 
32
35
  def _configure(self):
33
36
  self.with_env("DATABASE_URL", self.db_url)
{pyrelukko-0.6.0 → pyrelukko-0.7.0}/src/pyrelukko/version.py RENAMED
@@ -1,2 +1,2 @@
1
1
  # pylint: disable=all
2
- __version__ = "0.6.0"
2
+ __version__ = "0.7.0"
pyrelukko-0.6.0/PKG-INFO DELETED
@@ -1,24 +0,0 @@
1
- Metadata-Version: 2.3
2
- Name: pyrelukko
3
- Version: 0.6.0
4
- Summary: Relukko client.
5
- Author-email: Reto Zingg <g.d0b3rm4n@gmail.com>
6
- Requires-Python: >=3.10
7
- Description-Content-Type: text/markdown
8
- Classifier: Development Status :: 4 - Beta
9
- Classifier: Intended Audience :: Developers
10
- Classifier: License :: OSI Approved :: MIT License
11
- Classifier: Topic :: Internet :: WWW/HTTP
12
- Classifier: Topic :: Software Development :: Libraries :: Python Modules
13
- Classifier: Programming Language :: Python :: 3.11
14
- Classifier: Programming Language :: Python :: 3.12
15
- Classifier: Programming Language :: Python :: 3.13
16
- Requires-Dist: requests >=2.32.3
17
- Requires-Dist: websockets >= 14.1
18
- Project-URL: Homepage, https://gitlab.com/relukko/pyrelukko
19
- Project-URL: Issues, https://gitlab.com/relukko/pyrelukko/-/issues
20
-
21
- # PyRelukko
22
- Python library to access a
23
- [Relukko back-end](https://gitlab.com/relukko/relukko).
24
-
pyrelukko-0.6.0/README.md DELETED
@@ -1,3 +0,0 @@
1
- # PyRelukko
2
- Python library to access a
3
- [Relukko back-end](https://gitlab.com/relukko/relukko).
{pyrelukko-0.6.0 → pyrelukko-0.7.0}/LICENSE RENAMED
File without changes
{pyrelukko-0.6.0 → pyrelukko-0.7.0}/cicd/run_pylint.sh RENAMED
File without changes
{pyrelukko-0.6.0 → pyrelukko-0.7.0}/tests/conftest.py RENAMED
File without changes