Dropped Python 2 support. Now Python 3 only.
This commit is contained in:
parent
ebd34f1695
commit
9212f87735
6 changed files with 8 additions and 20 deletions
1
NEWS
1
NEWS
|
@ -2,6 +2,7 @@
|
|||
|
||||
* #18: Fix for README mention of sample files not included in package.
|
||||
* #22: Sample files for triggering borgmatic from a systemd timer.
|
||||
* Dropped Python 2 support. Now Python 3 only.
|
||||
* Added logo.
|
||||
|
||||
1.0.3
|
||||
|
|
|
@ -59,6 +59,9 @@ To install borgmatic, run the following command to download and install it:
|
|||
|
||||
sudo pip install --upgrade borgmatic
|
||||
|
||||
Make sure you're using Python 3, as borgmatic does not support Python 2. (You
|
||||
may have to use "pip3" instead of "pip".)
|
||||
|
||||
Then, download a [sample config
|
||||
file](https://torsion.org/hg/borgmatic/raw-file/tip/sample/config) and a
|
||||
[sample excludes
|
||||
|
|
|
@ -1,10 +1,4 @@
|
|||
from collections import OrderedDict, namedtuple
|
||||
|
||||
try:
|
||||
# Python 2
|
||||
from ConfigParser import RawConfigParser
|
||||
except ImportError:
|
||||
# Python 3
|
||||
from configparser import RawConfigParser
|
||||
|
||||
|
||||
|
|
|
@ -3,9 +3,4 @@ import sys
|
|||
|
||||
|
||||
def builtins_mock():
|
||||
try:
|
||||
# Python 2
|
||||
return flexmock(sys.modules['__builtin__'])
|
||||
except KeyError:
|
||||
# Python 3
|
||||
return flexmock(sys.modules['builtins'])
|
||||
|
|
|
@ -1,8 +1,3 @@
|
|||
try:
|
||||
# Python 2
|
||||
from cStringIO import StringIO
|
||||
except ImportError:
|
||||
# Python 3
|
||||
from io import StringIO
|
||||
|
||||
from collections import OrderedDict
|
||||
|
|
2
tox.ini
2
tox.ini
|
@ -1,5 +1,5 @@
|
|||
[tox]
|
||||
envlist=py27,py34
|
||||
envlist=py34
|
||||
skipsdist=True
|
||||
|
||||
[testenv]
|
||||
|
|
Loading…
Reference in a new issue