Skip to content

Commit d4a4fbb

Browse files
Merge pull request #44 from AlexanderWillner/auto-publish
Auto publish
2 parents 6a118f6 + be75b3c commit d4a4fbb

File tree

11 files changed

+251
-207
lines changed

11 files changed

+251
-207
lines changed

.github/workflows/deploy.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: publish
2+
3+
on:
4+
release:
5+
types: [created]
6+
7+
jobs:
8+
publish:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout sources
12+
uses: actions/checkout@v2
13+
14+
- name: Set up Python
15+
uses: actions/setup-python@v2
16+
with:
17+
python-version: "3.9"
18+
19+
- name: Publish to PyPi
20+
env:
21+
PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
22+
run: |
23+
make upload

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=0.0.5
1+
VERSION=0.0.7
22
MAIN=things
33
SRC_CORE=things
44
SRC_TEST=tests
@@ -91,7 +91,10 @@ feedback: ## Give feedback
9191

9292
upload: clean ## Upload the code
9393
@$(PYTHON) setup.py sdist bdist_wheel
94-
@$(PYTHON) -m twine upload dist/things.py*
94+
@echo "########################"
95+
@echo "Using environment variable PYPI_API_TOKEN..."
96+
@echo "########################"
97+
@$(PYTHON) -m twine upload dist/things.py* -u __token__ -p "${PYPI_API_TOKEN}"
9598

9699
copy-db:
97100
@cp ~/Library/Group\ Containers/JLMPQHK86H.com.culturedcode.ThingsMac/Things\ Database.thingsdatabase/main.sqlite* tests/

docs/things/api.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ <h1 class="modulename">
113113
<span class="sd">Module implementing Things API.</span>
114114
<span class="sd">&quot;&quot;&quot;</span>
115115

116-
<span class="n">__version__</span> <span class="o">=</span> <span class="s2">&quot;0.0.5&quot;</span>
116+
<span class="n">__version__</span> <span class="o">=</span> <span class="s2">&quot;0.0.6&quot;</span>
117117

