Skip to content

Commit

Permalink
Merge tag 'v6.1.16' into develop
Browse files Browse the repository at this point in the history
Bump version to 6.1.16
  • Loading branch information
ivankravets committed Sep 26, 2024
2 parents 3aed8e1 + 67b2759 commit fe2e8a0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Unlock the true potential of embedded software development with
PlatformIO's collaborative ecosystem, embracing declarative principles,
test-driven methodologies, and modern toolchains for unrivaled success.

6.1.16 (2024-??-??)
6.1.16 (2024-09-26)
~~~~~~~~~~~~~~~~~~~

* Added support for Python 3.13
Expand Down
2 changes: 1 addition & 1 deletion docs
Submodule docs updated 0 files
2 changes: 1 addition & 1 deletion platformio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

VERSION = (6, 1, "16rc1")
VERSION = (6, 1, 16)
__version__ = ".".join([str(s) for s in VERSION])

__title__ = "platformio"
Expand Down
12 changes: 8 additions & 4 deletions platformio/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import platform

from platformio.compat import PY36, is_proxy_set
from platformio.compat import is_proxy_set


def get_core_dependencies():
Expand All @@ -30,7 +30,8 @@ def get_core_dependencies():

def get_pip_dependencies():
core = [
"bottle == %s" % ("0.12.*" if PY36 else "0.13.*"),
'bottle == 0.12.*; python_version < "3.7"',
'bottle == 0.13.*; python_version >= "3.7"',
"click >=8.0.4, <9",
"colorama",
"marshmallow == 3.*",
Expand All @@ -45,15 +46,18 @@ def get_pip_dependencies():
# PIO Home requirements
"ajsonrpc == 1.2.*",
"starlette >=0.19, <0.40",
"uvicorn %s" % ("== 0.16.0" if PY36 else ">=0.16, <0.31"),
'uvicorn == 0.16.0; python_version < "3.7"',
'uvicorn >=0.16, <0.31; python_version >= "3.7"',
"wsproto == 1.*",
]

extra = []

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

# issue 4614: urllib3 v2.0 only supports OpenSSL 1.1.1+
try:
Expand Down

0 comments on commit fe2e8a0

Please sign in to comment.