Skip to content

Commit

Permalink
Merge branch 'mohr' into 'master'
Browse files Browse the repository at this point in the history
removed unnecessary deprecated flag 'U' in open

See merge request dlr-pa/pfu!12
  • Loading branch information
daniel-mohr committed Apr 25, 2023
2 parents 698d27f + 6c2e026 commit aecb33e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/unittest_pytest_coverage_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,25 +195,25 @@ jobs:
uses: vmactions/freebsd-vm@v0
with:
usesh: true
prepare: pkg install -y devel/py-setuptools devel/py-pytest devel/py-pytest-cov devel/py-pytest-xdist
prepare: pkg install -y devel/py-setuptools devel/py-pytest devel/py-pytest-cov devel/py-pytest-xdist shells/bash
run: |
set -e -x
cat /etc/os-release
pwd
ls -lah
whoami
freebsd-version
which python3.8
python3.8 setup.py install --record installed_files.txt
which python3.9
python3.9 setup.py install --record installed_files.txt
which pfu
pfu -h
pfu simscrub -h
pfu create_checksum -h
pfu check_checksum -h
pfu replicate -h
pfu speed_test -h
python3.8 setup.py run_unittest
python3.8 setup.py run_pytest --parallel --coverage
python3.9 setup.py run_unittest
python3.9 setup.py run_pytest --parallel --coverage
cat installed_files.txt | xargs rm -rf && echo "uninstalled/removed: "$(cat installed_files.txt)
amd64_opensuse_leap_152_test:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
:Author: Daniel Mohr
:Email: [email protected]
:Date: 2023-04-20
:Date: 2023-04-23
:License: GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007.
"""

Expand Down Expand Up @@ -249,7 +249,7 @@ def run(self):

setuptools.setup(
name='pfu',
version='2023.04.20',
version='2023.04.23',
cmdclass={
'check_modules': CheckModules,
'run_unittest': TestWithUnittest,
Expand Down
8 changes: 4 additions & 4 deletions src/pfu_module/check_checksum/check_checksum.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
Author: Daniel Mohr.
Date: 2017-03-07, 2021-05-25 (last change).
Date: 2017-03-07, 2021-05-25, 2023-04-25 (last change).
License: GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007.
"""
Expand All @@ -23,7 +23,7 @@ class CheckChecksumsClass():
"""
:Author: Daniel Mohr
:Email: [email protected]
:Date: 2017-03-07, 2021-05-25 (last change).
:Date: 2017-03-07, 2021-05-25, 2023-04-25 (last change).
:License: GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007.
class to check checksums in directory or directories
Expand Down Expand Up @@ -341,7 +341,7 @@ def read_hash_file(self, hashfilename):
"""
:Author: Daniel Mohr
:Email: [email protected]
:Date: 2017-02-25 (last change).
:Date: 2017-02-25, 2023-04-25 (last change).
:License: GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007.
read hash file
Expand All @@ -351,7 +351,7 @@ def read_hash_file(self, hashfilename):
if (os.path.isfile(hashfilename) and
os.access(hashfilename, os.R_OK)):
self.log.debug("read hash file \"%s\"", hashfilename)
with open(hashfilename, mode='rU', encoding='utf-8') as hash_file:
with open(hashfilename, mode='r', encoding='utf-8') as hash_file:
for line in hash_file:
sres = self.regexps[0].search(line)
if sres: # hash of a chunk
Expand Down

0 comments on commit aecb33e

Please sign in to comment.