Skip to content

Commit 7e2ab21

Browse files
authored
Merge pull request #512 from GoSecure/pyrdp-dep-update
Pyrdp dependency updates and CI stress
2 parents 2147093 + 388ee79 commit 7e2ab21

5 files changed

Lines changed: 62 additions & 48 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
matrix:
3737
os: [ubuntu-22.04, ubuntu-20.04]
3838
# Lets try to keep testing an LTS python and latest python
39-
python-version: ['3.7', '3.12', '3.13']
39+
python-version: ['3.8', '3.12', '3.13']
4040

4141
runs-on: ${{ matrix.os }}
4242
name: Ubuntu ${{ matrix.os }} with Python ${{ matrix.python-version }}
@@ -57,9 +57,12 @@ jobs:
5757
- name: Install PyRDP dependencies
5858
run: |
5959
sudo apt-get update && sudo apt-get install -y --no-install-recommends \
60-
build-essential python3-dev \
60+
build-essential python3-dev pkg-config \
6161
libegl1 libxcb-cursor0 libxkbcommon-x11-0 libxcb-icccm4 libxcb-keysyms1 \
62-
libavcodec58 libavdevice58
62+
libavcodec58 libavdevice58 \
63+
libavformat-dev libavcodec-dev libavdevice-dev libavfilter-dev \
64+
libswscale-dev libavutil-dev
65+
6366
- name: Install PyRDP
6467
working-directory: .
6568
run: pip install -U -e .[full]
@@ -106,7 +109,7 @@ jobs:
106109
strategy:
107110
matrix:
108111
# Lets try to keep testing an LTS python and latest python
109-
python-version: ['3.7', '3.12', '3.13']
112+
python-version: ['3.8', '3.12', '3.13']
110113

111114
name: Windows with Python ${{ matrix.python-version }}
112115
steps:

Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ ARG DEBIAN_FRONTEND=noninteractive
66
RUN apt-get update && apt-get install -y --no-install-recommends \
77
python3 python3-pip python3-venv \
88
# Required to build RLE module
9-
build-essential python3-dev
9+
build-essential python3-dev pkg-config \
10+
libavformat-dev libavcodec-dev libavdevice-dev libavfilter-dev \
11+
libswscale-dev libavutil-dev \
12+
# minimize image size
13+
&& rm -rf /var/lib/apt/lists/*
1014

1115
RUN python3 -m venv /opt/venv
1216
# Make sure we use the virtualenv:

pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ dependencies = [
4141
'appdirs>=1,<2',
4242
'cryptography>=3.3.2,<42',
4343
'namesgenerator>=0.3,<1',
44+
# working around Windows build bugs #512
45+
'numpy>=1,<2; python_version < "3.13"',
46+
"numpy>=1.26.4; python_version >= '3.13'",
4447
'progressbar2>=3.20,<5',
4548
'pyasn1>=0,<1',
4649
'pycryptodome>=3.5,<4',
@@ -55,7 +58,7 @@ dependencies = [
5558
[project.optional-dependencies]
5659
full = [
5760
'wheel>=0.34.2',
58-
'av>=8,<15',
61+
'av>=8,<14',
5962
'PySide6>=6.3,<7',
6063
'qimage2ndarray>=1.6,<2',
6164
'py-notifier>=0.5.0',

requirements-slim.txt

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
appdirs==1.4.4
2-
attrs==23.2.0
3-
Automat==22.10.0
4-
cffi==1.16.0
2+
attrs==26.1.0
3+
Automat==25.4.16
4+
cffi==2.0.0
55
constantly==23.10.4
66
cryptography==41.0.7
77
hyperlink==21.0.0
8-
idna==3.6
9-
incremental==22.10.0
8+
idna==3.14
9+
Incremental==24.11.0
1010
namesgenerator==0.3
11-
progressbar2==4.3.2
12-
pyasn1==0.5.1
13-
pyasn1-modules==0.3.0
14-
pycparser==2.21
15-
pycryptodome==3.20.0
11+
packaging==26.2
12+
progressbar2==4.5.0
13+
py-notifier==0.5.0
14+
pyasn1==0.6.3
15+
pyasn1_modules==0.4.2
16+
pycparser==3.0
17+
pycryptodome==3.23.0
1618
pyOpenSSL==23.3.0
17-
pytz==2023.3.post1
18-
rsa==4.9
19-
scapy==2.5.0
20-
service-identity==24.1.0
21-
six==1.16.0
22-
Twisted==23.10.0
23-
typing_extensions==4.9.0
24-
zope.interface==6.1
19+
pytz==2026.2
20+
qimage2ndarray==1.10.0
21+
rsa==4.9.1
22+
scapy==2.7.0
23+
service-identity==24.2.0
24+
Twisted==26.4.0
25+
typing_extensions==4.15.0
26+
wheel==0.47.0
27+
zope.interface==8.4

requirements.txt

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
appdirs==1.4.4
2-
attrs==23.2.0
3-
Automat==22.10.0
2+
attrs==26.1.0
3+
Automat==25.4.16
44
av==11.0.0
5-
cffi==1.16.0
5+
cffi==2.0.0
66
constantly==23.10.4
77
cryptography==41.0.7
88
hyperlink==21.0.0
9-
idna==3.6
10-
incremental==22.10.0
9+
idna==3.14
10+
Incremental==24.11.0
1111
namesgenerator==0.3
12-
numpy==1.26.3
13-
progressbar2==4.3.2
12+
numpy==1.26.4
13+
packaging==26.2
14+
progressbar2==4.5.0
1415
py-notifier==0.5.0
15-
pyasn1==0.5.1
16-
pyasn1-modules==0.3.0
17-
pycparser==2.21
18-
pycryptodome==3.20.0
16+
pyasn1==0.6.3
17+
pyasn1_modules==0.4.2
18+
pycparser==3.0
19+
pycryptodome==3.23.0
1920
pyOpenSSL==23.3.0
20-
PySide6==6.6.1
21-
PySide6-Addons==6.6.1
22-
PySide6-Essentials==6.6.1
23-
python-utils==3.8.1
24-
pytz==2023.3.post1
21+
PySide6==6.11.0
22+
PySide6_Addons==6.11.0
23+
PySide6_Essentials==6.11.0
24+
python-utils==3.9.1
25+
pytz==2026.2
2526
qimage2ndarray==1.10.0
26-
rsa==4.9
27-
scapy==2.5.0
28-
service-identity==24.1.0
29-
shiboken6==6.6.1
30-
six==1.16.0
31-
Twisted==23.10.0
32-
typing_extensions==4.9.0
33-
zope.interface==6.1
27+
rsa==4.9.1
28+
scapy==2.7.0
29+
service-identity==24.2.0
30+
shiboken6==6.11.0
31+
Twisted==26.4.0
32+
typing_extensions==4.15.0
33+
wheel==0.47.0
34+
zope.interface==8.4

0 commit comments

Comments
 (0)