Skip to content

Commit

Permalink
Bump version to 1.21.1
Browse files Browse the repository at this point in the history
This release brings experimental `async-evolution` with other improvements

* update dependencies
* fix documentation issues
* refactor `HeuristicContext` trait to avoid using `HeuristicPopulation`
  directly from it
* improve non-determinism based selectors logic
* add experimental feature `async-evolution`
  • Loading branch information
reinterpretcat committed Jun 9, 2023
1 parent bbd2f1b commit 794028b
Show file tree
Hide file tree
Showing 12 changed files with 136 additions and 18 deletions.
112 changes: 112 additions & 0 deletions .github/workflows/maturin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
name: Publish to PyPI with maturin

on:
workflow_dispatch:

permissions:
contents: read

defaults:
run:
working-directory: ./vrp-cli

jobs:
linux:
runs-on: ubuntu-latest
strategy:
matrix:
target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.target }}
args: --release --out dist --find-interpreter
sccache: 'true'
manylinux: auto
- name: Upload wheels
uses: actions/upload-artifact@v3
with:
name: wheels
path: dist

windows:
runs-on: windows-latest
strategy:
matrix:
target: [x64, x86]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.10'
architecture: ${{ matrix.target }}
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.target }}
args: --release --out dist --find-interpreter
sccache: 'true'
- name: Upload wheels
uses: actions/upload-artifact@v3
with:
name: wheels
path: dist

macos:
runs-on: macos-latest
strategy:
matrix:
target: [x86_64, aarch64]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.target }}
args: --release --out dist --find-interpreter
sccache: 'true'
- name: Upload wheels
uses: actions/upload-artifact@v3
with:
name: wheels
path: dist

sdist:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Build sdist
uses: PyO3/maturin-action@v1
with:
command: sdist
args: --out dist
- name: Upload sdist
uses: actions/upload-artifact@v3
with:
name: wheels
path: dist

release:
name: Release
runs-on: ubuntu-latest
if: "startsWith(github.ref, 'refs/tags/')"
needs: [linux, windows, macos, sdist]
steps:
- uses: actions/download-artifact@v3
with:
name: wheels
- name: Publish to PyPI
uses: PyO3/maturin-action@v1
env:
MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
with:
command: upload
args: --skip-existing *
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.

## [Unreleased]


## [v1.21.1]- 2023-06-09

This release brings experimental `async-evolution` with other improvements.

### Changed

