Skip to content

Commit 267909f

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into dev
2 parents 50cc35e + 4f186d0 commit 267909f

File tree

7 files changed

+26
-18
lines changed

7 files changed

+26
-18
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
matrix:
1414
platform:
1515
- ubuntu-latest
16-
python-version: ['3.11']
16+
python-version: ['3.12']
1717
steps:
1818
- name: Check out code from GitHub
1919
uses: actions/checkout@v3

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
max-parallel: 2
1616
matrix:
17-
python-version: ['3.9', '3.10', '3.11', '3.12']
17+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
1818

1919
steps:
2020
- uses: actions/checkout@v4

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Python
1818
uses: actions/setup-python@v4
1919
with:
20-
python-version: '3.11'
20+
python-version: '3.12'
2121
- name: Install dependencies
2222
run: |
2323
python -m pip install --upgrade pip

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
platform:
1616
- ubuntu-latest
17-
python-version: ['3.9', '3.10', '3.11', '3.12']
17+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
1818
steps:
1919
- name: Check out code from GitHub
2020
uses: actions/checkout@v3

README.rst

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ Like the library? Consider buying me a cup of coffee!
66

77
`Buy me a Coffee! <https://buymeacoffee.com/kevinfronczak>`__
88

9-
**BREAKING CHANGE WARNING:**
10-
As of ``0.22.0`` the library uses asyncio which will break any user scripts used prior to this version. Please see the updated examples below and the ``blinkapp.py`` or ``blinksync.py`` examples in the ``blinkapp/`` directory for examples on how to migrate.
11-
129
**Disclaimer:**
1310
Published under the MIT license - See LICENSE file for more details.
1411

@@ -54,7 +51,10 @@ The simplest way to use this package from a terminal is to call ``await Blink.st
5451
5552
async def start():
5653
blink = Blink(session=ClientSession())
57-
await blink.start()
54+
try:
55+
await blink.start()
56+
except BlinkTwoFARequiredError:
57+
await blink.prompt_2fa()
5858
return blink
5959
6060
blink = asyncio.run(start())
@@ -78,7 +78,10 @@ In some cases, having an interactive command-line session is not desired. In th
7878
# Can set no_prompt when initializing auth handler
7979
auth = Auth({"username": <your username>, "password": <your password>}, no_prompt=True)
8080
blink.auth = auth
81-
await blink.start()
81+
try:
82+
await blink.start()
83+
except BlinkTwoFARequiredError:
84+
await blink.prompt_2fa()
8285
return blink
8386
8487
blink = asyncio.run(start())
@@ -108,7 +111,10 @@ Other use cases may involved loading credentials from a file. This file must be
108111
blink = Blink()
109112
auth = Auth(await json_load("<File Location>"))
110113
blink.auth = auth
111-
await blink.start()
114+
try:
115+
await blink.start()
116+
except BlinkTwoFARequiredError:
117+
await blink.prompt_2fa()
112118
return blink
113119
114120
blink = asyncio.run(start())

pyproject.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "blinkpy"
7-
version = "0.24.0b1"
7+
version = "0.25.0b0"
88
license = {text = "MIT"}
99
description = "A Blink camera Python Library."
1010
readme = "README.rst"
@@ -19,6 +19,8 @@ classifiers = [
1919
"Programming Language :: Python :: 3.10",
2020
"Programming Language :: Python :: 3.11",
2121
"Programming Language :: Python :: 3.12",
22+
"Programming Language :: Python :: 3.13",
23+
"Programming Language :: Python :: 3.14",
2224
"Topic :: Home Automation",
2325
]
2426
requires-python = ">=3.9.0"

requirements_test.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
ruff==0.11.13
2-
black==24.4.2
3-
build==1.2.1
4-
coverage==7.8.2
5-
pytest==8.4.0
6-
pytest-cov==6.1.1
7-
pytest-sugar==1.0.0
1+
ruff==0.14.1
2+
black==25.9.0
3+
build==1.3.0
4+
coverage==7.10.7
5+
pytest==8.4.2
6+
pytest-cov==7.0.0
7+
pytest-sugar==1.1.1
88
pytest-timeout==2.4.0
99
restructuredtext-lint==1.4.0
1010
pygments==2.19.1

0 commit comments

Comments
 (0)