Skip to content

Commit 21718d7

Browse files
committed
Bump min Python version from 3.5.4 to 3.7.2
1 parent 64cfb8d commit 21718d7

13 files changed

+260
-293
lines changed

.travis.yml

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,32 @@
11
# Config file for automatic testing at travis-ci.com
22

33
language: python
4-
dist: bionic # VirtualEnv is too old on xenial
4+
dist: focal
55

66
matrix:
77
include:
8-
- python: "3.5"
9-
- python: "3.6"
108
- python: "3.7"
119
- python: "3.8"
12-
- python: "pypy3"
10+
# - python: "pypy3" travis doesn't support pypy on Python 3.7 yet
1311
- python: "3.8"
1412
env: IPFS_VERSION=compat
1513
- python: "3.8"
1614
env: TOXENV=py3-httpx
15+
dist: bionic
1716
- python: "3.8"
1817
env: TOXENV=styleck
1918
before_install: ":"
2019
- python: "3.8"
2120
env: TOXENV=typeck
2221
before_install: ":"
23-
22+
2423
# Testing on macOS/Darwin tends to be much slower so only test the bare minimum
2524
#
26-
# Minimum testing version is 3.6, since the 3.5 binaries from python.org fail
27-
# with TLS error when trying to install `tox`.
28-
#
2925
# When changing any version here also update the relevant checksum below with
3026
# the values found on the https://python.org/ website.
3127
- os: osx
3228
language: shell
33-
env: PYTHON_VERSION=3.6.8-macosx10.9
29+
env: PYTHON_VERSION=3.7.9-macosx10.9
3430
- os: osx
3531
language: shell
3632
env: PYTHON_VERSION=3.8.2-macosx10.9
@@ -113,7 +109,7 @@ install:
113109
114110
### ====== MODIFY THIS WHEN CHANGING MACOS PYTHON TEST VERSIONS ====== ###
115111
case "${PYTHON_VERSION}" in
116-
3.6.8-macosx10.9) MD5_MACOS="786c4d9183c754f58751d52f509bc971" ;;
112+
3.7.9-macosx10.9) MD5_MACOS="4b544fc0ac8c3cffdb67dede23ddb79e" ;;
117113
3.8.2-macosx10.9) MD5_MACOS="f12203128b5c639dc08e5a43a2812cc7" ;;
118114
esac
119115
### ------------------------------ END ------------------------------- ###

ipfshttpclient/client/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
VERSION_BLACKLIST = []
1818
VERSION_MAXIMUM = "0.8.0"
1919

20+
from . import base
2021
from . import bitswap
2122
from . import block
2223
from . import bootstrap

ipfshttpclient/client/base.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@
99
from .. import multipart, http, utils
1010

1111

12+
#XXX: Review if this is still necessary after requiring Python 3.8.
1213
if ty.TYPE_CHECKING:
1314
import typing_extensions as ty_ext
1415
else:
1516
ty_ext = utils
1617

18+
# Ensure that proper types show up when generating documentation without hard-depending on
19+
# the cid package.
1720
if "cid" in sys.modules:
1821
import cid # type: ignore[import]
1922
cid_t = ty.Union[str, cid.CIDv0, cid.CIDv1]
@@ -29,7 +32,7 @@
2932
json_primitive_t = utils.json_primitive_t
3033
json_value_t = utils.json_value_t
3134

32-
# The following would be much more useful once GH/python/mypy#4441 is implemented…
35+
#XXX: The following would be more useful with https://github.com/python/mypy/issues/4441
3336
if ty.TYPE_CHECKING:
3437
# Lame workaround for type checkers
3538
CommonArgs = ty.Union[bool, http.auth_t, http.cookies_t, http.reqdata_sync_t,
@@ -48,7 +51,7 @@
4851
else:
4952
CommonArgs = ty.Dict[str, ty.Any]
5053

51-
# work around GH/mypy/mypy#731: no recursive structural types yet
54+
#XXX: work around https://github.com/python/mypy/issues/731: no recursive structural types yet
5255
response_item_t = ty.Union[
5356
json_primitive_t,
5457
"ResponseBase",

ipfshttpclient/exceptions.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
The class hierachy for exceptions is::
2+
The class hierarchy for exceptions is::
33
44
Error
55
├── VersionMismatch
@@ -161,4 +161,4 @@ class ConnectionError(CommunicationError):
161161

162162
class TimeoutError(CommunicationError):
163163
"""Raised when the daemon didn't respond in time."""
164-
__slots__ = ()
164+
__slots__ = ()

0 commit comments

Comments
 (0)