openmodule 14.0.4__tar.gz → 14.1.1__tar.gz

{openmodule-14.0.4 → openmodule-14.1.1}/.gitlab-ci.yml

@@ -9,6 +9,18 @@ before_script:
   - pip install -U pip
   - pip --cache-dir=.pip --quiet install tox twine
 
+py312:
+  stage: tests
+  image: python:3.12
+  coverage: '/^TOTAL\s+\d+\s+\d+\s+(\d+\%)$/'
+  artifacts:
+    paths:
+      - openmodule/htmlcov
+  tags:
+    - docker
+  script:
+    - tox
+
 py39:
   stage: tests
   image: python:3.9

{openmodule-14.0.4 → openmodule-14.1.1}/AUTHORS

@@ -1,3 +1,4 @@
+Bernhard Lippe <b.lippe@arivo.co>
 Kevin Koller <k.koller@accessio.at>
 Kevin Koller <k.koller@arivo.co>
 Matthias Mietschnig <m.mietschnig@arivo.co>

{openmodule-14.0.4 → openmodule-14.1.1}/ChangeLog

@@ -1,6 +1,17 @@
 CHANGES
 =======
 
+v14.1.1
+-------
+
+* OM-1000: added --library flag for openmodule commands so "\_\_READABLE\_NAME" and "\_\_DESCRIPTION" are not added there
+
+v14.1.0
+-------
+
+* newer settings-models (non-breaking)
+* OM-901 Python 12 Support
+
 v14.0.4
 -------
 
@@ -172,8 +183,6 @@ v12.0.0.rc0
 * Removed parking\_area\_id from AccessCheckAccess changed gate permission check in AccessService to new behavior
 * removed Gate and GateType (now from settings models)
 * fixed testcases and removed backend (deprecated in v11)
-* newer settings-models
-* settings models update
 
 v11.1.1
 -------
@@ -197,12 +206,3 @@ v11.0.3
 v11.0.2
 -------
 
-* fixed get\_no\_exception in SettingsMocker
-* Update database.md [skip ci]
-* Update database.md [skip ci]
-* Update database.md [skip ci]
-* Major Refactoring and many new functionality (v2 parking system refactor and redesign)
-
-v10.0.5
--------
-

{openmodule-14.0.4 → openmodule-14.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openmodule
-Version: 14.0.4
+Version: 14.1.1
 Summary: Libraries for developing the arivo openmodule
 Home-page: https://gitlab.com/arivo-public/device-python/openmodule.git
 Author: ARIVO
@@ -11,8 +11,9 @@ Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown; charset=UTF-8
 Provides-Extra: test
 Provides-Extra: commands

{openmodule-14.0.4 → openmodule-14.1.1}/openmodule.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openmodule
-Version: 14.0.4
+Version: 14.1.1
 Summary: Libraries for developing the arivo openmodule
 Home-page: https://gitlab.com/arivo-public/device-python/openmodule.git
 Author: ARIVO
@@ -11,8 +11,9 @@ Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown; charset=UTF-8
 Provides-Extra: test
 Provides-Extra: commands

openmodule-14.1.1/openmodule.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "3784452", "is_release": true}

{openmodule-14.0.4 → openmodule-14.1.1}/openmodule.egg-info/requires.txt

@@ -1,15 +1,15 @@
 pydantic<2,>=1.7
 sentry-sdk~=2.19.0
 orjson<4,>=3.4.7
-pyzmq<23,>=22
-pyyaml<6,>5
-editdistance<0.6.0,>=0.5.3
+pyzmq~=26.2
+pyyaml~=5.3.1
+editdistance>=0.8.1
 sqlalchemy<1.4,>=1.3
 alembic<2,>=1.5.4
-requests>=2.22.0
+requests~=2.32
 python-dateutil>=2.7.2
 python-dotenv==0.15.0
-arivo-settings_models<2,>=1.1.4
+arivo-settings_models<2,>=1.2.0
 arivo-schedule~=1.2.2
 
 [commands]

{openmodule-14.0.4 → openmodule-14.1.1}/openmodule_commands/__init__.py

@@ -16,11 +16,13 @@ def openmodule_makemessages():
     parser.add_argument('--hardware', help='The service is only a hardware package with no actual code. '
                                            'Only translate hardware keywords.',
                         required=False,  action="count")
+    parser.add_argument('--library', help='Do not add __READABLE_NAME and __DESCRIPTION.',
+                        required=False,  action="count")
     parser.add_argument('--languages', help='Languages to translate to (lowercase iso2)', nargs="*",
                         default=["en", "de"])
     args = parser.parse_args()
     create_translation(args.out, args.files, args.packages, args.force_dir, args.no_translate, args.hardware,
-                       args.languages)
+                       args.library, args.languages)
 
 
 def openmodule_translate():
@@ -40,9 +42,10 @@ def openmodule_check_translation():
     parser.add_argument('--hardware', help='The service is only a hardware package with no actual code. '
                                            'Only translate hardware keywords.',
                         required=False,  action="count")
