Skip to content

Commit aed10d1

Browse files
authored
Merge pull request #24 from tushushu/wip-fix-release
Wip fix release-0.5.0
2 parents 08c7d77 + c94ecdd commit aed10d1

File tree

5 files changed

+11
-65
lines changed

5 files changed

+11
-65
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,12 @@ on:
1313

1414

1515
jobs:
16-
macos:
17-
runs-on: macos-latest
18-
strategy:
19-
matrix:
20-
python-version: ['3.7', '3.8', '3.9', '3.10']
21-
steps:
22-
- uses: actions/checkout@v2
23-
- uses: actions/setup-python@v2
24-
with:
25-
python-version: ${{ matrix.python-version }}
26-
- name: Install Rust toolchain
27-
uses: actions-rs/toolchain@v1
28-
with:
29-
toolchain: stable
30-
profile: minimal
31-
default: true
32-
- name: Install Python packages
33-
run: |
34-
pip install mypy pytest flake8 maturin
35-
- name: Build ulist
36-
run: |
37-
maturin build --out dist -m ulist/Cargo.toml
38-
- name: Install ulist
39-
run: |
40-
pip install ulist --no-index --find-links dist --force-reinstall
41-
- name: Python UnitTest
42-
run: |
43-
cd tests
44-
sh run.sh
45-
46-
47-
linux:
48-
runs-on: ubuntu-latest
16+
tests:
4917
strategy:
5018
matrix:
5119
python-version: ['3.7', '3.8', '3.9', '3.10']
20+
os: [ubuntu-latest, macos-latest]
21+
runs-on: ${{ matrix.os }}
5222
steps:
5323
- uses: actions/checkout@v2
5424
- uses: actions/setup-python@v2

.github/workflows/publish.yml

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ on:
1010

1111

1212
jobs:
13-
macos:
14-
runs-on: macos-latest
13+
maturin:
1514
strategy:
1615
matrix:
1716
python-version: ['3.7', '3.8', '3.9', '3.10']
17+
os: [ubuntu-latest, macos-latest]
18+
runs-on: ${{ matrix.os }}
1819
steps:
1920
- uses: actions/checkout@v2
2021
- uses: actions/setup-python@v2
@@ -32,31 +33,6 @@ jobs:
3233
- name: Publish ulist
3334
env:
3435
PYPI_PW: ${{ secrets.PYPI_PW }}
36+
PYTHON_VER: python${{ matrix.python-version }}
3537
run: |
36-
maturin publish -m ulist/Cargo.toml -u tushushu -p $PYPI_PW
37-
38-
39-
linux:
40-
runs-on: ubuntu-latest
41-
strategy:
42-
matrix:
43-
python-version: ['3.7', '3.8', '3.9', '3.10']
44-
steps:
45-
- uses: actions/checkout@v2
46-
- uses: actions/setup-python@v2
47-
with:
48-
python-version: ${{ matrix.python-version }}
49-
- name: Install Rust toolchain
50-
uses: actions-rs/toolchain@v1
51-
with:
52-
toolchain: stable
53-
profile: minimal
54-
default: true
55-
- name: Install Python packages
56-
run: |
57-
pip install maturin
58-
- name: Publish ulist
59-
env:
60-
PYPI_PW: ${{ secrets.PYPI_PW }}
61-
run: |
62-
maturin publish -m ulist/Cargo.toml -u tushushu -p $PYPI_PW
38+
maturin publish -m ulist/Cargo.toml -u tushushu -p $PYPI_PW -i $PYTHON_VER

.github/workflows/sphinx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
types: [published]
55

66
jobs:
7-
docs:
7+
sphinx:
88
runs-on: macos-latest
99
strategy:
1010
matrix:

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
author = 'tushushu'
2323

2424
# The full version, including alpha/beta/rc tags
25-
release = '0.5.0'
25+
release = '0.5.1'
2626

2727

2828
# -- General configuration ---------------------------------------------------

ulist/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ulist"
3-
version = "0.5.0"
3+
version = "0.5.1"
44
authors = ["tushushu"]
55
edition = "2018"
66

0 commit comments

Comments
 (0)