Skip to content

Commit bef42d9

Browse files
authored
sync (#1441)
* update and fix CI/CD * bump release
1 parent 268e986 commit bef42d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+167
-195
lines changed

.github/workflows/main.yml

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818

1919
jobs:
2020
check:
21-
runs-on: ubuntu-latest
21+
runs-on: ubuntu-20.04
2222
steps:
2323
- uses: actions/checkout@v2
2424

@@ -44,9 +44,10 @@ jobs:
4444
# since we use --parallel-mode to coverage inside Tox we use
4545
# "coverage combine" so the filename is always ".coverage"
4646
- name: Run Coverage
47+
env:
48+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
4749
run: |
4850
tox -c tox.ini -e coverage
49-
coverage combine && codecov
5051
5152
test:
5253
env:
@@ -56,11 +57,14 @@ jobs:
5657
runs-on: ${{ matrix.os }}
5758
strategy:
5859
matrix:
59-
os: [ubuntu-latest]
60-
# os: [ubuntu-latest, macos-latest, windows-latest]
60+
os: [ubuntu-20.04]
61+
# os: [ubuntu-20.04, macos-latest, windows-latest]
6162

6263
# https://github.com/actions/setup-python#specifying-a-pypy-version
63-
python-version: ['3.6', '3.7', '3.8', '3.9', 'pypy-3.6', 'pypy-3.7']
64+
# python-version: ['3.6', '3.7', '3.8', '3.9', 'pypy-3.6', 'pypy-3.7']
65+
# framework: ['asyncio', 'tw189', 'tw1910', 'tw203', 'twtrunk']
66+
python-version: ['3.6', '3.9', 'pypy-3.7']
67+
framework: ['asyncio', 'tw203', 'twtrunk']
6468

6569
# https://github.blog/changelog/2020-04-15-github-actions-new-workflow-features/
6670
# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepscontinue-on-error
@@ -71,9 +75,11 @@ jobs:
7175
- uses: actions/checkout@v2
7276

7377
# Install OS packages, as we install Python packages from source:
74-
# libenchant-dev: needed for pyenchant, needed for sphinx-spellcheck
75-
# libbz2-dev, libsnappy-dev: needed for compression
76-
# libunwind-dev: needed for vmprof
78+
#
79+
# libenchant-dev needed for pyenchant, needed for sphinx-spellcheck
80+
# libbz2-dev, libsnappy-dev needed for compression
81+
# libunwind-dev needed for vmprof
82+
#
7783
- name: Install OS package dependencies
7884
run: |
7985
sudo apt update
@@ -95,14 +101,18 @@ jobs:
95101
96102
- name: Install this package
97103
run: |
98-
pip install .
104+
make abi_files
105+
pip install .[all]
99106
100107
- name: Run unit tests (PyTest)
101108
run: |
102-
tox -c tox.ini
109+
python -c "import autobahn; print(autobahn.__version__)"
110+
python -c "from autobahn import xbr; print(xbr.HAS_XBR)"
111+
python -c "from autobahn.testutil import FakeTransport; print(FakeTransport)"
112+
tox -c tox.ini -e ${{ matrix.framework }}
103113
104114
docs:
105-
runs-on: ubuntu-latest
115+
runs-on: ubuntu-20.04
106116
steps:
107117
- uses: actions/checkout@v2
108118

@@ -122,6 +132,11 @@ jobs:
122132
python -m pip install --upgrade pip
123133
pip install -r requirements-dev.txt
124134
135+
- name: Install this package
136+
run: |
137+
make abi_files
138+
pip install .[all]
139+
125140
- name: Run Sphinx
126141
run: tox -c tox.ini -e sphinx
127142

@@ -139,15 +154,14 @@ jobs:
139154
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
140155
WAMP_PRIVATE_KEY: ${{ secrets.WAMP_PRIVATE_KEY }}
141156

142-
runs-on: ubuntu-latest
157+
runs-on: ubuntu-20.04
143158
steps:
144159
- uses: actions/checkout@v2
145160

146161
# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
147162
# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#adding-a-system-path
148163
- name: Set environment
149164
run: |
150-
echo "${HOME}/.local/bin" >> $GITHUB_PATH
151165
echo BUILD_DATE=`date -u +"%Y-%m-%d"` >> $GITHUB_ENV
152166
echo AUTOBAHN_VCS_REF=`git rev-parse --short ${GITHUB_SHA}` >> $GITHUB_ENV
153167
echo AUTOBAHN_BUILD_ID=$(date --utc +%Y%m%d)-$(git rev-parse --short ${GITHUB_SHA}) >> $GITHUB_ENV

README.rst

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ WebSocket & WAMP for Python on Twisted and asyncio.
88
--------------
99

1010
| **Quick Links**: `Source Code <https://github.com/crossbario/autobahn-python>`__ - `Documentation <https://autobahn.readthedocs.io/en/latest/>`__ - `WebSocket Examples <https://autobahn.readthedocs.io/en/latest/websocket/examples.html>`__ - `WAMP Examples <https://autobahn.readthedocs.io/en/latest/wamp/examples.html>`__
11-
| **Community**: `Mailing list <http://groups.google.com/group/autobahnws>`__ - `StackOverflow <http://stackoverflow.com/questions/tagged/autobahn>`__ - `Twitter <https://twitter.com/autobahnws>`__ - `IRC #autobahn/chat.freenode.net <https://webchat.freenode.net/>`__
12-
| **Companion Projects**: `Autobahn|JS <https://github.com/crossbario/autobahn-js/>`__ - `Autobahn|Cpp <https://github.com/crossbario/autobahn-cpp>`__ - `Autobahn|Testsuite <https://github.com/crossbario/autobahn-testsuite>`__ - `Crossbar.io <http://crossbar.io>`__ - `WAMP <http://wamp-proto.org>`__
11+
| **Community**: `Forum <https://gitter.im/crossbario/public>`__ - `StackOverflow <https://stackoverflow.com/questions/tagged/autobahn>`__ - `Twitter <https://twitter.com/autobahnws>`__ - `IRC #autobahn/chat.freenode.net <https://webchat.freenode.net/>`__
12+
| **Companion Projects**: `Autobahn|JS <https://github.com/crossbario/autobahn-js/>`__ - `Autobahn|Cpp <https://github.com/crossbario/autobahn-cpp>`__ - `Autobahn|Testsuite <https://github.com/crossbario/autobahn-testsuite>`__ - `Crossbar.io <https://crossbar.io>`__ - `WAMP <https://wamp-proto.org>`__
1313
1414
Introduction
1515
------------
1616

17-
**Autobahn\|Python** is a subproject of `Autobahn <http://crossbar.io/autobahn>`__ and provides open-source
17+
**Autobahn\|Python** is a subproject of `Autobahn <https://crossbar.io/autobahn>`__ and provides open-source
1818
implementations of
1919

20-
- `The WebSocket Protocol <http://tools.ietf.org/html/rfc6455>`__
21-
- `The Web Application Messaging Protocol (WAMP) <http://wamp-proto.org/>`__
20+
- `The WebSocket Protocol <https://tools.ietf.org/html/rfc6455>`__
21+
- `The Web Application Messaging Protocol (WAMP) <https://wamp-proto.org/>`__
2222

23-
for Python 3.6+ and running on `Twisted <http://twistedmatrix.com/>`__ and `asyncio <http://docs.python.org/3.4/library/asyncio.html>`__.
23+
for Python 3.6+ and running on `Twisted <https://twistedmatrix.com/>`__ and `asyncio <https://docs.python.org/3/library/asyncio.html>`__.
2424

2525
You can use **Autobahn\|Python** to create clients and servers in Python speaking just plain WebSocket or WAMP.
2626

27-
**WebSocket** allows `bidirectional real-time messaging on the Web <http://crossbario.com/blog/post/websocket-why-what-can-i-use-it/>`__ and beyond, while `WAMP <http://wamp-proto.org/>`__ adds real-time application communication on top of WebSocket.
27+
**WebSocket** allows `bidirectional real-time messaging on the Web <https://crossbario.com/blog/post/websocket-why-what-can-i-use-it/>`__ and beyond, while `WAMP <https://wamp-proto.org/>`__ adds real-time application communication on top of WebSocket.
2828

29-
**WAMP** provides asynchronous **Remote Procedure Calls** and **Publish & Subscribe** for applications in *one* protocol running over `WebSocket <http://tools.ietf.org/html/rfc6455>`__. WAMP is a *routed* protocol, so you need a **WAMP Router** to connect your **Autobahn\|Python** based clients. We provide `Crossbar.io <http://crossbar.io>`__, but there are `other options <https://wamp-proto.org/implementations.html#routers>`__ as well.
29+
**WAMP** provides asynchronous **Remote Procedure Calls** and **Publish & Subscribe** for applications in *one* protocol running over `WebSocket <https://tools.ietf.org/html/rfc6455>`__. WAMP is a *routed* protocol, so you need a **WAMP Router** to connect your **Autobahn\|Python** based clients. We provide `Crossbar.io <https://crossbar.io>`__, but there are `other options <https://wamp-proto.org/implementations.html#routers>`__ as well.
3030

3131
.. note::
3232

@@ -35,14 +35,14 @@ You can use **Autobahn\|Python** to create clients and servers in Python speakin
3535
Features
3636
--------
3737

38-
- framework for `WebSocket <http://tools.ietf.org/html/rfc6455>`__ and `WAMP <http://wamp-proto.org/>`__ clients and servers
39-
- runs on `CPython <http://python.org/>`__, `PyPy <http://pypy.org/>`__ and `Jython <http://jython.org/>`__
40-
- runs under `Twisted <http://twistedmatrix.com/>`__ and `asyncio <http://docs.python.org/3.4/library/asyncio.html>`__ - implements WebSocket
41-
`RFC6455 <http://tools.ietf.org/html/rfc6455>`__ and Draft Hybi-10+
42-
- implements `WebSocket compression <http://tools.ietf.org/html/draft-ietf-hybi-permessage-compression>`__
43-
- implements `WAMP <http://wamp-proto.org/>`__, the Web Application Messaging Protocol
38+
- framework for `WebSocket <https://tools.ietf.org/html/rfc6455>`__ and `WAMP <https://wamp-proto.org/>`__ clients and servers
39+
- runs on `CPython <https://python.org/>`__ and `PyPy <https://pypy.org/>`
40+
- runs under `Twisted <https://twistedmatrix.com/>`__ and `asyncio <https://docs.python.org/3/library/asyncio.html>`__ - implements WebSocket
41+
`RFC6455 <https://tools.ietf.org/html/rfc6455>`__ and Draft Hybi-10+
42+
- implements `WebSocket compression <https://tools.ietf.org/html/draft-ietf-hybi-permessage-compression>`__
43+
- implements `WAMP <https://wamp-proto.org/>`__, the Web Application Messaging Protocol
4444
- high-performance, fully asynchronous implementation
45-
- best-in-class standards conformance (100% strict passes with `Autobahn Testsuite <http://crossbar.io/autobahn#testsuite>`__: `Client <http://autobahn.ws/testsuite/reports/clients/index.html>`__ `Server <http://autobahn.ws/testsuite/reports/servers/index.html>`__)
45+
- best-in-class standards conformance (100% strict passes with `Autobahn Testsuite <https://crossbar.io/autobahn#testsuite>`__: `Client <https://autobahn.ws/testsuite/reports/clients/index.html>`__ `Server <https://autobahn.ws/testsuite/reports/servers/index.html>`__)
4646
- message-, frame- and streaming-APIs for WebSocket
4747
- supports TLS (secure WebSocket) and proxies
4848
- Open-source (`MIT license <https://github.com/crossbario/autobahn-python/blob/master/LICENSE>`__)
@@ -268,8 +268,9 @@ implementation, set the environment variable:
268268
.. |Master Branch| image:: https://img.shields.io/badge/branch-master-orange.svg
269269
:target: https://travis-ci.com/crossbario/autobahn-python.svg?branch=master
270270

271-
.. |Build Status| image:: https://travis-ci.com/crossbario/autobahn-python.svg?branch=master
272-
:target: https://travis-ci.com/crossbario/autobahn-python
271+
.. |Build Status| image:: https://github.com/crossbario/autobahn-python/workflows/main/badge.svg
272+
:target: https://github.com/crossbario/autobahn-python/actions?query=workflow%3Amain
273+
:alt: Build Status
273274

274275
.. |Coverage| image:: https://img.shields.io/codecov/c/github/crossbario/autobahn-python/master.svg
275276
:target: https://codecov.io/github/crossbario/autobahn-python

autobahn/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
#
2525
###############################################################################
2626

27-
__version__ = '20.12.2'
27+
__version__ = '20.12.3'
File renamed without changes.
File renamed without changes.

autobahn/asyncio/wamp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ class ApplicationSession(protocol.ApplicationSession):
5757
5858
Implements:
5959
60-
* :class:`autobahn.wamp.interfaces.ITransportHandler`
61-
* :class:`autobahn.wamp.interfaces.ISession`
60+
* ``autobahn.wamp.interfaces.ITransportHandler``
61+
* ``autobahn.wamp.interfaces.ISession``
6262
"""
6363

6464
log = txaio.make_logger()
File renamed without changes.

autobahn/rawsocket/test/__init__.py

Lines changed: 0 additions & 25 deletions
This file was deleted.
File renamed without changes.

autobahn/twisted/test/__init__.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)