118118
<span class="kn">import</span> <span class="nn">os</span>
119119
<span class="kn">from</span> <span class="nn">shlex</span> <span class="kn">import</span> <span class="n">quote</span>
@@ -525,7 +525,8 @@ <h1 class="modulename">
525525
<span class="sd"> list of dict</span>
526526
<span class="sd"> Representing checklist items. Or [] if none found.</span>
527527
<span class="sd"> &quot;&quot;&quot;</span>
528-
<span class="k">return</span> <span class="n">tasks</span><span class="p">(</span><span class="n">uuid</span><span class="o">=</span><span class="n">uuid</span><span class="p">,</span> <span class="nb">type</span><span class="o">=</span><span class="s2">&quot;to-do&quot;</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;checklist&#39;</span><span class="p">,</span> <span class="p">[])</span>
528+
<span class="k">return</span> <span class="n">tasks</span><span class="p">(</span><span class="n">uuid</span><span class="o">=</span><span class="n">uuid</span><span class="p">,</span> <span class="nb">type</span><span class="o">=</span><span class="s2">&quot;to-do&quot;</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;checklist&quot;</span><span class="p">,</span> <span class="p">[])</span> <span class="c1"># type: ignore</span>
529+
529530

530531
<span class="c1"># Filter by collections in the Things app sidebar.</span>
531532

@@ -1413,7 +1414,7 @@ <h6 id="examples">Examples</h6>
14131414
<span class="sd"> list of dict</span>
14141415
<span class="sd"> Representing checklist items. Or [] if none found.</span>
14151416
<span class="sd"> &quot;&quot;&quot;</span>
1416-
<span class="k">return</span> <span class="n">tasks</span><span class="p">(</span><span class="n">uuid</span><span class="o">=</span><span class="n">uuid</span><span class="p">,</span> <span class="nb">type</span><span class="o">=</span><span class="s2">&quot;to-do&quot;</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;checklist&#39;</span><span class="p">,</span> <span class="p">[])</span>
1417+
<span class="k">return</span> <span class="n">tasks</span><span class="p">(</span><span class="n">uuid</span><span class="o">=</span><span class="n">uuid</span><span class="p">,</span> <span class="nb">type</span><span class="o">=</span><span class="s2">&quot;to-do&quot;</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;checklist&quot;</span><span class="p">,</span> <span class="p">[])</span> <span class="c1"># type: ignore</span>
14171418
</pre></div>
14181419

14191420
</details>

docs/things/database.html

Lines changed: 157 additions & 146 deletions
Large diffs are not rendered by default.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def package_files(directory):
2020
AUTHOR_MAIL = "[email protected]"
2121
DESCRIPTON = "A simple Python 3 library to read your Things app data."
2222
URL = "https://github.com/thingsapi/things.py"
23-
VERSION = "0.0.5"
23+
VERSION = "0.0.7"
2424
DATA_FILES = package_files("")
2525
OPTIONS = {
2626
"argv_emulation": False,

tests/main.sqlite

0 Bytes
Binary file not shown.

tests/main.sqlite-shm

0 Bytes
Binary file not shown.

tests/main.sqlite-wal

-32 KB
Binary file not shown.

tests/test_things.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test_inbox(self):
2929
def test_upcoming(self):
3030
"""Test upcoming."""
3131
tasks = things.upcoming(**FILEPATH)
32-
self.assertEqual(2, len(tasks))
32+
self.assertEqual(1, len(tasks))
3333

3434
def test_deadlines(self):
3535
"""Test deadlines."""
@@ -39,7 +39,7 @@ def test_deadlines(self):
3939
def test_today(self):
4040
"""Test today."""
4141
tasks = things.today(**FILEPATH)
42-
self.assertEqual(1, len(tasks))
42+
self.assertEqual(2, len(tasks))
4343

4444
def test_checklist(self):
4545
"""Test checklist."""
@@ -51,7 +51,7 @@ def test_checklist(self):
5151
def test_anytime(self):
5252
"""Test anytime."""
5353
tasks = things.anytime(**FILEPATH)
54-
self.assertEqual(10, len(tasks))
54+
self.assertEqual(11, len(tasks))
5555
self.assertTrue(any(task.pop('area_title', '') == 'Area 1' for task in tasks))
5656

5757
def test_logbook(self):
@@ -86,7 +86,7 @@ def test_get(self):
8686
def test_todos(self):
8787
"""Test all tasks."""
8888
tasks = things.todos(start="Anytime", **FILEPATH)
89-
self.assertEqual(7, len(tasks))
89+
self.assertEqual(8, len(tasks))
9090
tasks = things.todos(start="Anytime", status="completed", **FILEPATH)
9191
self.assertEqual(6, len(tasks))
9292
tasks = things.todos(status="completed", **FILEPATH)
@@ -96,12 +96,15 @@ def test_todos(self):
9696
with self.assertRaises(ValueError):
9797
things.todos(status="wrong_value", **FILEPATH)
9898
tasks = things.tasks("A2oPvtt4dXoypeoLc8uYzY", **FILEPATH)
99-
self.assertEqual(14, len(tasks))
99+
self.assertEqual(16, len(tasks))
100100

101101
def test_tags(self):
102102
"""Test all tags."""
103103
tags = things.tags(**FILEPATH)
104104
self.assertEqual(5, len(tags))
105+
tasks = things.tasks(tag='Errand', **FILEPATH)
106+
self.assertEqual(1, len(tasks))
107+
105108

106109
def test_projects(self):
107110
"""Test all projects."""

things/api.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Module implementing Things API.
55
"""
66

7-
__version__ = "0.0.5"
7+
__version__ = "0.0.7"
88

99
import os
1010
from shlex import quote
@@ -416,7 +416,8 @@ def checklist_items(uuid, **kwargs):
416416
list of dict
417417
Representing checklist items. Or [] if none found.
418418
"""
419-
return tasks(uuid=uuid, type="to-do", **kwargs).get('checklist', [])
419+
return tasks(uuid=uuid, type="to-do", **kwargs).get("checklist", []) # type: ignore
420+
420421

421422
# Filter by collections in the Things app sidebar.
422423

0 commit comments

Comments
 (0)