* update dependencies
Expand Down Expand Up @@ -641,7 +646,8 @@ with Self Organizing MAps and eXtrAs (pronounced as "rosomaha", from russian "р

- Initial commit

[Unreleased]: https://github.com/reinterpretcat/vrp/compare/v1.21.0...HEAD
[Unreleased]: https://github.com/reinterpretcat/vrp/compare/v1.21.1...HEAD
[v1.21.1]: https://github.com/reinterpretcat/vrp/compare/v1.21.0...v1.21.1
[v1.21.0]: https://github.com/reinterpretcat/vrp/compare/v1.20.0...v1.21.0
[v1.20.0]: https://github.com/reinterpretcat/vrp/compare/v1.19.2...v1.20.0
[v1.19.2]: https://github.com/reinterpretcat/vrp/compare/v1.19.1...v1.90.2
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors:
given-names: "Ilya"
orcid: "https://orcid.org/0000-0002-7613-7412"
title: "Rosomaxa, Vehicle Routing Problem Solver"
version: 1.21.0
version: 1.21.1
doi: 10.5281/zenodo.4624037
date-released: 2022-05-13
url: "https://github.com/reinterpretcat/vrp"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![build](https://github.com/reinterpretcat/vrp/actions/workflows/build.yaml/badge.svg)
[![downloads](https://img.shields.io/crates/d/vrp-core)](https://crates.io/crates/vrp-core)
[![codecov](https://codecov.io/gh/reinterpretcat/vrp/branch/master/graph/badge.svg)](https://codecov.io/gh/reinterpretcat/vrp)
[![dependency status](https://deps.rs/crate/vrp-cli/1.21.0/status.svg)](https://deps.rs/crate/vrp-cli/1.21.0)
[![dependency status](https://deps.rs/crate/vrp-cli/1.21.1/status.svg)](https://deps.rs/crate/vrp-cli/1.21.1)
[![DOI](https://zenodo.org/badge/238436117.svg)](https://zenodo.org/badge/latestdoi/238436117)

![VRP example](docs/resources/vrp-example.png "VRP with Route Balance")
Expand Down Expand Up @@ -68,7 +68,7 @@ Another fast way to try vrp solver on your environment is to use `docker` image
* **run public image** from `Github Container Registry`:

```bash
docker run -it -v $(pwd):/repo --name vrp-cli --rm ghcr.io/reinterpretcat/vrp/vrp-cli:1.21.0
docker run -it -v $(pwd):/repo --name vrp-cli --rm ghcr.io/reinterpretcat/vrp/vrp-cli:1.21.1
```

* **build image locally** using `Dockerfile` provided:
Expand Down
2 changes: 1 addition & 1 deletion docs/src/getting-started/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Another fast way to try vrp solver on your environment is to use `docker` image
* **run public image** from `Github Container Registry`:

```bash
docker run -it -v $(pwd):/repo --name vrp-cli --rm ghcr.io/reinterpretcat/vrp/vrp-cli:1.21.0
docker run -it -v $(pwd):/repo --name vrp-cli --rm ghcr.io/reinterpretcat/vrp/vrp-cli:1.21.1
```

* **build image locally** using `Dockerfile` provided:
Expand Down
2 changes: 1 addition & 1 deletion examples/json-pragmatic/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "json-pragmatic"
version = "1.21.0"
version = "1.21.1"
authors = ["Ilya Builuk <[email protected]>"]
license = "Apache-2.0"
keywords = ["vrp", "optimization"]
Expand Down
2 changes: 1 addition & 1 deletion rosomaxa/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rosomaxa"
version = "0.5.0"
version = "0.6.0"
edition = "2021"
authors = ["Ilya Builuk <[email protected]>"]
license = "Apache-2.0"
Expand Down
8 changes: 4 additions & 4 deletions vrp-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "vrp-cli"
version = "1.21.0"
version = "1.21.1"
authors = ["Ilya Builuk <[email protected]>"]
license = "Apache-2.0"
keywords = ["vrp", "optimization"]
Expand All @@ -24,9 +24,9 @@ name = "vrp_cli"
crate-type = ["cdylib", "lib"]

[dependencies]
vrp-core = { path = "../vrp-core", version = "1.21.0", optional = true }
vrp-scientific = { path = "../vrp-scientific", optional = true, version = "1.21.0" }
vrp-pragmatic = { path = "../vrp-pragmatic", version = "1.21.0" }
vrp-core = { path = "../vrp-core", version = "1.21.1", optional = true }
vrp-scientific = { path = "../vrp-scientific", optional = true, version = "1.21.1" }
vrp-pragmatic = { path = "../vrp-pragmatic", version = "1.21.1" }

csv = { version = "1.2.2", optional = true }
serde_json = "1.0.96"
Expand Down
2 changes: 1 addition & 1 deletion vrp-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ mod cli {

pub fn get_app() -> Command {
Command::new("Vehicle Routing Problem Solver")
.version("1.21.0")
.version("1.21.1")
.author("Ilya Builuk <[email protected]>")
.about("A command line interface to Vehicle Routing Problem solver")
.subcommand(get_analyze_app())
Expand Down
4 changes: 2 additions & 2 deletions vrp-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "vrp-core"
version = "1.21.0"
version = "1.21.1"
authors = ["Ilya Builuk <[email protected]>"]
license = "Apache-2.0"
keywords = ["vrp", "optimization"]
Expand All @@ -16,7 +16,7 @@ default = ["rosomaxa"]
async-evolution = ["rosomaxa/async-evolution"]

[dependencies]
rosomaxa = { path = "../rosomaxa", version = "0.5.0", optional = true }
rosomaxa = { path = "../rosomaxa", version = "0.6.0", optional = true }

rayon = "1.7.0"
rand = { version = "0.8.5", features = ["small_rng"] }
Expand Down
4 changes: 2 additions & 2 deletions vrp-pragmatic/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "vrp-pragmatic"
version = "1.21.0"
version = "1.21.1"
authors = ["Ilya Builuk <[email protected]>"]
license = "Apache-2.0"
keywords = ["vrp", "optimization"]
Expand All @@ -12,7 +12,7 @@ edition = "2021"
description = "An extension logic for solving rich VRP"

[dependencies]
vrp-core = { path = "../vrp-core", version = "1.21.0" }
vrp-core = { path = "../vrp-core", version = "1.21.1" }

serde = { version = "1.0.164", features = ["derive"] }
serde_json = "1.0.96"
Expand Down
4 changes: 2 additions & 2 deletions vrp-scientific/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "vrp-scientific"
version = "1.21.0"
version = "1.21.1"
authors = ["Ilya Builuk <[email protected]>"]
license = "Apache-2.0"
keywords = ["vrp", "optimization"]
Expand All @@ -12,4 +12,4 @@ edition = "2021"
description = "An extension logic for solving scientific VRP"

[dependencies]
vrp-core = { path = "../vrp-core", version = "1.21.0" }
vrp-core = { path = "../vrp-core", version = "1.21.1" }

0 comments on commit 794028b

Please sign in to comment.