offspot-config 2.4.1__tar.gz → 2.4.2__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.
Files changed (59) hide show
  1. {offspot_config-2.4.1 → offspot_config-2.4.2}/CHANGELOG.md +6 -0
  2. {offspot_config-2.4.1 → offspot_config-2.4.2}/PKG-INFO +1 -1
  3. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/builder.py +5 -1
  4. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/packages.py +5 -11
  5. offspot_config-2.4.2/src/offspot_runtime/__about__.py +1 -0
  6. offspot_config-2.4.1/src/offspot_runtime/__about__.py +0 -1
  7. {offspot_config-2.4.1 → offspot_config-2.4.2}/.gitignore +0 -0
  8. {offspot_config-2.4.1 → offspot_config-2.4.2}/.pre-commit-config.yaml +0 -0
  9. {offspot_config-2.4.1 → offspot_config-2.4.2}/LICENSE +0 -0
  10. {offspot_config-2.4.1 → offspot_config-2.4.2}/README.md +0 -0
  11. {offspot_config-2.4.1 → offspot_config-2.4.2}/pyproject.toml +0 -0
  12. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/__init__.py +0 -0
  13. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/branding/horizontal-logo-dark.png +0 -0
  14. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/branding/horizontal-logo-light.png +0 -0
  15. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/branding/horizontal-logo.svg +0 -0
  16. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/branding/square-logo-dark.png +0 -0
  17. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/branding/square-logo-light.png +0 -0
  18. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/branding/square-logo.svg +0 -0
  19. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/catalog.json +0 -0
  20. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/catalog.py +0 -0
  21. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/constants.py +0 -0
  22. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/file.py +0 -0
  23. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/inputs/__init__.py +0 -0
  24. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/inputs/base.py +0 -0
  25. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/inputs/checksum.py +0 -0
  26. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/inputs/file.py +0 -0
  27. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/inputs/mainconfig.py +0 -0
  28. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/inputs/oci.py +0 -0
  29. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/inputs/output.py +0 -0
  30. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/inputs/str.py +0 -0
  31. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/inputs/ways.py +0 -0
  32. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/oci_images.py +0 -0
  33. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/utils/__init__.py +0 -0
  34. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/utils/dashboard.py +0 -0
  35. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/utils/download.py +0 -0
  36. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/utils/misc.py +0 -0
  37. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/utils/sizes.py +0 -0
  38. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/utils/yaml.py +0 -0
  39. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_config/zim.py +0 -0
  40. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_runtime/__init__.py +0 -0
  41. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_runtime/ap.py +0 -0
  42. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_runtime/checks.py +0 -0
  43. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_runtime/configlib.py +0 -0
  44. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_runtime/containers.py +0 -0
  45. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_runtime/dnsmasqspoof.py +0 -0
  46. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_runtime/ethernet.py +0 -0
  47. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_runtime/firmware.py +0 -0
  48. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_runtime/fromfile.py +0 -0
  49. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_runtime/hostname.py +0 -0
  50. {offspot_config-2.4.1 → offspot_config-2.4.2}/src/offspot_runtime/timezone.py +0 -0
  51. {offspot_config-2.4.1 → offspot_config-2.4.2}/tasks.py +0 -0
  52. {offspot_config-2.4.1 → offspot_config-2.4.2}/tests/conftest.py +0 -0
  53. {offspot_config-2.4.1 → offspot_config-2.4.2}/tests/test_catalog.py +0 -0
  54. {offspot_config-2.4.1 → offspot_config-2.4.2}/tests/test_checks.py +0 -0
  55. {offspot_config-2.4.1 → offspot_config-2.4.2}/tests/test_humanid.py +0 -0
  56. {offspot_config-2.4.1 → offspot_config-2.4.2}/tests/test_inputs.py +0 -0
  57. {offspot_config-2.4.1 → offspot_config-2.4.2}/tests/test_link.py +0 -0
  58. {offspot_config-2.4.1 → offspot_config-2.4.2}/tests/test_reader.py +0 -0
  59. {offspot_config-2.4.1 → offspot_config-2.4.2}/tests/test_zim.py +0 -0
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
5
5
  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6
6
  and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7
7
 
8
+ ## [2.4.2] - 2025-03-07
9
+
10
+ ### Fixed
11
+
12
+ - [kiwix] Fixed dashboard links still broken in 2.4.1
13
+
8
14
  ## [2.4.1] - 2025-03-07
9
15
 
10
16
  ### Fixed
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: offspot-config
3
- Version: 2.4.1
3
+ Version: 2.4.2
4
4
  Summary: Offspot Config helpers
5
5
  Project-URL: Homepage, https://github.com/offspot/offspot-config
6
6
  Project-URL: Donate, https://www.kiwix.org/en/support-us/
@@ -295,7 +295,11 @@ class ConfigBuilder:
295
295
  "version": f"v{__version__}",
296
296
  },
297
297
  "packages": [
298
- package.to_dashboard_entry(fqdn=self.fqdn, download_fqdn=download_fqdn)
298
+ package.to_dashboard_entry(
299
+ fqdn=self.fqdn,
300
+ kiwix_domain=KIWIX_PREFIX,
301
+ download_fqdn=download_fqdn,
302
+ )
299
303
  for package in self.dashboard_entries
300
304
  ],
301
305
  }
@@ -13,12 +13,6 @@ from offspot_config.inputs.file import FileConfig
13
13
  from offspot_config.oci_images import OCIImage
14
14
  from offspot_config.utils.download import get_base64_from
15
15
 
16
- # @typechecked
17
- # @define(kw_only=True)
18
- # class BaseImage:
19
- # source: str
20
- # root_size: int
21
-
22
16
 
23
17
  @typechecked
24
18
  @define(kw_only=True)
@@ -48,7 +42,9 @@ class Package:
48
42
  def get_download_checksum(self) -> Checksum | None:
49
43
  return None
50
44
 
51
- def to_dashboard_entry(self, fqdn: str, download_fqdn: str | None):
45
+ def to_dashboard_entry(
46
+ self, fqdn: str, kiwix_domain: str, download_fqdn: str | None
47
+ ):
52
48
  entry = {
53
49
  "ident": self.ident,
54
50
  "kind": self.kind,
@@ -56,7 +52,7 @@ class Package:
56
52
  "description": self.description,
57
53
  "languages": self.languages,
58
54
  "tags": self.tags,
59
- "url": self.get_url(fqdn),
55
+ "url": self.get_url(fqdn, kiwix_domain=kiwix_domain),
60
56
  "icon": get_base64_from(self.icon_url) if self.icon_url else "",
61
57
  }
62
58
  if self.get_download_url(str(download_fqdn)) and self.get_download_size():
@@ -103,9 +99,7 @@ class ZimPackage(Package):
103
99
  def size(self) -> int:
104
100
  return self.download_size
105
101
 
106
- def get_url(
107
- self, fqdn: str, kiwix_domain: str | None = "kiwix", **kwargs # noqa: ARG002
108
- ) -> str:
102
+ def get_url(self, fqdn: str, kiwix_domain: str, **kwargs) -> str: # noqa: ARG002
109
103
  # this assumes that the ZIM is stored using self.filename
110
104
  from offspot_config.zim import get_libkiwix_humanid
111
105
 
@@ -0,0 +1 @@
1
+ __version__ = "2.4.2"
@@ -1 +0,0 @@
1
- __version__ = "2.4.1"
File without changes
File without changes
File without changes