Merge pull request #69 from glyph/session-circles

just some stuff
glyph · Dec 1, 2024 · 3625f0b · 3625f0b
2 parents 940a3b6 + 2a5675e
commit 3625f0b
Show file tree

Hide file tree

Showing 31 changed files with 1,586 additions and 387 deletions.
diff --git a/.github/workflows/test-ui.yml b/.github/workflows/test-ui.yml
@@ -13,7 +13,7 @@ permissions:
   contents: read
 
 jobs:
-  build:
+  gui-tests:
 
     runs-on: macos-14
 
@@ -27,7 +27,32 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -Ur requirements.txt
+      - name: Check
+        run: |
+          mypy src
       - name: Run Mac GUI tests
         run: |
           CI_MODE=YES python setup.py py2app --alias | cat
           ./dist/CiPomodouroboros.app/Contents/MacOS/CiPomodouroboros
+
+  model-tests:
+
+    runs-on: ubuntu-24.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install -r requirements.txt
+          python -m pip install -e .
+
+      - name: Test
+        run: |
+          trial --rterrors --reporter=verbose -j auto pomodouroboros.model.test
diff --git a/IBFiles/GoalListWindow.xib b/IBFiles/GoalListWindow.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23094"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -30,15 +30,18 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <datePickerCell key="cell" borderStyle="bezel" alignment="left" useCurrentDate="YES" id="pDE-yo-jA2">
                             <font key="font" metaFont="system"/>
-                            <date key="date" timeIntervalSinceReferenceDate="737052245.408728">
-                                <!--2024-05-10 16:44:05 +0000-->
+                            <date key="date" timeIntervalSinceReferenceDate="751332209.77409697">
+                                <!--2024-10-22 23:23:29 +0000-->
                             </date>
                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <connections>
                                 <action selector="dateWasSet:" target="-2" id="WvH-1M-rHr"/>
                             </connections>
                         </datePickerCell>
+                        <connections>
+                            <outlet property="nextKeyView" destination="A2B-RE-w6m" id="UJz-L1-IDH"/>
+                        </connections>
                     </datePicker>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="qnJ-g1-YqA">
                         <rect key="frame" x="137" y="394" width="454" height="16"/>

diff --git a/IBFiles/IntentionEditor.xib b/IBFiles/IntentionEditor.xib
diff --git a/IBFiles/MainMenu.xib b/IBFiles/MainMenu.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23094"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MenuForwarder">

diff --git a/mypy.ini b/mypy.ini
@@ -5,17 +5,16 @@ plugins=mypy_zope:plugin
 
 # making our way to 'strict'
 warn_return_any = True
-
 strict_optional = True
 warn_no_return = True
 warn_unused_configs = True
 warn_unused_ignores = True
 warn_redundant_casts = True
 no_implicit_optional = True
+disallow_untyped_defs = True
 
 [not-yet-mypy]
 disallow_subclassing_any = True
-disallow_untyped_defs = True
 disallow_any_generics = True
 disallow_any_unimported = True
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,9 +1,7 @@
 [build-system]
 requires = [
   "setuptools>=42",
-  "py2app",
   "wheel",
-  "quickmacapp",
 ]
 build-backend = "setuptools.build_meta"
 

diff --git a/requirements.in b/requirements.in
@@ -1,19 +1,22 @@
 # requirements
-py2app
+py2app ; sys_platform == 'darwin'
 pip-tools
 
-pyobjc-framework-Cocoa
-pyobjc-framework-ExceptionHandling
-pyobjc-framework-UserNotifications
-twisted[tls,macos-platform]
-mypy<1.6.0
+pyobjc-core ; sys_platform == 'darwin'
+pyobjc-framework-Cocoa ; sys_platform == 'darwin'
+pyobjc-framework-ExceptionHandling ; sys_platform == 'darwin'
+pyobjc-framework-UserNotifications ; sys_platform == 'darwin'
+pyobjc-framework-CFNetwork ; sys_platform == 'darwin'
+
+twisted[tls,http2]
+mypy
 mypy-zope
 python-dateutil
 types-python-dateutil
 ulid-py
-quickmacapp
-quickmachotkey
-encrust
+quickmacapp ; sys_platform == 'darwin'
+quickmachotkey ; sys_platform == 'darwin'
+encrust; sys_platform == 'darwin'
 datetype
 fritter
 setuptools<71.0.0
diff --git a/requirements.txt b/requirements.txt
@@ -9,6 +9,8 @@ altgraph==0.17.4
     #   macholib
     #   modulegraph
     #   py2app
+anyio==4.6.2.post1
+    # via httpx
 appdirs==1.4.4
     # via twisted
 attrs==24.2.0
@@ -18,19 +20,23 @@ attrs==24.2.0
     #   twisted
 automat==24.8.1
     # via twisted
-bcrypt==4.2.0
+bcrypt==4.2.1
     # via twisted
-build==1.2.1
+build==1.2.2.post1
     # via pip-tools
-cffi==1.17.0
+certifi==2024.8.30
+    # via
+    #   httpcore
+    #   httpx
+cffi==1.17.1
     # via cryptography
 click==8.1.7
     # via
     #   encrust
     #   pip-tools
 constantly==23.10.4
     # via twisted
-cryptography==43.0.1
+cryptography==44.0.0
     # via
     #   pyopenssl
     #   service-identity
@@ -43,22 +49,32 @@ datetype==2024.2.28
     #   fritter
 delocate==0.12.0
     # via encrust
