Skip to content

Commit c0a1079

Browse files
authored
Fix CI (#184)
* Fix tox config, and add newer pythons to CI * Pacify mypy * typing is hard * isort was feeling left out * mypy again * :shaking fist: isorrrrrrtttt!!! * Run autobahn tests on a version of ubuntu that exists * install py2 for autobahn tests * newer setup-python * 🫡 to autobahntestsuite -- you served us well, but now you are dead autobahntestsuite is abandoned, only runs on python 2, and has dependencies like wsaccel that are *also* abandoned and *don't* run on python 2. we could probably keep it limping along for a while with enough effort, but I don't think it's worth it.
1 parent a7d9ff0 commit c0a1079

13 files changed

+33
-600
lines changed

.github/workflows/ci.yml

+3-26
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ jobs:
1717
- 3.8
1818
- 3.9
1919
- "3.10"
20-
- pypy-3.7
20+
- "3.11"
21+
- pypy-3.9
2122

2223
steps:
2324
- uses: actions/checkout@v2
24-
- uses: actions/setup-python@v2
25+
- uses: actions/setup-python@v4
2526
with:
2627
python-version: ${{ matrix.python-version }}
2728
- name: Install tox
@@ -37,27 +38,3 @@ jobs:
3738
- uses: codecov/codecov-action@v1
3839
with:
3940
file: ./coverage.xml
40-
41-
autobahn:
42-
runs-on: ubuntu-18.04
43-
strategy:
44-
matrix:
45-
side: [client, server]
46-
47-
steps:
48-
- uses: actions/checkout@v2
49-
- uses: actions/setup-python@v2
50-
with:
51-
python-version: 3.8
52-
- name: Install tox
53-
run: |
54-
python -m pip install --upgrade pip setuptools
55-
pip install --upgrade tox
56-
- name: Initialize tox envs
57-
run: |
58-
tox --parallel auto --notest -e autobahn
59-
- name: Run autobahn
60-
run: |
61-
tox --parallel 0 -e autobahn
62-
env:
63-
SIDE: ${{ matrix.side }}

.gitignore

-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,3 @@ coverage.xml
1313
docs/build
1414
build
1515
dist
16-
17-
compliance/reports
18-
compliance/auto-tests-server-config.json
19-
compliance/auto-tests-client-config.json
20-
compliance/autobahntestsuite-venv/

MANIFEST.in

-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
graft src/wsproto
2-
graft compliance
32
graft example
43
graft docs
54
graft test
65
graft bench
76
prune docs/build
8-
prune compliance/reports
9-
prune compliance/auto-tests-server-config.json
10-
prune compliance/auto-tests-client-config.json
11-
prune compliance/autobahntestsuite-venv
127
include README.rst LICENSE CHANGELOG.rst tox.ini
138
global-exclude *.pyc *.pyo *.swo *.swp *.map *.yml *.DS_Store .coverage

README.rst

-31
Original file line numberDiff line numberDiff line change
@@ -91,37 +91,6 @@ And wsproto will issue events if the data contains any WebSocket messages or sta
9191
Take a look at our docs for a `full list of events
9292
<https://wsproto.readthedocs.io/en/latest/api.html#events>`!
9393

94-
Testing
95-
=======
96-
97-
It passes the autobahn test suite completely and strictly in both client and
98-
server modes and using permessage-deflate.
99-
100-
If you want to run the compliance tests, go into the compliance directory and
101-
then to test client mode, in one shell run the Autobahn test server:
102-
103-
.. code-block:: console
104-
105-
$ wstest -m fuzzingserver -s ws-fuzzingserver.json
106-
107-
And in another shell run the test client:
108-
109-
.. code-block:: console
110-
111-
$ python test_client.py
112-
113-
And to test server mode, run the test server:
114-
115-
.. code-block:: console
116-
117-
$ python test_server.py
118-
119-
And in another shell run the Autobahn test client:
120-
121-
.. code-block:: console
122-
123-
$ wstest -m fuzzingclient -s ws-fuzzingclient.json
124-
12594

12695
Documentation
12796
=============

compliance/run-autobahn-tests.py

-253
This file was deleted.

0 commit comments

Comments
 (0)