Skip to content

Commit 49c4144

Browse files
authored
* update CI deps * update copyright header - no license change! * remove coverage crap * prepare for release
1 parent f773964 commit 49c4144

File tree

304 files changed

+470
-685
lines changed

Some content is hidden

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

304 files changed

+470
-685
lines changed

.github/workflows/main.yml

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
# GitHub actions for Autobahn|Python CI/CD
2-
# https://github.com/crossbario/autobahn-python/actions
3-
#
4-
# See also:
5-
#
6-
# * https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
7-
# * https://github.com/actions/starter-workflows/blob/main/ci/python-package.yml
8-
#
91
name: main
102

113
on:
@@ -24,19 +16,19 @@ jobs:
2416
# WEB3_INFURA_PROJECT_ID: ${{ secrets.WEB3_INFURA_PROJECT_ID }}
2517
# WEB3_INFURA_API_SECRET: ${{ secrets.WEB3_INFURA_API_SECRET }}
2618

27-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-22.04
2820
steps:
29-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
3022

3123
- name: Install OS package dependencies
3224
run: |
3325
sudo apt update
34-
sudo apt install libenchant-dev libbz2-dev libsnappy-dev libunwind-dev libgirepository1.0-dev
26+
sudo apt install libenchant-2-dev libbz2-dev libsnappy-dev libunwind-dev libgirepository1.0-dev
3527
36-
- name: Set up Python 3.10
37-
uses: actions/setup-python@v2
28+
- name: Set up Python 3.11
29+
uses: actions/setup-python@v3
3830
with:
39-
python-version: '3.10'
31+
python-version: '3.11'
4032
architecture: 'x64'
4133

4234
- name: Install Python package dependencies
@@ -47,14 +39,6 @@ jobs:
4739
- name: Run Flake8
4840
run: tox -c tox.ini -e flake8
4941

50-
# since we use --parallel-mode to coverage inside Tox we use
51-
# "coverage combine" so the filename is always ".coverage"
52-
- name: Run Coverage
53-
env:
54-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
55-
run: |
56-
tox -c tox.ini -e coverage
57-
5842
test:
5943
env:
6044
CB_FULLTESTS: 1
@@ -68,21 +52,21 @@ jobs:
6852
runs-on: ${{ matrix.os }}
6953
strategy:
7054
matrix:
71-
os: [ubuntu-20.04]
72-
# os: [ubuntu-20.04, macos-latest, windows-latest]
55+
os: [ubuntu-22.04]
56+
# os: [ubuntu-22.04, macos-latest, windows-latest]
7357

7458
# python 3.11 fails with "src/twisted/test/raiser.c:198:12: fatal error: longintrepr.h: No such file or directory"
7559
# twisted doesn't yet support 3.11 formally: https://github.com/twisted/twisted/blob/trunk/pyproject.toml#L24
76-
python-version: ['3.7', '3.10', 'pypy-3.8']
77-
framework: ['asyncio', 'tw1910', 'tw221', 'twtrunk']
60+
python-version: ['3.7', '3.11', 'pypy-3.7', 'pypy-3.9']
61+
framework: ['asyncio', 'tw2210', 'twtrunk']
7862

7963
# https://github.blog/changelog/2020-04-15-github-actions-new-workflow-features/
8064
# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepscontinue-on-error
8165
continue-on-error: false
8266

8367
steps:
8468
# Checkout sources
85-
- uses: actions/checkout@v2
69+
- uses: actions/checkout@v3
8670

8771
# Install OS packages, as we install Python packages from source:
8872
#
@@ -100,7 +84,7 @@ jobs:
10084
# Use this Python
10185
# https://github.com/actions/setup-python/blob/main/README.md
10286
- name: Set up Python ${{ matrix.python-version }}
103-
uses: actions/setup-python@v2
87+
uses: actions/setup-python@v3
10488
with:
10589
python-version: ${{ matrix.python-version }}
10690

@@ -121,27 +105,27 @@ jobs:
121105
python -c "import os; print('WEB3_INFURA_PROJECT_ID', len(os.environ.get('WEB3_INFURA_PROJECT_ID', '')))"
122106
python -c "import os; print('WEB3_INFURA_API_SECRET', len(os.environ.get('WEB3_INFURA_API_SECRET', '')))"
123107
124-
# does not work on py3.10
108+
# does not work on py3.11
125109
# python -c "from web3.auto.infura import w3; print(w3.isConnected())"
126110

127111
- name: Run unit tests (PyTest)
128112
run: |
129113
tox -c tox.ini -e ${{ matrix.framework }}
130114
131115
docs:
132-
runs-on: ubuntu-20.04
116+
runs-on: ubuntu-22.04
133117
steps:
134-
- uses: actions/checkout@v2
118+
- uses: actions/checkout@v3
135119

136120
- name: Install OS package dependencies
137121
run: |
138122
sudo apt update
139-
sudo apt install libenchant-dev libbz2-dev libsnappy-dev libunwind-dev libgirepository1.0-dev
123+
sudo apt install libenchant-2-dev libbz2-dev libsnappy-dev libunwind-dev libgirepository1.0-dev
140124
141-
- name: Set up Python 3.10
142-
uses: actions/setup-python@v2
125+
- name: Set up Python 3.11
126+
uses: actions/setup-python@v3
143127
with:
144-
python-version: '3.10'
128+
python-version: '3.11'
145129
architecture: 'x64'
146130

