diff --git a/.github/workflows/wheel-short-test.yml b/.github/workflows/wheel-short-test.yml index d42bcd3547..33b11e463b 100644 --- a/.github/workflows/wheel-short-test.yml +++ b/.github/workflows/wheel-short-test.yml @@ -10,7 +10,7 @@ on: types: ['released', 'prereleased'] env: - PACKAGE_VERSION: "1.0.0a18.dev0" + PACKAGE_VERSION: "1.0.0a18" PACKAGE_NAME: alpaqa PYTHON_VERSION: '3.11' diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 34dd87a4fa..d2593862de 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -6,7 +6,7 @@ on: types: ['released', 'prereleased'] env: - PACKAGE_VERSION: "1.0.0a18.dev0" + PACKAGE_VERSION: "1.0.0a18" PACKAGE_NAME: alpaqa C_EXTENSIONS: _alpaqa diff --git a/CMakeLists.txt b/CMakeLists.txt index 95a63b5dc6..e6b1550c56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(alpaqa HOMEPAGE_URL "https://github.com/kul-optec/alpaqa" LANGUAGES CXX ) -set(PY_VERSION_SUFFIX "a18.dev0") +set(PY_VERSION_SUFFIX "a18") include(CTest) list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/find") diff --git a/README.md b/README.md index 47e5b24b12..d2150c9291 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![CI Tests: C++](https://github.com/kul-optec/alpaqa/actions/workflows/linux.yml/badge.svg)](https://github.com/kul-optec/alpaqa/actions/workflows/linux.yml) [![CI Tests: Python](https://github.com/kul-optec/alpaqa/actions/workflows/wheel-short-test.yml/badge.svg)](https://github.com/kul-optec/alpaqa/actions/workflows/wheel-short-test.yml) [![CI: Matlab](https://github.com/kul-optec/alpaqa/actions/workflows/matlab.yml/badge.svg)](https://github.com/kul-optec/alpaqa/actions/workflows/matlab.yml) -[![Docs](https://img.shields.io/badge/Documentation-1.0.0a17-blue?logo=sphinx)](https://kul-optec.github.io/alpaqa/1.0.0a17/Sphinx/index.html) +[![Docs](https://img.shields.io/badge/Documentation-1.0.0a18-blue?logo=sphinx)](https://kul-optec.github.io/alpaqa/1.0.0a18/Sphinx/index.html) [![PyPI Downloads](https://img.shields.io/pypi/dm/alpaqa?label=PyPI&logo=python)](https://pypi.org/project/alpaqa) [![GitHub all releases](https://img.shields.io/github/downloads/kul-optec/alpaqa/total?label=Downloads&logo=cplusplus)](https://github.com/kul-optec/alpaqa/releases) [![GitHub License](https://img.shields.io/github/license/kul-optec/alpaqa?label=License&logo=gnu)](https://github.com/kul-optec/alpaqa/blob/develop/LICENSE) @@ -32,11 +32,11 @@ $$ ## Documentation -- [**Documentation** (Sphinx)](https://kul-optec.github.io/alpaqa/1.0.0a17/Sphinx/index.html) -- [**Python examples**](https://kul-optec.github.io/alpaqa/1.0.0a17/Sphinx/examples/index.html) -- [**C++ documentation** (Doxygen)](https://kul-optec.github.io/alpaqa/1.0.0a17/Doxygen/index.html) -- [**C++ examples**](https://kul-optec.github.io/alpaqa/1.0.0a17/Doxygen/examples.html) -- [**Matlab documentation**](https://kul-optec.github.io/alpaqa/1.0.0a17/Sphinx/reference/matlab-api.html) +- [**Documentation** (Sphinx)](https://kul-optec.github.io/alpaqa/1.0.0a18/Sphinx/index.html) +- [**Python examples**](https://kul-optec.github.io/alpaqa/1.0.0a18/Sphinx/examples/index.html) +- [**C++ documentation** (Doxygen)](https://kul-optec.github.io/alpaqa/1.0.0a18/Doxygen/index.html) +- [**C++ examples**](https://kul-optec.github.io/alpaqa/1.0.0a18/Doxygen/examples.html) +- [**Matlab documentation**](https://kul-optec.github.io/alpaqa/1.0.0a18/Sphinx/reference/matlab-api.html) ## Installation @@ -47,7 +47,7 @@ python3 -m pip install --upgrade --pre alpaqa ``` For more information, please see the full -[installation instructions](https://kul-optec.github.io/alpaqa/1.0.0a17/Sphinx/install/installation.html). +[installation instructions](https://kul-optec.github.io/alpaqa/1.0.0a18/Sphinx/install/installation.html). ## Publications diff --git a/conanfile.py b/conanfile.py index a0a4b7ad9e..4d97a99e2e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -8,7 +8,7 @@ class AlpaqaRecipe(ConanFile): name = "alpaqa" - version = "1.0.0-alpha.17" + version = "1.0.0-alpha.18" # Optional metadata license = "LGPLv3" diff --git a/doxygen/sphinx/source/install/installation.rst b/doxygen/sphinx/source/install/installation.rst index c65ce6d319..594bf471b4 100644 --- a/doxygen/sphinx/source/install/installation.rst +++ b/doxygen/sphinx/source/install/installation.rst @@ -36,7 +36,7 @@ For Debian-based systems, the .deb packages can be installed using .. code-block:: sh sudo apt update - sudo apt install ./libalpaqa*_1.0.0a17_amd64.deb + sudo apt install ./libalpaqa*_1.0.0a18_amd64.deb Different components are available: @@ -70,7 +70,7 @@ Alternatively, the .tar.gz file can be extracted and installed manually. .. code-block:: sh - sudo tar xzf alpaqa-1.0.0a17-Linux-x86_64.tar.gz -C /usr/local --strip-components=1 + sudo tar xzf alpaqa-1.0.0a18-Linux-x86_64.tar.gz -C /usr/local --strip-components=1 This requires glibc 2.17 or later. You may need to install or pre-load the following additional runtime dependencies: @@ -92,7 +92,7 @@ command in the MATLAB command window: .. code-block:: matlab - unzip(['https://github.com/kul-optec/alpaqa/releases/download/1.0.0a17/alpaqa-matlab-' computer('arch') '.zip'], userpath) + unzip(['https://github.com/kul-optec/alpaqa/releases/download/1.0.0a18/alpaqa-matlab-' computer('arch') '.zip'], userpath) You need CasADi to be installed as well: https://web.casadi.org/get diff --git a/examples/CMake/Solver/README.md b/examples/CMake/Solver/README.md index fe27ccecf2..263a29bbb1 100644 --- a/examples/CMake/Solver/README.md +++ b/examples/CMake/Solver/README.md @@ -28,7 +28,7 @@ pip install -U conan cmake Export the alpaqa library to Conan: ```sh -git clone https://github.com/kul-optec/alpaqa --branch=1.0.0a17 --single-branch +git clone https://github.com/kul-optec/alpaqa --branch=1.0.0a18 --single-branch conan export alpaqa ``` @@ -135,7 +135,7 @@ cmake --build --preset conan-release -j ``` A complete list of the available components and targets can be found on the -[CMake API Reference](https://kul-optec.github.io/alpaqa/1.0.0a17/Sphinx/reference/cmake-api.html) page. +[CMake API Reference](https://kul-optec.github.io/alpaqa/1.0.0a18/Sphinx/reference/cmake-api.html) page. ### Disabling tests diff --git a/examples/CMake/Solver/conanfile.txt b/examples/CMake/Solver/conanfile.txt index b9f0f382f9..6b436ffdd6 100644 --- a/examples/CMake/Solver/conanfile.txt +++ b/examples/CMake/Solver/conanfile.txt @@ -1,5 +1,5 @@ [requires] -alpaqa/1.0.0-alpha.17 +alpaqa/1.0.0-alpha.18 [generators] CMakeDeps CMakeToolchain diff --git a/pyproject.toml b/pyproject.toml index 2ed5c12e2e..29c1421f86 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ dynamic = ["version", "description"] [project.optional-dependencies] docs = ["breathe~=4.35.0", "sphinx>=7.2.2,<8", "sphinx-tabs~=3.4.4", "sphinxcontrib-matlabdomain~=0.20.2", "sphinxcontrib-moderncmakedomain~=3.27.0", "furo==2023.08.19", "matplotlib"] -debug = ["alpaqa-debug==1.0.0a18.dev0"] +debug = ["alpaqa-debug==1.0.0a18"] test = ["pytest>=7.2.0,<7.5", "qpalm~=1.2.1", "scipy>=1.9.3,<1.12"] [project.urls] diff --git a/python/README.rst b/python/README.rst index ab8a45c8f9..7928b312ac 100644 --- a/python/README.rst +++ b/python/README.rst @@ -23,11 +23,11 @@ The solvers in this library solve minimization problems of the following form: Documentation ------------- -- `Documentation (Sphinx) `_ -- `Python examples `_ -- `Documentation (Doxygen) `_ -- `C++ examples `_ -- `Matlab documentation `_ +- `Documentation (Sphinx) `_ +- `Python examples `_ +- `Documentation (Doxygen) `_ +- `C++ examples `_ +- `Matlab documentation `_ Installation ------------ @@ -39,7 +39,7 @@ The Python interface can be installed directly from PyPI: python3 -m pip install --upgrade --pre alpaqa For more information, please see the full -`installation instructions `_. +`installation instructions `_. Publications ------------ diff --git a/python/alpaqa-debug/pyproject.toml b/python/alpaqa-debug/pyproject.toml index 3e77ffae42..49a477f59a 100644 --- a/python/alpaqa-debug/pyproject.toml +++ b/python/alpaqa-debug/pyproject.toml @@ -6,8 +6,8 @@ license = { "file" = "../../LICENSE" } authors = [{ "name" = "Pieter P", "email" = "pieter.p.dev@outlook.com" }] keywords = [] classifiers = [] -dependencies = ["alpaqa==1.0.0a18.dev0"] -version = "1.0.0a18.dev0" +dependencies = ["alpaqa==1.0.0a18"] +version = "1.0.0a18" description = "Debug symbols for the alpaqa package." [project.urls] diff --git a/python/alpaqa/__init__.py b/python/alpaqa/__init__.py index 497dba3d00..dbff27500e 100644 --- a/python/alpaqa/__init__.py +++ b/python/alpaqa/__init__.py @@ -1,7 +1,7 @@ """ Augmented Lagrangian and PANOC solvers for nonconvex numerical optimization. """ -__version__ = "1.0.0a18.dev0" +__version__ = "1.0.0a18" from .alpaqa import * from .alpaqa import __c_version__ diff --git a/scripts/dev/install-locally.sh b/scripts/dev/install-locally.sh index 75b26b70e0..6d5167afb1 100755 --- a/scripts/dev/install-locally.sh +++ b/scripts/dev/install-locally.sh @@ -93,8 +93,8 @@ else -C--cross="$pfx/$triple.py-build-cmake.cross.toml" \ -C--local="$PWD/$config" pip install -f staging --force-reinstall --no-deps \ - "alpaqa==1.0.0a18.dev0" "alpaqa-debug==1.0.0a18.dev0" + "alpaqa==1.0.0a18" "alpaqa-debug==1.0.0a18" pip install -f staging \ - "alpaqa[test]==1.0.0a18.dev0" "alpaqa-debug==1.0.0a18.dev0" + "alpaqa[test]==1.0.0a18" "alpaqa-debug==1.0.0a18" fi pytest