-encrust==2024.9.3
+encrust==2024.9.3 ; sys_platform == "darwin"
     # via -r requirements.in
 fritter==0.0.9
     # via -r requirements.in
+h11==0.14.0
+    # via httpcore
 h2==4.1.0
-    # via twisted
+    # via
+    #   httpx
+    #   twisted
 hpack==4.0.0
     # via h2
+httpcore==1.0.7
+    # via httpx
+httpx[http2]==0.28.0
+    # via twisted
 hyperframe==6.0.1
     # via h2
 hyperlink==21.0.0
     # via twisted
-hypothesis==6.111.2
+hypothesis==6.122.0
     # via twisted
-idna==3.8
+idna==3.10
     # via
+    #   anyio
+    #   httpx
     #   hyperlink
     #   twisted
 incremental==24.7.2
@@ -69,15 +85,15 @@ macholib==1.16.3
     #   py2app
 modulegraph==0.19.6
     # via py2app
-mypy==1.5.1
+mypy==1.13.0
     # via
     #   -r requirements.in
     #   mypy-zope
 mypy-extensions==1.0.0
     # via mypy
-mypy-zope==1.0.5
+mypy-zope==1.0.9
     # via -r requirements.in
-packaging==24.1
+packaging==24.2
     # via
     #   build
     #   delocate
@@ -86,89 +102,94 @@ pip-tools==7.4.1
     # via -r requirements.in
 priority==1.3.0
     # via twisted
-py2app==0.28.8
+py2app==0.28.8 ; sys_platform == "darwin"
     # via
     #   -r requirements.in
     #   encrust
-pyasn1==0.6.0
+pyasn1==0.6.1
     # via
     #   pyasn1-modules
     #   service-identity
-pyasn1-modules==0.4.0
+pyasn1-modules==0.4.1
     # via service-identity
 pycparser==2.22
     # via cffi
 pyhamcrest==2.1.0
     # via twisted
-pyobjc-core==10.3.1
+pyobjc-core==10.3.2 ; sys_platform == "darwin"
     # via
+    #   -r requirements.in
     #   pyobjc-framework-cfnetwork
     #   pyobjc-framework-cocoa
     #   pyobjc-framework-exceptionhandling
     #   pyobjc-framework-usernotifications
     #   quickmachotkey
     #   twisted
-pyobjc-framework-cfnetwork==10.3.1
-    # via twisted
-pyobjc-framework-cocoa==10.3.1
+pyobjc-framework-cfnetwork==10.3.2 ; sys_platform == "darwin"
+    # via
+    #   -r requirements.in
+    #   twisted
+pyobjc-framework-cocoa==10.3.2 ; sys_platform == "darwin"
     # via
     #   -r requirements.in
     #   pyobjc-framework-cfnetwork
     #   pyobjc-framework-exceptionhandling
     #   pyobjc-framework-usernotifications
     #   quickmacapp
     #   twisted
-pyobjc-framework-exceptionhandling==10.3.1
+pyobjc-framework-exceptionhandling==10.3.2 ; sys_platform == "darwin"
     # via
     #   -r requirements.in
     #   quickmacapp
-pyobjc-framework-usernotifications==10.3.1
+pyobjc-framework-usernotifications==10.3.2 ; sys_platform == "darwin"
     # via
     #   -r requirements.in
     #   quickmacapp
-pyopenssl==24.2.1
+pyopenssl==24.3.0
     # via twisted
-pyproject-hooks==1.1.0
+pyproject-hooks==1.2.0
     # via
     #   build
     #   pip-tools
 pyserial==3.5
     # via twisted
 python-dateutil==2.9.0.post0
     # via -r requirements.in
-quickmacapp==2023.4.24
+quickmacapp==2023.4.24 ; sys_platform == "darwin"
     # via -r requirements.in
-quickmachotkey==2023.11.17
+quickmachotkey==2023.11.17 ; sys_platform == "darwin"
     # via -r requirements.in
-service-identity==24.1.0
+service-identity==24.2.0
     # via twisted
 six==1.16.0
     # via python-dateutil
+sniffio==1.3.1
+    # via anyio
 sortedcontainers==2.4.0
     # via hypothesis
-twisted[macos-platform,tls]==24.7.0
+twisted[http2,tls]==24.10.0
     # via
     #   -r requirements.in
     #   encrust
     #   quickmacapp
-types-python-dateutil==2.9.0.20240821
+types-python-dateutil==2.9.0.20241003
     # via -r requirements.in
 typing-extensions==4.12.2
     # via
     #   delocate
     #   mypy
     #   twisted
-tzdata==2024.1
+tzdata==2024.2
     # via fritter
 ulid-py==1.1.0
     # via -r requirements.in
-wheel==0.44.0
+wheel==0.45.1
     # via pip-tools
 wheel-filename==1.4.1
     # via encrust
 zope-event==5.0
     # via zope-schema
-zope-interface==7.0.3
+zope-interface==7.2
     # via
     #   mypy-zope
     #   twisted
@@ -177,7 +198,7 @@ zope-schema==7.0.1
     # via mypy-zope
 
 # The following packages are considered to be unsafe in a requirements file:
-# pip==24.2
+pip==24.3.1
     # via pip-tools
 setuptools==70.3.0
     # via

diff --git a/src/pomodouroboros/cli.py b/src/pomodouroboros/cli.py
@@ -1,4 +1,4 @@
-def main():
+def main() -> None:
     """
     run stuff
     """