Skip to content

Commit

Permalink
Fix Python release workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
pemistahl committed Aug 24, 2023
1 parent 2d6e1e6 commit 9b4ccfa
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 22 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/python-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@ on:

jobs:
linux:
name: Python ${{ matrix.python-version }} on target ${{ matrix.target }}
name: Python on Linux and target ${{ matrix.target }}

runs-on: ubuntu-latest

strategy:
matrix:
target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
python-version: [ '3.8', '3.9', '3.10', '3.11' ]

steps:
- name: Check out repository
Expand All @@ -38,7 +37,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
python-version: '3.11'
cache: 'pip'

- name: Build wheels
Expand All @@ -56,14 +55,13 @@ jobs:
path: dist

windows:
name: Python ${{ matrix.python-version }} on target ${{ matrix.target }}
name: Python on Windows and target ${{ matrix.target }}

runs-on: windows-latest

strategy:
matrix:
target: [x64, x86]
python-version: [ '3.8', '3.9', '3.10', '3.11' ]

steps:
- name: Check out repository
Expand All @@ -72,7 +70,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
python-version: '3.11'
architecture: ${{ matrix.target }}
cache: 'pip'

Expand All @@ -90,14 +88,13 @@ jobs:
path: dist

macos:
name: Python ${{ matrix.python-version }} on target ${{ matrix.target }}
name: Python on MacOS and target ${{ matrix.target }}

runs-on: macos-latest

strategy:
matrix:
target: [x86_64, aarch64]
python-version: [ '3.8', '3.9', '3.10', '3.11' ]

steps:
- name: Check out repository
Expand All @@ -106,7 +103,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
python-version: '3.11'
cache: 'pip'

- name: Build wheels
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

