Skip to content

Fix notion #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ftapajos wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix notion #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7eb3ea8
chore: replace xdg for xdg-base-dirs
ftapajos Nov 25, 2025
f338db3
BREAKING(chore): update poetry.lock
ftapajos Nov 25, 2025
9bdf80b
chore: update notion client
ftapajos Dec 7, 2025
5224a5f
fix(notion): fix rich_text entry for notion
ftapajos Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/install-software.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ["3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.13"]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand All @@ -26,7 +26,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
python-version: ["3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.13"]
# use python-extra AND executable to tests its imports
# https://stackoverflow.com/questions/66025220/paired-values-in-github-actions-matrix
python-extra:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.13"]
steps:
- uses: actions/checkout@v4
- name: Python Poetry Action
Expand Down
2,411 changes: 1,336 additions & 1,075 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ tw_gtasks_sync = "syncall.scripts.tw_gtasks_sync:main"

# end-user dependencies --------------------------------------------------------
[tool.poetry.dependencies]
python = ">=3.8.1,<=3.12.5"
python = ">=3.10,<4.0"

PyYAML = "~5.3.1"
bidict = "^0.21.4"
click = "^8.1.7"

google-api-python-client = { version = "^2.140.0", optional = true }
google-auth-oauthlib = { version = "^0.4.6", optional = true }
notion-client = { version = "^0.7.1", optional = true }
notion-client = { version = "^2.7.0", optional = true }
gkeepapi = [
{ version = "^0.13.7", optional = true, python = "<3.12" },
{ version = "^0.16.0", optional = true, python = ">3.12" },
Expand All @@ -70,7 +70,7 @@ caldav = { version = "^0.11.0", optional = true }
icalendar = { version = "^5.0.13", optional = true }
taskw-ng = { version = "0.2.7", optional = true }
xattr = { version = "^0.9.9", optional = true }
xdg = { version = "^6.0.0", optional = true }
xdg-base-dirs = { version = "^6.0.2", optional = true }

loguru = "^0.5.3"
python-dateutil = "^2.9.0.post0"
Expand All @@ -85,7 +85,7 @@ gkeep = ["gkeepapi"]
notion = ["notion-client"]
asana = ["asana"]
caldav = ["caldav", "icalendar"]
tw = ["taskw-ng", "xdg"]
tw = ["taskw-ng", "xdg-base-dirs"]
fs = ["xattr"]

# dev dependencies -------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions syncall/notion/notion_todo_block.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ def plaintext(self, val):
@classmethod
def get_plaintext(cls, todo_section: NotionTodoSection):
"""Get the plaintext from a todo section."""
return "".join([li["plain_text"] for li in todo_section["text"]]) # type: ignore
return "".join([li["plain_text"] for li in todo_section["rich_text"]]) # type: ignore

def serialize(self) -> dict:
return {
"object": "block",
"type": "to_do",
"to_do": {
"text": [{"type": "text", "text": {"content": self.plaintext}}],
"rich_text": [{"type": "text", "text": {"content": self.plaintext}}],
"checked": self.is_checked,
},
}
2 changes: 1 addition & 1 deletion syncall/taskwarrior/taskwarrior_side.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from bubop import logger, parse_datetime
from taskw_ng import TaskWarrior
from taskw_ng.warrior import TASKRC
from xdg import xdg_config_home
from xdg_base_dirs import xdg_config_home

from syncall.sync_side import ItemType, SyncSide
from syncall.types import TaskwarriorRawItem
Expand Down
40 changes: 20 additions & 20 deletions tests/conftest_notion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def notion_simple_todo() -> NotionTodoBlockItem:
"archived": False,
"type": "to_do",
"to_do": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "Lacinato kale", "link": None},
Expand Down Expand Up @@ -94,7 +94,7 @@ def notion_chained_todo() -> NotionTodoBlockItem:
"archived": False,
"type": "to_do",
"to_do": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "Bringing it ", "link": None},
Expand Down Expand Up @@ -204,7 +204,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "paragraph",
"paragraph": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "👋 Welcome to Notion!", "link": None},
Expand All @@ -231,7 +231,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "paragraph",
"paragraph": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "Here are the basics:", "link": None},
Expand All @@ -258,7 +258,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "to_do",
"to_do": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "Lacinato kale", "link": None},
Expand Down Expand Up @@ -286,7 +286,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "to_do",
"to_do": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "Bringing it ", "link": None},
Expand Down Expand Up @@ -384,7 +384,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "bulleted_list_item",
"bulleted_list_item": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "a list item", "link": None},
Expand All @@ -411,7 +411,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "to_do",
"to_do": {
"text": [
"rich_text": [
{
"type": "text",
"text": {
Expand Down Expand Up @@ -603,7 +603,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "to_do",
"to_do": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "See the ", "link": None},
Expand Down Expand Up @@ -668,7 +668,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "to_do",
"to_do": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "Click the ", "link": None},
Expand Down Expand Up @@ -731,7 +731,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "to_do",
"to_do": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "Click ", "link": None},
Expand Down Expand Up @@ -794,7 +794,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "toggle",
"toggle": {
"text": [
"rich_text": [
{
"type": "text",
"text": {
Expand Down Expand Up @@ -840,7 +840,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "paragraph",
"paragraph": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "See it in action:", "link": None},
Expand Down Expand Up @@ -895,7 +895,7 @@ def page_contents() -> NotionPageContents:
"has_children": False,
"archived": False,
"type": "paragraph",
"paragraph": {"text": []},
"paragraph": {"rich_text": []},
},
{
"object": "block",
Expand Down Expand Up @@ -934,7 +934,7 @@ def page_contents() -> NotionPageContents:
"has_children": False,
"archived": False,
"type": "paragraph",
"paragraph": {"text": []},
"paragraph": {"rich_text": []},
},
{
"object": "block",
Expand Down Expand Up @@ -973,7 +973,7 @@ def page_contents() -> NotionPageContents:
"has_children": False,
"archived": False,
"type": "paragraph",
"paragraph": {"text": []},
"paragraph": {"rich_text": []},
},
{
"object": "block",
Expand Down Expand Up @@ -1013,7 +1013,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "paragraph",
"paragraph": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "Visit our ", "link": None},
Expand Down Expand Up @@ -1070,7 +1070,7 @@ def page_contents() -> NotionPageContents:
"has_children": False,
"archived": False,
"type": "paragraph",
"paragraph": {"text": []},
"paragraph": {"rich_text": []},
},
{
"object": "block",
Expand All @@ -1081,7 +1081,7 @@ def page_contents() -> NotionPageContents:
"archived": False,
"type": "paragraph",
"paragraph": {
"text": [
"rich_text": [
{
"type": "text",
"text": {"content": "👉", "link": None},
Expand Down Expand Up @@ -1172,7 +1172,7 @@ def page_contents() -> NotionPageContents:
"has_children": False,
"archived": False,
"type": "paragraph",
"paragraph": {"text": []},
"paragraph": {"rich_text": []},
},
],
"next_cursor": None,
Expand Down