parent
08a8abd17f
commit
ba6105e53f
2 changed files with 55 additions and 4 deletions
|
@ -0,0 +1,51 @@
|
||||||
|
From e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Germar Reitze <germar.reitze@gmail.com>
|
||||||
|
Date: Mon, 5 Jul 2021 19:11:58 +0200
|
||||||
|
Subject: [PATCH] Tests no longer work with Python 3.10 (fixes: #1175)
|
||||||
|
|
||||||
|
---
|
||||||
|
CHANGES | 5 ++++-
|
||||||
|
common/tools.py | 7 +++++--
|
||||||
|
2 files changed, 9 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CHANGES b/CHANGES
|
||||||
|
index c01501f2..0eb5b489 100644
|
||||||
|
--- a/CHANGES
|
||||||
|
+++ b/CHANGES
|
||||||
|
@@ -1,7 +1,10 @@
|
||||||
|
Back In Time
|
||||||
|
|
||||||
|
+Version 1.3.2
|
||||||
|
+* Fix bug: Tests no longer work with Python 3.10 (https://github.com/bit-team/backintime/issues/1175)
|
||||||
|
+
|
||||||
|
Version 1.3.1
|
||||||
|
-* bump version, forgot to push branch to Github before releasing
|
||||||
|
+* bump version, forgot to push branch to Github before releasing
|
||||||
|
|
||||||
|
Version 1.3.0
|
||||||
|
* Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis (https://github.com/bit-team/backintime/pull/1157)
|
||||||
|
diff --git a/common/tools.py b/common/tools.py
|
||||||
|
index 528da707..12645224 100644
|
||||||
|
--- a/common/tools.py
|
||||||
|
+++ b/common/tools.py
|
||||||
|
@@ -25,7 +25,10 @@
|
||||||
|
import errno
|
||||||
|
import gzip
|
||||||
|
import tempfile
|
||||||
|
-import collections
|
||||||
|
+try:
|
||||||
|
+ from collections.abc import MutableSet
|
||||||
|
+except ImportError:
|
||||||
|
+ from collections import MutableSet
|
||||||
|
import hashlib
|
||||||
|
import ipaddress
|
||||||
|
import atexit
|
||||||
|
@@ -1802,7 +1805,7 @@ def reset(self, path):
|
||||||
|
self.history = [path,]
|
||||||
|
self.index = 0
|
||||||
|
|
||||||
|
-class OrderedSet(collections.MutableSet):
|
||||||
|
+class OrderedSet(MutableSet):
|
||||||
|
"""
|
||||||
|
OrderedSet from Python recipe
|
||||||
|
http://code.activestate.com/recipes/576694/
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'backintime'
|
# Template file for 'backintime'
|
||||||
pkgname=backintime
|
pkgname=backintime
|
||||||
version=1.2.1
|
version=1.3.1
|
||||||
revision=3
|
revision=1
|
||||||
configure_args="--python3"
|
configure_args="--python3"
|
||||||
pycompile_dirs="/usr/share/backintime"
|
pycompile_dirs="/usr/share/backintime"
|
||||||
hostmakedepends="gettext python3"
|
hostmakedepends="gettext python3"
|
||||||
|
@ -10,8 +10,8 @@ short_desc="Simple backup tool for Linux"
|
||||||
maintainer="Alpicoid <alpicoid@tuta.io>"
|
maintainer="Alpicoid <alpicoid@tuta.io>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://github.com/bit-team/backintime"
|
homepage="https://github.com/bit-team/backintime"
|
||||||
distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
|
distfiles="https://github.com/bit-team/backintime/releases/download/${version}/backintime-${version}.tar.gz"
|
||||||
checksum=eef2aa4f43ac23fb0d45239a4bb2f7e5025afdca2ae4e6d6d9d6e722e8b17644
|
checksum=4ffbca4f92c16a7f1c6ce2df17ea88ca13ebf70a2771286e3eebacdce3a2a44e
|
||||||
python_version=3
|
python_version=3
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
|
|
Loading…
Reference in a new issue