Add Travertino to Toga repository

.github/workflows/config-file-deps-bump.yml

@@ -11,4 +11,4 @@ jobs:
     uses: beeware/.github/.github/workflows/dep-version-bump.yml@main
     secrets: inherit
     with:
-      subdirectory: . core dummy android cocoa demo gtk iOS testbed textual toga web winforms
+      subdirectory: . core dummy android cocoa demo gtk iOS testbed textual toga travertino web winforms

.github/workflows/publish.yml

@@ -27,6 +27,7 @@ jobs:
         - "toga_iOS"
         - "toga_web"
         - "toga_winforms"
+        - "travertino"
     steps:
       - name: Get packages
         uses: dsaltares/[email protected]

.github/workflows/release.yml

@@ -70,6 +70,7 @@ jobs:
         - "toga_textual"
         - "toga_web"
         - "toga_winforms"
+        - "travertino"
     steps:
       - name: Get Packages
         uses: actions/[email protected]

android/src/toga_android/colors.py

@@ -1,4 +1,5 @@
 from android.graphics import Color
+
 from travertino.colors import TRANSPARENT
 
 CACHE = {TRANSPARENT: Color.TRANSPARENT}

android/src/toga_android/widgets/base.py

@@ -6,9 +6,9 @@
 from android.view import Gravity, View
 from android.widget import RelativeLayout
 from org.beeware.android import MainActivity
-from travertino.size import at_least
 
 from toga.constants import CENTER, JUSTIFY, LEFT, RIGHT, TRANSPARENT
+from travertino.size import at_least
 
 from ..colors import native_color
 

android/src/toga_android/widgets/button.py

@@ -3,6 +3,7 @@
 from android.view import View
 from android.widget import Button as A_Button
 from java import dynamic_proxy
+
 from travertino.size import at_least
 
 from .label import TextViewWidget

android/src/toga_android/widgets/divider.py

@@ -1,6 +1,7 @@
 from android.graphics import Color
 from android.view import View
 from android.widget import LinearLayout
+
 from travertino.size import at_least
 
 from .base import Widget

android/src/toga_android/widgets/internal/pickers.py

@@ -4,6 +4,7 @@
 from android.view import View
 from android.widget import EditText
 from java import dynamic_proxy
+
 from travertino.size import at_least
 
 from ..label import TextViewWidget

android/src/toga_android/widgets/label.py

@@ -5,10 +5,10 @@
 from android.util import TypedValue
 from android.view import Gravity, View
 from android.widget import TextView
-from travertino.size import at_least
 
 from toga.constants import JUSTIFY
 from toga_android.colors import native_color
+from travertino.size import at_least
 
 from .base import Widget, android_text_align
 

android/src/toga_android/widgets/multilinetextinput.py

@@ -1,5 +1,6 @@
 from android.text import InputType
 from android.view import Gravity
+
 from travertino.size import at_least
 
 from .textinput import TextInput

android/src/toga_android/widgets/optioncontainer.py

@@ -16,9 +16,9 @@
     NavigationBarView = None
 
 from java import dynamic_proxy
-from travertino.size import at_least
 
 import toga
+from travertino.size import at_least
 
 from ..container import Container
 from .base import Widget

android/src/toga_android/widgets/switch.py

@@ -3,6 +3,7 @@
 from android.view import View
 from android.widget import CompoundButton, Switch as A_Switch
 from java import dynamic_proxy
+
 from travertino.size import at_least
 
 from .label import TextViewWidget

changes/3086.misc.rst

@@ -0,0 +1 @@
+Travertino has moved from its own repository to Toga's and is now released to coincide with each version release of Toga.

cocoa/src/toga_cocoa/widgets/box.py

@@ -1,6 +1,5 @@
-from travertino.size import at_least
-
 from toga_cocoa.container import TogaView
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/button.py

@@ -1,5 +1,4 @@
 from rubicon.objc import SEL, objc_method, objc_property
