diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50242bc56f..e980ac7609 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,7 +68,7 @@ jobs: - name: Test with pytest run: | python -c 'from deluge._libtorrent import lt; print(lt.__version__)'; - $DEBUG_PREFIX pytest -v -m "not (todo or gtkui)" deluge + $DEBUG_PREFIX pytest -v --full-trace --showlocals -m "not (todo or security)" deluge - uses: actions/upload-artifact@v4 # capture all crashes as build artifacts @@ -124,4 +124,5 @@ jobs: - name: Test with pytest run: | python -c 'import libtorrent as lt; print(lt.__version__)'; - pytest -vvv -m "not (todo or gtkui or security)" deluge + python -c 'from twisted.internet import gireactor; reactor = gireactor.install()' + python -v -c "import pytest; retcode = pytest.main(['--full-trace','--showlocals','-vvv','-ra','-m "not (todo or security)"','deluge']); print(f'pytest returned: {retcode}')"; diff --git a/requirements.txt b/requirements.txt index 8e80f92e70..001af239c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ libtorrent<2.0.9 -twisted[tls] @ git+https://github.com/Lord-Kamina/twisted@8949cc15 ; sys_platform != 'win32' and python_version >= '3.8' +twisted[tls] @ git+https://github.com/Lord-Kamina/twisted@a4c0122b ; sys_platform != 'win32' and python_version >= '3.8' twisted[tls] >17.1,<=23.8 ; sys_platform != 'win32' and python_version < '3.8' twisted[tls]>=17.1,<23 ; python_version < '3.8' and sys_platform=='win32' -twisted[tls] @ git+https://github.com/Lord-Kamina/twisted@8949cc15 ; python_version >= '3.8' and sys_platform == 'win32' +twisted[tls] @ git+https://github.com/Lord-Kamina/twisted@a4c0122b ; python_version >= '3.8' and sys_platform == 'win32' rencode pyopenssl pyxdg diff --git a/setup.py b/setup.py index e79e1d0803..2f4c78083c 100755 --- a/setup.py +++ b/setup.py @@ -538,10 +538,10 @@ def run(self): setup_requires = ['setuptools', 'wheel'] install_requires = [ - "twisted[tls] @ git+https://github.com/Lord-Kamina/twisted@8949cc15 ; sys_platform != 'win32' and python_version >= '3.8'", + "twisted[tls] @ git+https://github.com/Lord-Kamina/twisted@a4c0122b ; sys_platform != 'win32' and python_version >= '3.8'", "twisted[tls] >17.1,<=23.8 ; sys_platform != 'win32' and python_version < '3.8'", "twisted[tls]>=17.1,<23 ; python_version < '3.8' and sys_platform=='win32'", - "twisted[tls] @ git+https://github.com/Lord-Kamina/twisted@8949cc15 ; python_version >= '3.8' and sys_platform == 'win32'", + "twisted[tls] @ git+https://github.com/Lord-Kamina/twisted@a4c0122b ; python_version >= '3.8' and sys_platform == 'win32'", # Add pyasn1 for setuptools workaround: # https://github.com/pypa/setuptools/issues/1510 'pyasn1',