Skip to content

Commit f7816f4

Browse files
authored
Merge pull request #25 from VCTLabs/workflows
workflow triggers
2 parents a8ff1c9 + e9c5e68 commit f7816f4

File tree

6 files changed

+13
-16
lines changed

6 files changed

+13
-16
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
pull_request:
66
push:
7-
branches: [ main ]
7+
branches: [ master ]
88

99
jobs:
1010
build:
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os: [ubuntu-20.04, macos-latest, windows-latest]
25-
python-version: [3.6, 3.7, 3.8, 3.9]
25+
python-version: [3.7, 3.8, 3.9, '3.10']
2626
steps:
2727
- name: Set git crlf/eol
2828
run: |

.github/workflows/pylint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
pull_request:
66
push:
7-
branches: [ main ]
7+
branches: [ master ]
88

99
jobs:
1010
pylint:

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
os: [ubuntu-20.04, macos-latest, windows-latest]
22-
python-version: [3.6, 3.7, 3.8, 3.9]
22+
python-version: [3.7, 3.8, 3.9, '3.10']
2323

2424
steps:
2525
- name: Set git crlf/eol
@@ -46,7 +46,7 @@ jobs:
4646
tox -e deploy
4747
4848
- name: Upload artifacts
49-
if: matrix.python-version == 3.8 && runner.os == 'Linux'
49+
if: matrix.python-version == 3.8 && runner.os != 'Windows'
5050
uses: actions/upload-artifact@v2
5151
with:
5252
name: wheels

.github/workflows/wheels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
pull_request:
66
push:
7-
branches: [ main ]
7+
branches: [ master ]
88

99
jobs:
1010
build:
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
os: [ubuntu-20.04, macos-latest, windows-latest]
22-
python-version: [3.6, 3.7, 3.8, 3.9]
22+
python-version: [3.7, 3.8, 3.9, '3.10']
2323

2424
steps:
2525
- name: Set git crlf/eol
@@ -65,7 +65,7 @@ jobs:
6565
fail-fast: false
6666
matrix:
6767
os: [ubuntu-latest, macos-latest, windows-latest]
68-
python-version: [3.6, 3.8, 3.9]
68+
python-version: [3.6, 3.8, '3.10']
6969

7070
steps:
7171
- name: Set up Python ${{ matrix.python-version }}

README.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,8 @@ the CP210x always uses 500kBit/sec as baudrate.
7575
TODO
7676
----
7777

78-
* Test on other than CP2102
79-
* Implement CP2103 GIOP settings
80-
* Implement GUI
78+
* (re)Test on CP2102 and CP2103 (legacy parts)
79+
* read config blob from CP2102N (new part)
8180

8281
Model notes
8382
-----------
@@ -90,7 +89,7 @@ Taken from the respective device Data Sheets:
9089
* CP2104 - EPROM only (1024 byte, not re-programmable)
9190
* CP2105 - EPROM only (296 byte, not re-programmable)
9291
* CP2109 - EPROM only (1024 byte, not re-programmable)
93-
* CP2102N - EEPROM (960 byte) **does not work**
92+
* CP2102N - EEPROM (960 byte) **will not work** with legacy ``cp210x-program``
9493

9594
The following table from AN721 shows the default SiLabs USB device IDs; note
9695
third-party manufacturers often do not reprogram with their own vendor/product

test_platform_data.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
:00000001FF
7474
'''
7575

76-
orig_hex_data_bytes = bytes(orig_hex_data.encode('utf-8'))
7776
orig_hex_file = "cp2102-orig.hex"
77+
orig_hex_data_bytes = bytes(orig_hex_data.encode('utf-8'))
7878

7979
out_file = 'test.out'
8080
stdout_file = 'test2.out'
@@ -84,7 +84,7 @@
8484
def test_text_file_io():
8585
orig_hex_data_txt = out_path.joinpath(orig_hex_file).read_text()
8686

87-
assert orig_hex_data == orig_hex_data_txt
87+
assert orig_hex_data_txt == orig_hex_data
8888

8989

9090
def test_bin_file_io():
@@ -96,14 +96,12 @@ def test_bin_file_io():
9696
def test_hex_file_output():
9797
outfile = out_path.joinpath(out_file)
9898

99-
#for child in out_path.iterdir(): print(child)
10099
assert outfile.read_text() == orig_hex_data
101100
assert outfile.read_bytes() == orig_hex_data_bytes
102101

103102

104103
def test_hex_file_stdout():
105104
outfile = out_path.joinpath(stdout_file)
106105

107-
#for child in out_path.iterdir(): print(child)
108106
assert outfile.read_text() == orig_hex_data
109107
assert outfile.read_bytes() == orig_hex_data_bytes

0 commit comments

Comments
 (0)