147131
- name: Install Python package dependencies

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ egg
2626
.egg*
2727
.tox
2828
htmlcov/
29-
.coverage
3029
*~
3130
*.log
3231
*.pid
@@ -40,8 +39,6 @@ node.key
4039
*.swo
4140
*.swn
4241
*.so
43-
coverage.xml
44-
.coverage.*
4542
autobahn/xbr/contracts
4643
.wheels
4744
get-pip.py

.travis.yml

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

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) Crossbar.io Technologies GmbH
3+
Copyright (c) typedef int GmbH
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Makefile

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ clean: clean_docs clean_catalog
5353
-rm -rf ./.tox
5454
-rm -rf ./.eggs
5555
-rm -rf ./htmlcov
56-
-rm -f ./.coverage
57-
-rm -f ./coverage.xml
58-
-rm -f ./.coverage.*
59-
-rm -rf ~/coverage
6056
-rm -f ./twisted/plugins/dropin.cache
6157
-find . -name "*dropin.cache.new" -type f -exec rm -f {} \;
6258
-find . -name ".pytest_cache" -type d -exec rm -rf {} \;
@@ -80,6 +76,7 @@ publish: clean
8076

8177
clean_docs:
8278
-rm -rf ./docs/_build
79+
-rm -rf ./docs/autoapi/
8380

8481
docs:
8582
tox -e sphinx
@@ -180,7 +177,7 @@ test_setuptools:
180177
python setup.py test
181178

182179
test:
183-
tox -e flake8,py37-twtrunk,py37-asyncio,coverage
180+
tox -e flake8,py37-twtrunk,py37-asyncio
184181

185182
#test: flake8 test_twisted test_asyncio
186183

@@ -245,27 +242,11 @@ test_session_details:
245242
test_tx_protocol:
246243
USE_TWISTED=1 trial autobahn.twisted.test.test_tx_protocol
247244

248-
test_twisted_coverage:
249-
-rm .coverage
250-
USE_TWISTED=1 coverage run --omit=*/test/* --source=autobahn `which trial` autobahn
251-
# coverage -a -d annotated_coverage
252-
coverage html
253-
coverage report --show-missing
254-
255-
test_coverage:
256-
-rm .coverage
257-
tox -e py27-twtrunk,py27-asyncio,py36-asyncio
258-
coverage combine
259-
coverage html
260-
coverage report --show-missing
261-
262-
# test under asyncio
263245
test_asyncio:
264246
USE_ASYNCIO=1 pytest -s -v -rfP --ignore=./autobahn/twisted autobahn
265247
# USE_ASYNCIO=1 pytest -s -v -rA --ignore=./autobahn/twisted ./autobahn/asyncio/test/test_aio_websocket.py
266248
# USE_ASYNCIO=1 pytest -s -v -rA --log-cli-level=info --ignore=./autobahn/twisted ./autobahn/asyncio/test/test_aio_websocket.py
267249

268-
269250
test_cs1:
270251
USE_ASYNCIO=1 python -m pytest -s -v autobahn/wamp/test/test_cryptosign.py
271252

@@ -395,3 +376,6 @@ build_fbs_rust:
395376
# generate schema Rust bindings (*.rs files)
396377
$(FLATC) -o /tmp/gen-rust/ --rust $(FBSFILES)
397378
@find /tmp/gen-rust/
379+
380+
fix_copyright:
381+
find . -type f -exec sed -i 's/Copyright (c) Crossbar.io Technologies GmbH/Copyright (c) typedef int GmbH/g' {} \;

README.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Autobahn\|Python
33

44
WebSocket & WAMP for Python on Twisted and asyncio.
55

6-
| |Version| |CI Test Status| |CI Deploy Status| |CI Docker Status| |CI EXE Status| |Coverage| |Docs| |Docker Images| |EXE Download|
6+
| |Version| |CI Test Status| |CI Deploy Status| |CI Docker Status| |CI EXE Status| |Docs| |Docker Images| |EXE Download|
77
88
--------------
99

@@ -269,9 +269,6 @@ Further, to speed up JSON on CPython using ``ujson``, set the environment variab
269269
:target: https://github.com/crossbario/autobahn-python/actions?query=workflow%3Apyinstaller
270270
:alt: CI EXE Status
271271

272-
.. |Coverage| image:: https://img.shields.io/codecov/c/github/crossbario/autobahn-python/master.svg
273-
:target: https://codecov.io/github/crossbario/autobahn-python
274-
275272
.. |Docs| image:: https://img.shields.io/badge/docs-latest-brightgreen.svg?style=flat
276273
:target: https://autobahn.readthedocs.io/en/latest/
277274

autobahn/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# The MIT License (MIT)
44
#
5-
# Copyright (c) Crossbar.io Technologies GmbH
5+
# Copyright (c) typedef int GmbH
66
#
77
# Permission is hereby granted, free of charge, to any person obtaining a copy
88
# of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)