-from travertino.size import at_least
 
 from toga.colors import TRANSPARENT
 from toga.fonts import SYSTEM_DEFAULT_FONT_SIZE
@@ -10,6 +9,7 @@
     NSButton,
     NSMomentaryPushInButton,
 )
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/canvas.py

@@ -1,7 +1,6 @@
 from math import ceil
 
 from rubicon.objc import CGSize, objc_method, objc_property
-from travertino.size import at_least
 
 from toga.colors import BLACK, TRANSPARENT, color
 from toga.constants import Baseline, FillRule
@@ -27,6 +26,7 @@
     kCGPathFill,
     kCGPathStroke,
 )
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/detailedlist.py

@@ -1,5 +1,4 @@
 from rubicon.objc import SEL, objc_method, objc_property
-from travertino.size import at_least
 
 from toga_cocoa.libs import (
     NSIndexSet,
@@ -12,6 +11,7 @@
 from toga_cocoa.widgets.internal.cells import TogaDetailedCell
 from toga_cocoa.widgets.internal.data import TogaData
 from toga_cocoa.widgets.internal.refresh import RefreshableScrollView
+from travertino.size import at_least
 
 
 class TogaList(NSTableView):

cocoa/src/toga_cocoa/widgets/divider.py

@@ -1,6 +1,5 @@
-from travertino.size import at_least
-
 from toga_cocoa.libs import NSBox, NSBoxType
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/label.py

@@ -1,7 +1,6 @@
-from travertino.size import at_least
-
 from toga_cocoa.colors import native_color
 from toga_cocoa.libs import NSTextAlignment, NSTextField
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/mapview.py

@@ -1,9 +1,9 @@
 import math
 
 from rubicon.objc import objc_method, objc_property
-from travertino.size import at_least
 
 from toga.types import LatLng
+from travertino.size import at_least
 
 from ..libs import (
     CLLocationCoordinate2D,

cocoa/src/toga_cocoa/widgets/multilinetextinput.py

@@ -1,5 +1,4 @@
 from rubicon.objc import objc_method, objc_property
-from travertino.size import at_least
 
 from toga.colors import TRANSPARENT
 from toga_cocoa.colors import native_color
@@ -11,6 +10,7 @@
     NSViewHeightSizable,
     NSViewWidthSizable,
 )
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/numberinput.py

@@ -2,7 +2,6 @@
 from decimal import Decimal, InvalidOperation
 
 from rubicon.objc import SEL, objc_method, objc_property
-from travertino.size import at_least
 
 from toga.colors import TRANSPARENT
 from toga.widgets.numberinput import _clean_decimal, _clean_decimal_str
@@ -22,6 +21,7 @@
     NSTextView,
     NSView,
 )
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/optioncontainer.py

@@ -1,10 +1,10 @@
 import warnings
 
 from rubicon.objc import SEL, objc_method
-from travertino.size import at_least
 
 from toga_cocoa.container import Container
 from toga_cocoa.libs import NSTabView, NSTabViewItem
+from travertino.size import at_least
 
 from ..libs import objc_property
 from .base import Widget

cocoa/src/toga_cocoa/widgets/progressbar.py

@@ -1,6 +1,5 @@
-from travertino.size import at_least
-
 from toga_cocoa.libs import NSProgressIndicator, NSProgressIndicatorBarStyle
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/scrollcontainer.py

@@ -1,5 +1,4 @@
 from rubicon.objc import SEL, objc_method, objc_property
-from travertino.size import at_least
 
 from toga_cocoa.container import Container
 from toga_cocoa.libs import (
@@ -12,6 +11,7 @@
     NSScrollViewDidEndLiveScrollNotification,
     NSScrollViewDidLiveScrollNotification,
 )
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/selection.py

@@ -1,6 +1,5 @@
-from travertino.size import at_least
-
 from toga_cocoa.libs import SEL, NSPopUpButton, objc_method, objc_property
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/slider.py