+    parser.add_argument('--library', help='Do not add __READABLE_NAME and __DESCRIPTION.',
+                        required=False,  action="count")
     parser.add_argument('--languages', help='Languages to translate to (lowercase iso2)', nargs="*",
                         default=["en", "de"])
     args = parser.parse_args()
     sys.exit(check_translations(args.dir, args.files, args.packages, bool(args.ignore_keywords), args.hardware,
-                                args.languages))
-
+                                args.library, args.languages))

{openmodule-14.0.4 → openmodule-14.1.1}/openmodule_commands/translate.py

@@ -32,7 +32,7 @@ def get_filenames(files, packages):
     return filenames
 
 
-def create_translation(out, files, packages, force_dir, no_translate, hardware, languages):
+def create_translation(out, files, packages, force_dir, no_translate, hardware, library, languages):
     global keywords
 
     if not force_dir:
@@ -61,7 +61,7 @@ def create_translation(out, files, packages, force_dir, no_translate, hardware,
     if package_dirs is None:
         return
 
-    keywords_to_add = keywords
+    keywords_to_add = [] if library else keywords
     if hardware:
         files = []
         packages = []
@@ -107,6 +107,9 @@ def create_translation(out, files, packages, force_dir, no_translate, hardware,
                                      lang_dir(language, "translation.po")])
             if not no_translate:
                 poedit(out, language)
+            if library:
+                subprocess.check_output(["msgattrib", "-o", lang_dir(language, "translation.po"), "--no-obsolete",
+                                         lang_dir(language, "translation.po")])
 
         print("Finished translation")
     finally:
@@ -127,7 +130,7 @@ def poedit(out, language):
 MSG_EMTPY_REGEX = re.compile(r'^msgid\s*"(.*?)".*?\n.*?\n?^msgstr(\[\d*\])?\s*"(.*?)"', re.DOTALL)
 
 
-def check_translations(directory, files, packages, check_keywords, hardware, languages):
+def check_translations(directory, files, packages, check_keywords, hardware, library, languages):
     global keywords
 
     def out_dir(path):
@@ -140,7 +143,7 @@ def check_translations(directory, files, packages, check_keywords, hardware, lan
     if package_dirs is None:
         return
 
-    keywords_to_add = keywords
+    keywords_to_add = [] if library else keywords
     if hardware:
         files = []
         packages = []
@@ -154,7 +157,6 @@ def check_translations(directory, files, packages, check_keywords, hardware, lan
     filenames = get_filenames(files, packages)
 
     with open(PACKAGE_DATA_FILE, "w") as tmp:
-        tmp.write('from openmodule.utils.translation import _\n')
         for x in keywords_to_add:
             tmp.write(f'_("{x}")\n')
     try:

{openmodule-14.0.4 → openmodule-14.1.1}/requirements.txt

@@ -1,13 +1,13 @@
 pydantic>=1.7,<2
 sentry-sdk~=2.19.0
 orjson>=3.4.7,<4
-pyzmq>=22,<23
-pyyaml>5,<6
-editdistance>=0.5.3,<0.6.0
+pyzmq~=26.2
+pyyaml~=5.3.1
+editdistance>=0.8.1
 sqlalchemy>=1.3,<1.4
 alembic>=1.5.4,<2
-requests>=2.22.0
+requests~=2.32
 python-dateutil>=2.7.2
 python-dotenv==0.15.0
-arivo-settings_models>=1.1.4,<2
+arivo-settings_models>=1.2.0,<2
 arivo-schedule~=1.2.2

{openmodule-14.0.4 → openmodule-14.1.1}/setup.cfg

@@ -1,19 +1,20 @@
 [metadata]
 name = openmodule
 author = ARIVO
-author-email = support@arivo.co
+author_email = support@arivo.co
 summary = Libraries for developing the arivo openmodule
-description-file = README.md
-description-content-type = text/markdown; charset=UTF-8
-home-page = https://gitlab.com/arivo-public/device-python/openmodule.git
+description_file = README.md
+description_content_type = text/markdown; charset=UTF-8
+home_page = https://gitlab.com/arivo-public/device-python/openmodule.git
 license = GNU General Public License v2 (GPLv2)
 keywords = arivo openmodule
 classifier = 
 	Intended Audience :: Developers
 	License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 	Programming Language :: Python
-	Programming Language :: Python :: 3.7
 	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.12
 
 [files]
 packages = 

{openmodule-14.0.4 → openmodule-14.1.1}/tests/test_sentry.py

@@ -343,7 +343,7 @@ class SentryTestCase(SentryTestMixin):
             f"{func.__module__}.SentryTestCase.test_trace_lambda.<locals>.<lambda>"])
 
     def test_trace_builtin(self):
-        func = sentry.trace(print)
+        func = sentry.trace(dir)
         with self.assertRaises(ValueError):
             inspect.signature(func)
         func("test")

openmodule-14.0.4/openmodule.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "3d9ddfd", "is_release": true}