moat-kv-cal 0.1.2__tar.gz → 0.1.3__tar.gz

moat_kv_cal-0.1.3/Makefile

@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+PACKAGE = moat-kv-cal
+MAKEINCL ?= $(shell python3 -mmoat src path)/make/py
+
+ifneq ($(wildcard $(MAKEINCL)),)
+include $(MAKEINCL)
+# availabe via http://github.com/smurfix/sourcemgr
+
+else
+%:
+	@echo "Please fix 'python3 -mmoat src path'."
+	@exit 1
+endif
+

{moat_kv_cal-0.1.2/moat_kv_cal.egg-info → moat_kv_cal-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-kv-cal
-Version: 0.1.2
+Version: 0.1.3
 Summary: Calendar management for MoaT-KV
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org
@@ -13,8 +13,9 @@ Classifier: Topic :: Database
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
+License-File: LICENSE
 License-File: LICENSE.txt
-Requires-Dist: moat-kv~=0.70.23
+Requires-Dist: moat-kv~=0.70.24
 Requires-Dist: moat-util~=0.56.4
 Requires-Dist: aiocaldav
 Dynamic: license-file

moat_kv_cal-0.1.3/pyproject.toml

@@ -0,0 +1,39 @@
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = [ "setuptools", "wheel",]
+
+[project]
+classifiers = [
+	"Development Status :: 4 - Beta",
+	"Intended Audience :: Information Technology",
+	"Programming Language :: Python :: 3",
+	"Topic :: Database",                                                                            
+	"Topic :: Home Automation",
+]
+dependencies = [
+	"moat-kv ~= 0.70.24",
+	"moat-util ~= 0.56.4",
+        "aiocaldav",
+]
+version = "0.1.3"
+keywords = [ "MoaT",]
+requires-python = ">=3.8"
+name = "moat-kv-cal"
+description = "Calendar management for MoaT-KV"
+readme = "README.rst"
+
+[[project.authors]]
+email = "matthias@urlichs.de"
+name = "Matthias Urlichs"
+
+[project.urls]
+homepage = "https://m-o-a-t.org"
+repository = "https://github.com/M-o-a-T/moat"
+
+[tool.setuptools]
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.setuptools.package-data]
+"*" = ["*.yaml"]
+

{moat_kv_cal-0.1.2 → moat_kv_cal-0.1.3/src}/moat/kv/cal/_main.py

@@ -7,7 +7,7 @@ from moat.util import P, Path
 from moat.kv.data import data_get
 from .model import CalRoot
 from .util import find_next_alarm
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta, UTC
 import pytz
 
 import anyio
@@ -17,7 +17,7 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-utc = timezone.utc
+utc = UTC
 now = partial(datetime.now, utc)
 
 
@@ -114,7 +114,7 @@ async def list_(obj):
         elif len(p) == 1:
             return Path("%02x" % p[0])
         else:
-            return Path("%02x.%12x" % (p[0], p[1])) + p[2:]
+            return Path(f"{p[0]:02x}.{p[1]:12x}") + p[2:]
 
     if obj.meta:
 

{moat_kv_cal-0.1.2 → moat_kv_cal-0.1.3/src}/moat/kv/cal/util.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from datetime import datetime, timedelta, timezone, date, time
+from datetime import datetime, timedelta, date, time, UTC
 from dateutil.rrule import rrulestr
 from vobject.icalendar import VAlarm, VEvent
 
@@ -9,7 +9,7 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-async def find_next_alarm(calendar, future=10, now=None, zone=timezone.utc) -> Tuple(
+async def find_next_alarm(calendar, future=10, now=None, zone=UTC) -> Tuple(
     VAlarm,
     datetime,
 ):
@@ -31,7 +31,7 @@ async def find_next_alarm(calendar, future=10, now=None, zone=timezone.utc) -> T
     )
 
     if now is None:
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
     ev = None
     ev_v = None
     ev_t = None

