SYS-401 update requirements.txt and fix _filehash function for python3

instantlinux · Aug 7, 2019 · fc017e9 · fc017e9
1 parent 281842a
commit fc017e9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@ ENV CRON_HOUR=0,8,16 \
     TZ=UTC
 
 ARG RSNAPSHOT_VERSION=1.4.2-r0
-ARG SECONDSHOT_VERSION=0.9.2
+ARG SECONDSHOT_VERSION=0.9.4
 ARG RRSYNC_SHA=8c9482dee40c77622e3bde2da3967cc92a0b04e0c0ce3978738410d2dbd3d436
 
 VOLUME /backups /metadata /etc/secondshot/conf.d

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
-alembic==1.0.0
+alembic==1.0.11
 cryptography==2.3.1
 docopt==0.6.2
-PyMySQL==0.9.2
+PyMySQL==0.9.3
 six==1.11.0
-SQLAlchemy==1.2.10
-urllib3==1.23
+SQLAlchemy==1.3.6
+urllib3==1.25.3
diff --git a/secondshot/_version.py b/secondshot/_version.py
@@ -1 +1 @@
-__version__ = '0.9.3'
+__version__ = '0.9.4'
diff --git a/secondshot/actions.py b/secondshot/actions.py
@@ -651,7 +651,7 @@ def _filehash(file, hashtype):
         Raises:
             OS exceptions
         """
-        with open(file, 'r') as f:
+        with open(file, 'rb') as f:
             if (hashtype == 'md5'):
                 return hashlib.md5(f.read()).digest()
             elif (hashtype == 'sha256'):

diff --git a/setup.py b/setup.py
@@ -41,10 +41,10 @@ def run_tests(self):
     packages=setuptools.find_packages(exclude=['tests']),
     include_package_data=True,
     install_requires=[
-        'alembic',
-        'docopt',
-        'pymysql',
-        'sqlalchemy'],
+        'alembic>=1.0.0',
+        'docopt>=0.6.2',
+        'pymysql>=0.9.2',
+        'sqlalchemy>=1.3.6'],
     python_requires='>=2.7.3',
     test_suite='tests.unittests',
     cmdclass={'test': PyTest},
@@ -56,8 +56,6 @@ def run_tests(self):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7'
     ]