Skip to content

Commit e987d6e

Browse files
author
Hugo Osvaldo Barrera
committed
Drop Python 3.4
Never gonna get master back to green working with a dead Python.
1 parent 558da29 commit e987d6e

File tree

6 files changed

+4
-29
lines changed

6 files changed

+4
-29
lines changed

.travis.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,6 @@
2525
"env": "BUILD=style",
2626
"python": "3.6"
2727
},
28-
{
29-
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
30-
"python": "3.4"
31-
},
32-
{
33-
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=devel ",
34-
"python": "3.4"
35-
},
36-
{
37-
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release ",
38-
"python": "3.4"
39-
},
40-
{
41-
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release ",
42-
"python": "3.4"
43-
},
44-
{
45-
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal ",
46-
"python": "3.4"
47-
},
48-
{
49-
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal ",
50-
"python": "3.4"
51-
},
5228
{
5329
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
5430
"python": "3.5"

docs/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If your distribution doesn't provide a package for vdirsyncer, you still can
4141
use Python's package manager "pip". First, you'll have to check that the
4242
following things are installed:
4343

44-
- Python 3.4+ and pip.
44+
- Python 3.5+ and pip.
4545
- ``libxml`` and ``libxslt``
4646
- ``zlib``
4747
- Linux or OS X. **Windows is not supported, see :gh:`535`.**

scripts/make_travisconf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import json
33
import sys
44

5-
python_versions = ("3.4", "3.5", "3.6")
5+
python_versions = ("3.5", "3.6")
66
latest_python = "3.6"
77

88
cfg = {}

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ def run(self):
9595
'License :: OSI Approved :: BSD License',
9696
'Operating System :: POSIX',
9797
'Programming Language :: Python :: 3',
98-
'Programming Language :: Python :: 3.4',
9998
'Programming Language :: Python :: 3.5',
10099
'Programming Language :: Python :: 3.6',
101100
'Topic :: Internet',

vdirsyncer/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
def _check_python_version(): # pragma: no cover
2323
import sys
2424
if sys.version_info < (3, 4, 0):
25-
print('vdirsyncer requires at least Python 3.4.')
25+
print('vdirsyncer requires at least Python 3.5.')
2626
sys.exit(1)
2727

2828

vdirsyncer/cli/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def manage_sync_status(base_path, pair_name, collection_name):
212212
with open(path, 'rb') as f:
213213
if f.read(1) == b'{':
214214
f.seek(0)
215-
# json.load doesn't work on binary files for Python 3.4/3.5
215+
# json.load doesn't work on binary files for Python 3.5
216216
legacy_status = dict(json.loads(f.read().decode('utf-8')))
217217
except (OSError, IOError, ValueError):
218218
pass

0 commit comments

Comments
 (0)