{moat_kv_cal-0.1.2 → moat_kv_cal-0.1.3/src/moat_kv_cal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-kv-cal
-Version: 0.1.2
+Version: 0.1.3
 Summary: Calendar management for MoaT-KV
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org
@@ -13,8 +13,9 @@ Classifier: Topic :: Database
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
+License-File: LICENSE
 License-File: LICENSE.txt
-Requires-Dist: moat-kv~=0.70.23
+Requires-Dist: moat-kv~=0.70.24
 Requires-Dist: moat-util~=0.56.4
 Requires-Dist: aiocaldav
 Dynamic: license-file

moat_kv_cal-0.1.3/src/moat_kv_cal.egg-info/SOURCES.txt

@@ -0,0 +1,15 @@
+LICENSE
+LICENSE.txt
+Makefile
+README.rst
+pyproject.toml
+src/moat/kv/cal/__init__.py
+src/moat/kv/cal/_cfg.yaml
+src/moat/kv/cal/_main.py
+src/moat/kv/cal/model.py
+src/moat/kv/cal/util.py
+src/moat_kv_cal.egg-info/PKG-INFO
+src/moat_kv_cal.egg-info/SOURCES.txt
+src/moat_kv_cal.egg-info/dependency_links.txt
+src/moat_kv_cal.egg-info/requires.txt
+src/moat_kv_cal.egg-info/top_level.txt

{moat_kv_cal-0.1.2 → moat_kv_cal-0.1.3/src}/moat_kv_cal.egg-info/requires.txt

@@ -1,3 +1,3 @@
 aiocaldav
-moat-kv~=0.70.23
+moat-kv~=0.70.24
 moat-util~=0.56.4

moat_kv_cal-0.1.2/moat_kv_cal.egg-info/SOURCES.txt

@@ -1,14 +0,0 @@
-LICENSE
-LICENSE.txt
-README.rst
-pyproject.toml
-moat/kv/cal/__init__.py
-moat/kv/cal/_cfg.yaml
-moat/kv/cal/_main.py
-moat/kv/cal/model.py
-moat/kv/cal/util.py
-moat_kv_cal.egg-info/PKG-INFO
-moat_kv_cal.egg-info/SOURCES.txt
-moat_kv_cal.egg-info/dependency_links.txt
-moat_kv_cal.egg-info/requires.txt
-moat_kv_cal.egg-info/top_level.txt

moat_kv_cal-0.1.2/pyproject.toml

@@ -1,97 +0,0 @@
-[build-system]
-build-backend = "setuptools.build_meta"
-requires = [ "setuptools", "wheel",]
-
-[project]
-classifiers = [
-	"Development Status :: 4 - Beta",
-	"Intended Audience :: Information Technology",
-	"Programming Language :: Python :: 3",
-	"Topic :: Database",                                                                            
-	"Topic :: Home Automation",
-]
-dependencies = [
-	"moat-kv ~= 0.70.23",
-	"moat-util ~= 0.56.4",
-        "aiocaldav",
-]
-version = "0.1.2"
-keywords = [ "MoaT",]
-requires-python = ">=3.8"
-name = "moat-kv-cal"
-description = "Calendar management for MoaT-KV"
-readme = "README.rst"
-license-files = ["LICENSE.txt"]
-
-[[project.authors]]
-email = "matthias@urlichs.de"
-name = "Matthias Urlichs"
-
-[project.urls]
-homepage = "https://m-o-a-t.org"
-repository = "https://github.com/M-o-a-T/moat"
-
-[tool.flake8]
-max-line-length = 99
-ignore = [ "F841", "F401", "E731", "E502", "E402", "E127", "E123", "W503", "E231", "E203", "E501" ]
-
-[tool.isort]
-line_length = 99
-multi_line_output = 3
-profile = "black"
-
-[tool.setuptools]
-packages = [ "moat.kv.cal",]
-[tool.setuptools.package-data]
-"*" = ["*.yaml"]
-
-[tool.setuptools_scm]
-
-[tool.black]
-line-length = 99
-
-[tool.tox]
-legacy_tox_ini = """
-[tox]
-isolated_build = True
-envlist = py310,check
-
-[testenv]
-setenv = 
-    PYTHONPATH = {env:PYTHONPATH}{:}{toxinidir}
-deps = 
-    anyio
-    asyncwebsockets
-    asyncclick
-    asyncscope
-    trio
-    pytest
-commands = 
-    python3 -mpytest tests/
-
-[testenv:check]
-commands = 
-    pylint moat tests
-    flake8p moat tests
-    black --check moat tests
-deps = 
-    pytest
-    pylint
-    black
-    flake8-pyproject
-    flake8
-
-"""
-
-[tool.pytest]
-filterwarnings = [
-    "error",
-    "ignore:unclosed:ResourceWarning",
-]
-addopts = "--verbose"
-
-[tool.pylint]
-[tool.pylint.messages_control]
-disable = "wrong-import-order,ungrouped-imports,too-many-nested-blocks,use-dict-literal,unspecified-encoding,too-many-statements,too-many-return-statements,too-many-locals,too-many-instance-attributes,too-many-branches,too-many-arguments,too-few-public-methods,superfluous-parens,no-else-return,no-else-continue,invalid-name,fixme"
-
-[tool.moat]