Drop Python 3.4

Never gonna get master back to green working with a dead Python.
This commit is contained in:
Hugo Osvaldo Barrera 2020-06-08 13:34:17 +02:00
parent 558da29e5e
commit e987d6eb4a
6 changed files with 4 additions and 29 deletions

View file

@ -25,30 +25,6 @@
"env": "BUILD=style", "env": "BUILD=style",
"python": "3.6" "python": "3.6"
}, },
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
"python": "3.4"
},
{
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=devel ",
"python": "3.4"
},
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release ",
"python": "3.4"
},
{
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release ",
"python": "3.4"
},
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal ",
"python": "3.4"
},
{
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal ",
"python": "3.4"
},
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
"python": "3.5" "python": "3.5"

View file

@ -41,7 +41,7 @@ If your distribution doesn't provide a package for vdirsyncer, you still can
use Python's package manager "pip". First, you'll have to check that the use Python's package manager "pip". First, you'll have to check that the
following things are installed: following things are installed:
- Python 3.4+ and pip. - Python 3.5+ and pip.
- ``libxml`` and ``libxslt`` - ``libxml`` and ``libxslt``
- ``zlib`` - ``zlib``
- Linux or OS X. **Windows is not supported, see :gh:`535`.** - Linux or OS X. **Windows is not supported, see :gh:`535`.**

View file

@ -2,7 +2,7 @@ import itertools
import json import json
import sys import sys
python_versions = ("3.4", "3.5", "3.6") python_versions = ("3.5", "3.6")
latest_python = "3.6" latest_python = "3.6"
cfg = {} cfg = {}

View file

@ -95,7 +95,6 @@ setup(
'License :: OSI Approved :: BSD License', 'License :: OSI Approved :: BSD License',
'Operating System :: POSIX', 'Operating System :: POSIX',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.6',
'Topic :: Internet', 'Topic :: Internet',

View file

@ -22,7 +22,7 @@ except ImportError: # pragma: no cover
def _check_python_version(): # pragma: no cover def _check_python_version(): # pragma: no cover
import sys import sys
if sys.version_info < (3, 4, 0): if sys.version_info < (3, 4, 0):
print('vdirsyncer requires at least Python 3.4.') print('vdirsyncer requires at least Python 3.5.')
sys.exit(1) sys.exit(1)

View file

@ -212,7 +212,7 @@ def manage_sync_status(base_path, pair_name, collection_name):
with open(path, 'rb') as f: with open(path, 'rb') as f:
if f.read(1) == b'{': if f.read(1) == b'{':
f.seek(0) f.seek(0)
# json.load doesn't work on binary files for Python 3.4/3.5 # json.load doesn't work on binary files for Python 3.5
legacy_status = dict(json.loads(f.read().decode('utf-8'))) legacy_status = dict(json.loads(f.read().decode('utf-8')))
except (OSError, IOError, ValueError): except (OSError, IOError, ValueError):
pass pass