Skip to content

Commit

Permalink
SYS-576 update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
instantlinux committed Aug 14, 2023
1 parent 6b6253c commit 7161905
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ stages:
- Publish Packages
- Clean

image: instantlinux/python-builder:3.8.5-r0
image: instantlinux/python-builder:3.11.4-r0

before_script:
- export TAG=bld_$CI_PIPELINE_IID_${CI_COMMIT_SHA:0:7}
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8.5-alpine3.12
FROM python:3.11.4-alpine3.18
MAINTAINER Rich Braun <[email protected]>
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -18,9 +18,9 @@ ENV CRON_HOUR=0,8,16 \
PYTHONPATH=/usr/lib/python3.8/site-packages \
TZ=UTC

ARG RSNAPSHOT_VERSION=1.4.3-r0
ARG SECONDSHOT_VERSION=0.10.4
ARG RRSYNC_SHA=f7b931e73e811f76e0ad8466e654e374ee18025b837ec69abed805ff34e0f1ef
ARG RSNAPSHOT_VERSION=1.4.5-r0
ARG SECONDSHOT_VERSION=0.10.5
ARG RRSYNC_SHA=292468318c71c1817df2077558788256ed00a259ee6a1fc5a64d47bc28ab34bd

VOLUME /backups /metadata /etc/secondshot/conf.d

Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
alembic==1.4.3
cryptography==2.9.2
alembic==1.11.2
cryptography==41.0.3
docopt==0.6.2
PyMySQL==0.10.1
six==1.15.0
SQLAlchemy==1.3.19
urllib3==1.25.9
six==1.16.0
SQLAlchemy==1.3.24
urllib3==2.0.4
2 changes: 1 addition & 1 deletion secondshot/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.10.4'
__version__ = '0.10.5'
15 changes: 8 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ def run_tests(self):
packages=setuptools.find_packages(exclude=['tests']),
include_package_data=True,
install_requires=[
'alembic>=1.4.3',
'alembic>=1.11.2',
'docopt>=0.6.2',
'pymysql>=0.10.1',
'sqlalchemy>=1.3.19'],
python_requires='>=3.6',
'pymysql<1.0',
'sqlalchemy<1.4'],
python_requires='>=3.8',
test_suite='tests.unittests',
cmdclass={'test': PyTest},
classifiers=[
Expand All @@ -54,8 +54,9 @@ def run_tests(self):
'Topic :: System :: Archiving :: Backup',
'Intended Audience :: System Administrators',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8'
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11'
]
)
12 changes: 6 additions & 6 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
-r ../requirements.txt

coverage==5.3
flake8==3.8.3
coverage==7.3.0
flake8==6.1.0
mock==4.0.2
pytest==4.6.11
pytest-cov==2.10.1
twine==1.15.0
wheel==0.35.1
pytest==7.4.0
pytest-cov==4.1.0
twine==4.0.2
wheel==0.41.1
8 changes: 4 additions & 4 deletions tests/test_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def test_list_hosts(self):

obj = Actions(self.cli, db_engine=self.engine, db_session=self.session)
ret = obj.list_hosts()
del(ret['hosts'][0]['created'])
del ret['hosts'][0]['created']
self.assertEqual(ret, expected)

def test_list_savesets(self):
Expand All @@ -256,7 +256,7 @@ def test_list_savesets(self):

obj = Actions(self.cli, db_engine=self.engine, db_session=self.session)
ret = obj.list_savesets()
del(ret['savesets'][0]['created'])
del ret['savesets'][0]['created']
self.assertEqual(ret, expected)

def test_list_volumes(self):
Expand All @@ -272,8 +272,8 @@ def test_list_volumes(self):

obj = Actions(self.cli, db_engine=self.engine, db_session=self.session)
ret = obj.list_volumes()
del(ret['volumes'][0]['created'])
del(ret['volumes'][1]['created'])
del ret['volumes'][0]['created']
del ret['volumes'][1]['created']
self.assertEqual(ret, expected)

def test_filehash(self):
Expand Down

0 comments on commit 7161905

Please sign in to comment.