Skip to content

Commit 8da8ac5

Browse files
authored
Changes for CI tests (#311)
1 parent 8f9aceb commit 8da8ac5

7 files changed

Lines changed: 25 additions & 25 deletions

File tree

.github/workflows/lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
env:
3232
DEBIAN_FRONTEND: noninteractive
3333
run: |
34-
apt-get update -q
35-
apt-get install -y libterm-readline-gnu-perl locales software-properties-common
34+
apt update -q
35+
apt install -y libterm-readline-gnu-perl locales software-properties-common
3636
locale-gen en_US.UTF-8
3737
ln -f -s /usr/share/zoneinfo/UTC /etc/localtime
3838
- name: Install dependencies
@@ -42,8 +42,8 @@ jobs:
4242
add-apt-repository -y universe
4343
add-apt-repository -y ppa:deadsnakes/ppa
4444
add-apt-repository -y ppa:gift/dev
45-
apt-get update -q
46-
apt-get install -y build-essential git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
45+
apt update -q
46+
apt install -y build-essential git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
4747
- name: Run linter
4848
env:
4949
LANG: en_US.UTF-8

.github/workflows/test_docker.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ jobs:
4646
env:
4747
DEBIAN_FRONTEND: noninteractive
4848
run: |
49-
apt-get update -q
50-
apt-get install -y libterm-readline-gnu-perl locales software-properties-common
49+
apt update -q
50+
apt install -y libterm-readline-gnu-perl locales software-properties-common
5151
locale-gen en_US.UTF-8
5252
ln -f -s /usr/share/zoneinfo/UTC /etc/localtime
5353
- name: Install dependencies
5454
run: |
5555
add-apt-repository -y ppa:gift/dev
56-
apt-get update -q
57-
apt-get install -y build-essential python3 python3-build python3-dev python3-pip python3-setuptools python3-venv python3-wheel
56+
apt update -q
57+
apt install -y build-essential python3 python3-build python3-dev python3-pip python3-setuptools python3-venv python3-wheel
5858
- name: Run tests
5959
env:
6060
LANG: en_US.UTF-8

.github/workflows/test_docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
env:
2323
DEBIAN_FRONTEND: noninteractive
2424
run: |
25-
apt-get update -q
26-
apt-get install -y libterm-readline-gnu-perl locales software-properties-common
25+
apt update -q
26+
apt install -y libterm-readline-gnu-perl locales software-properties-common
2727
locale-gen en_US.UTF-8
2828
ln -f -s /usr/share/zoneinfo/UTC /etc/localtime
2929
- name: Install dependencies
@@ -33,8 +33,8 @@ jobs:
3333
add-apt-repository -y universe
3434
add-apt-repository -y ppa:deadsnakes/ppa
3535
add-apt-repository -y ppa:gift/dev
36-
apt-get update -q
37-
apt-get install -y build-essential git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
36+
apt update -q
37+
apt install -y build-essential git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
3838
- name: Run tests
3939
env:
4040
LANG: en_US.UTF-8

.github/workflows/test_tox.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
env:
3333
DEBIAN_FRONTEND: noninteractive
3434
run: |
35-
apt-get update -q
36-
apt-get install -y libterm-readline-gnu-perl locales software-properties-common
35+
apt update -q
36+
apt install -y libterm-readline-gnu-perl locales software-properties-common
3737
locale-gen en_US.UTF-8
3838
ln -f -s /usr/share/zoneinfo/UTC /etc/localtime
3939
- name: Install dependencies
@@ -43,8 +43,8 @@ jobs:
4343
add-apt-repository -y universe
4444
add-apt-repository -y ppa:deadsnakes/ppa
4545
add-apt-repository -y ppa:gift/dev
46-
apt-get update -q
47-
apt-get install -y build-essential git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
46+
apt update -q
47+
apt install -y build-essential git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
4848
- name: Run tests
4949
env:
5050
LANG: en_US.UTF-8
@@ -63,8 +63,8 @@ jobs:
6363
env:
6464
DEBIAN_FRONTEND: noninteractive
6565
run: |
66-
apt-get update -q
67-
apt-get install -y libterm-readline-gnu-perl locales software-properties-common
66+
apt update -q
67+
apt install -y libterm-readline-gnu-perl locales software-properties-common
6868
locale-gen en_US.UTF-8
6969
ln -f -s /usr/share/zoneinfo/UTC /etc/localtime
7070
- name: Install dependencies
@@ -74,8 +74,8 @@ jobs:
7474
add-apt-repository -y universe
7575
add-apt-repository -y ppa:deadsnakes/ppa
7676
add-apt-repository -y ppa:gift/dev
77-
apt-get update -q
78-
apt-get install -y build-essential curl git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
77+
apt update -q
78+
apt install -y build-essential curl git pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools tox
7979
- name: Run tests with coverage
8080
env:
8181
LANG: en_US.UTF-8

docs/sources/user/Installation-instructions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ sudo add-apt-repository ppa:gift/stable
3838
Update and install dfDateTime:
3939

4040
```bash
41-
sudo apt-get update
42-
sudo apt-get install python3-dfdatetime
41+
sudo apt update
42+
sudo apt install python3-dfdatetime
4343
```
4444

4545
## Windows

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "dfdatetime"
7-
version = "20260515"
7+
version = "20260521"
88
description = "Digital Forensics date and time (dfDateTime)"
99
maintainers = [
1010
{ name = "Log2Timeline maintainers", email = "log2timeline-maintainers@googlegroups.com" },

utils/dependencies.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,12 @@ def __init__(
137137

138138
dependency_reader = DependencyDefinitionReader()
139139

140-
with open(dependencies_file, "r", encoding="utf-8") as file_object:
140+
with open(dependencies_file, encoding="utf-8") as file_object:
141141
for dependency in dependency_reader.Read(file_object):
142142
self.dependencies[dependency.name] = dependency
143143

144144
if os.path.exists(test_dependencies_file):
145-
with open(test_dependencies_file, "r", encoding="utf-8") as file_object:
145+
with open(test_dependencies_file, encoding="utf-8") as file_object:
146146
for dependency in dependency_reader.Read(file_object):
147147
self._test_dependencies[dependency.name] = dependency
148148

0 commit comments

Comments
 (0)