@@ -1,5 +1,3 @@
-from travertino.size import at_least
-
 from toga.widgets.slider import SliderImpl
 from toga_cocoa.libs import (
     SEL,
@@ -8,6 +6,7 @@
     objc_method,
     objc_property,
 )
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/splitcontainer.py

@@ -1,9 +1,9 @@
 from rubicon.objc import SEL, objc_method, objc_property
-from travertino.size import at_least
 
 from toga.constants import Direction
 from toga_cocoa.container import Container
 from toga_cocoa.libs import NSSplitView
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/switch.py

@@ -1,5 +1,3 @@
-from travertino.size import at_least
-
 from toga_cocoa.libs import (
     SEL,
     NSBezelStyle,
@@ -10,6 +8,7 @@
     objc_method,
     objc_property,
 )
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/table.py

@@ -1,5 +1,4 @@
 from rubicon.objc import SEL, NSPoint, at, objc_method, objc_property
-from travertino.size import at_least
 
 import toga
 from toga_cocoa.libs import (
@@ -12,6 +11,7 @@
     NSTableViewAnimation,
     NSTableViewColumnAutoresizingStyle,
 )
+from travertino.size import at_least
 
 from .base import Widget
 from .internal.cells import TogaIconView

cocoa/src/toga_cocoa/widgets/textinput.py

@@ -1,5 +1,3 @@
-from travertino.size import at_least
-
 from toga.colors import TRANSPARENT
 from toga.constants import LEFT, RIGHT
 from toga_cocoa.colors import native_color
@@ -20,6 +18,7 @@
     objc_property,
     send_super,
 )
+from travertino.size import at_least
 
 from .base import Widget
 

cocoa/src/toga_cocoa/widgets/tree.py

@@ -1,5 +1,4 @@
 from rubicon.objc import SEL, at, objc_method, objc_property
-from travertino.size import at_least
 
 import toga
 from toga_cocoa.libs import (
@@ -14,6 +13,7 @@
 from toga_cocoa.widgets.base import Widget
 from toga_cocoa.widgets.internal.cells import TogaIconView
 from toga_cocoa.widgets.internal.data import TogaData
+from travertino.size import at_least
 
 
 def node_impl(node):

cocoa/src/toga_cocoa/widgets/webview.py

@@ -1,9 +1,9 @@
 from http.cookiejar import Cookie, CookieJar
 
 from rubicon.objc import objc_id, objc_method, objc_property, py_from_ns
-from travertino.size import at_least
 
 from toga.widgets.webview import CookiesResult, JavaScriptResult
+from travertino.size import at_least
 
 from ..libs import NSURL, NSURLRequest, WKWebView
 from .base import Widget

core/pyproject.toml

@@ -55,9 +55,6 @@ classifiers = [
     "Topic :: Software Development :: User Interfaces",
     "Topic :: Software Development :: Widget Sets",
 ]
-dependencies = [
-    "travertino >= 0.3.0, < 0.4.0",
-]
 
 [project.optional-dependencies]
 # Extras used by developers *of* Toga are pinned to specific versions to
@@ -104,6 +101,11 @@ pil = "toga.plugins.image_formats.PILConverter"
 [tool.setuptools_scm]
 root = ".."
 
+[tool.setuptools_dynamic_dependencies]
+dependencies = [
+    "travertino == {version}",
+]
+
 [tool.coverage.run]
 parallel = true
 branch = true

core/src/toga/fonts.py

@@ -2,6 +2,9 @@
 
 from pathlib import Path
 
+import toga
+from toga.platform import get_platform_factory
+
 # Use the Travertino font definitions as-is
 from travertino import constants
 from travertino.constants import (
@@ -20,9 +23,6 @@
 )
 from travertino.fonts import Font as BaseFont
 
-import toga
-from toga.platform import get_platform_factory
-
 SYSTEM_DEFAULT_FONTS = {SYSTEM, MESSAGE, SERIF, SANS_SERIF, CURSIVE, FANTASY, MONOSPACE}
 SYSTEM_DEFAULT_FONT_SIZE = -1
 FONT_WEIGHTS = {NORMAL, BOLD}