Skip to content

Commit fe2e8a0

Browse files
committed
Merge tag 'v6.1.16' into develop
Bump version to 6.1.16
2 parents 3aed8e1 + 67b2759 commit fe2e8a0

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

HISTORY.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Unlock the true potential of embedded software development with
1818
PlatformIO's collaborative ecosystem, embracing declarative principles,
1919
test-driven methodologies, and modern toolchains for unrivaled success.
2020

21-
6.1.16 (2024-??-??)
21+
6.1.16 (2024-09-26)
2222
~~~~~~~~~~~~~~~~~~~
2323

2424
* Added support for Python 3.13

docs

Submodule docs updated from 54af366 to dd3d549

platformio/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
VERSION = (6, 1, "16rc1")
15+
VERSION = (6, 1, 16)
1616
__version__ = ".".join([str(s) for s in VERSION])
1717

1818
__title__ = "platformio"

platformio/dependencies.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import platform
1616

17-
from platformio.compat import PY36, is_proxy_set
17+
from platformio.compat import is_proxy_set
1818

1919

2020
def get_core_dependencies():
@@ -30,7 +30,8 @@ def get_core_dependencies():
3030

3131
def get_pip_dependencies():
3232
core = [
33-
"bottle == %s" % ("0.12.*" if PY36 else "0.13.*"),
33+
'bottle == 0.12.*; python_version < "3.7"',
34+
'bottle == 0.13.*; python_version >= "3.7"',
3435
"click >=8.0.4, <9",
3536
"colorama",
3637
"marshmallow == 3.*",
@@ -45,15 +46,18 @@ def get_pip_dependencies():
4546
# PIO Home requirements
4647
"ajsonrpc == 1.2.*",
4748
"starlette >=0.19, <0.40",
48-
"uvicorn %s" % ("== 0.16.0" if PY36 else ">=0.16, <0.31"),
49+
'uvicorn == 0.16.0; python_version < "3.7"',
50+
'uvicorn >=0.16, <0.31; python_version >= "3.7"',
4951
"wsproto == 1.*",
5052
]
5153

5254
extra = []
5355

5456
# issue #4702; Broken "requests/charset_normalizer" on macOS ARM
5557
if platform.system() == "Darwin" and "arm" in platform.machine().lower():
56-
extra.append("chardet>=3.0.2,<6")
58+
extra.append(
59+
'chardet >= 3.0.2,<6; platform_system == "Darwin" and "arm" in platform_machine'
60+
)
5761

5862
# issue 4614: urllib3 v2.0 only supports OpenSSL 1.1.1+
5963
try:

0 commit comments

Comments
 (0)