[package]
name = "grex"
version = "1.4.3"
version = "1.4.4"
authors = ["Peter M. Stahl <[email protected]>"]
description = """
grex generates regular expressions from user-provided test cases.
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
[![python build status](https://github.com/pemistahl/grex/actions/workflows/python-build.yml/badge.svg)](https://github.com/pemistahl/grex/actions/workflows/python-build.yml)
[![docs.rs](https://docs.rs/grex/badge.svg)](https://docs.rs/grex)
[![codecov](https://codecov.io/gh/pemistahl/grex/branch/main/graph/badge.svg)](https://codecov.io/gh/pemistahl/grex)
[![dependency status](https://deps.rs/crate/grex/1.4.3/status.svg)](https://deps.rs/crate/grex/1.4.3)
[![dependency status](https://deps.rs/crate/grex/1.4.4/status.svg)](https://deps.rs/crate/grex/1.4.4)
[![demo](https://img.shields.io/badge/-Demo%20Website-orange?logo=HTML5&labelColor=white)](https://pemistahl.github.io/grex-js/)

[![downloads](https://img.shields.io/crates/d/grex.svg)](https://crates.io/crates/grex)
[![crates.io](https://img.shields.io/crates/v/grex.svg)](https://crates.io/crates/grex)
[![lib.rs](https://img.shields.io/badge/lib.rs-v1.4.3-blue)](https://lib.rs/crates/grex)
[![lib.rs](https://img.shields.io/badge/lib.rs-v1.4.4-blue)](https://lib.rs/crates/grex)
![supported Python versions](https://img.shields.io/badge/Python-%3E%3D%203.8-blue?logo=Python&logoColor=yellow)
[![pypi](https://img.shields.io/badge/PYPI-v1.0.0-blue?logo=PyPI&logoColor=yellow)](https://pypi.org/project/grex)
[![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)

[![Linux Download](https://img.shields.io/badge/Linux%20Download-v1.4.3-blue?logo=Linux)](https://github.com/pemistahl/grex/releases/download/v1.4.3/grex-v1.4.3-x86_64-unknown-linux-musl.tar.gz)
[![MacOS Download](https://img.shields.io/badge/macOS%20x86%20Download-v1.4.3-blue?logo=Apple)](https://github.com/pemistahl/grex/releases/download/v1.4.3/grex-v1.4.3-x86_64-apple-darwin.tar.gz)
[![MacOS ARM Download](https://img.shields.io/badge/macOS%20ARM%20Download-v1.4.3-blue?logo=Apple)](https://github.com/pemistahl/grex/releases/download/v1.4.3/grex-v1.4.3-aarch64-apple-darwin.tar.gz)
[![Windows Download](https://img.shields.io/badge/Windows%20Download-v1.4.3-blue?logo=Windows)](https://github.com/pemistahl/grex/releases/download/v1.4.3/grex-v1.4.3-x86_64-pc-windows-msvc.zip)
[![Linux Download](https://img.shields.io/badge/Linux%20Download-v1.4.4-blue?logo=Linux)](https://github.com/pemistahl/grex/releases/download/v1.4.4/grex-v1.4.4-x86_64-unknown-linux-musl.tar.gz)
[![MacOS Download](https://img.shields.io/badge/macOS%20x86%20Download-v1.4.4-blue?logo=Apple)](https://github.com/pemistahl/grex/releases/download/v1.4.4/grex-v1.4.4-x86_64-apple-darwin.tar.gz)
[![MacOS ARM Download](https://img.shields.io/badge/macOS%20ARM%20Download-v1.4.4-blue?logo=Apple)](https://github.com/pemistahl/grex/releases/download/v1.4.4/grex-v1.4.4-aarch64-apple-darwin.tar.gz)
[![Windows Download](https://img.shields.io/badge/Windows%20Download-v1.4.4-blue?logo=Windows)](https://github.com/pemistahl/grex/releases/download/v1.4.4/grex-v1.4.4-x86_64-pc-windows-msvc.zip)
</div>

<br>
Expand Down Expand Up @@ -115,7 +115,7 @@ In order to use *grex* as a library, simply add it as a dependency to your `Carg

```toml
[dependencies]
grex = { version = "1.4.3", default-features = false }
grex = { version = "1.4.4", default-features = false }
```

The dependency *clap* is only needed for the command-line tool.
Expand All @@ -136,7 +136,7 @@ The following table shows all available flags and options:
```
$ grex -h
grex 1.4.3
grex 1.4.4
© 2019-today Peter M. Stahl <[email protected]>
Licensed under the Apache License, Version 2.0
Downloadable from https://crates.io/crates/grex
Expand Down Expand Up @@ -200,8 +200,8 @@ Miscellaneous Options:

#### 5.2.1 Default settings

Test cases are passed either from a collection via [`RegExpBuilder::from()`](https://docs.rs/grex/1.4.3/grex/struct.RegExpBuilder.html#method.from)
or from a file via [`RegExpBuilder::from_file()`](https://docs.rs/grex/1.4.3/grex/struct.RegExpBuilder.html#method.from_file).
Test cases are passed either from a collection via [`RegExpBuilder::from()`](https://docs.rs/grex/1.4.4/grex/struct.RegExpBuilder.html#method.from)
or from a file via [`RegExpBuilder::from_file()`](https://docs.rs/grex/1.4.4/grex/struct.RegExpBuilder.html#method.from_file).
If read from a file, each test case must be on a separate line. Lines may be ended with either a newline `\n` or a carriage
return with a line feed `\r\n`.

Expand Down
2 changes: 1 addition & 1 deletion README_PYPI.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ an initial correct regex which should be inspected by hand if further optimizati
pip install grex
```

The current version 1.0.0 corresponds to the latest version 1.4.3 of the Rust
The current version 1.0.0 corresponds to the latest version 1.4.4 of the Rust
library and command-line tool.

## 5. How to use?
Expand Down
6 changes: 6 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## grex 1.4.4 (released on 24 Aug 2023)

### Bug Fixes
- The Python release workflow was incorrect as it produced too many wheels for upload.
This has been fixed.

## grex 1.4.3 (released on 24 Aug 2023)

### Features
Expand Down

0 comments on commit 9b4ccfa

Please sign in to comment.