From ccc9361ac4acf824824ce038bd73d641180721fe Mon Sep 17 00:00:00 2001 From: Pieter Pas Date: Wed, 15 Nov 2023 22:30:10 +0100 Subject: [PATCH] Version 1.0.0a14 --- .github/workflows/wheel-short-test.yml | 2 +- .github/workflows/wheel.yml | 2 +- CMakeLists.txt | 2 +- doxygen/sphinx/source/install/installation.rst | 6 +++--- pyproject.toml | 2 +- python/alpaqa-debug/pyproject.toml | 4 ++-- python/alpaqa/__init__.py | 2 +- scripts/dev/install-locally.sh | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/wheel-short-test.yml b/.github/workflows/wheel-short-test.yml index c9f4910b1e..484a423bbf 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.0a14.dev0" + PACKAGE_VERSION: "1.0.0a14" PACKAGE_NAME: alpaqa PYTHON_VERSION: '3.11' diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 0f89e40d8a..3569e6e842 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -6,7 +6,7 @@ on: types: ['released', 'prereleased'] env: - PACKAGE_VERSION: "1.0.0a14.dev0" + PACKAGE_VERSION: "1.0.0a14" PACKAGE_NAME: alpaqa C_EXTENSIONS: _alpaqa diff --git a/CMakeLists.txt b/CMakeLists.txt index b4b9c60499..8316aed9f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.24) project(alpaqa VERSION 1.0.0 LANGUAGES CXX) -set(PY_VERSION_SUFFIX "a14.dev0") +set(PY_VERSION_SUFFIX "a14") # Look for a C and Fortran compiler (optional) include(CheckLanguage) diff --git a/doxygen/sphinx/source/install/installation.rst b/doxygen/sphinx/source/install/installation.rst index ba3aeb05d6..918f51f240 100644 --- a/doxygen/sphinx/source/install/installation.rst +++ b/doxygen/sphinx/source/install/installation.rst @@ -34,7 +34,7 @@ For Debian-based systems, the .deb packages can be installed using .. code-block:: sh sudo apt update - sudo apt install ./libalpaqa*_1.0.0a14.dev0_amd64.deb + sudo apt install ./libalpaqa*_1.0.0a14_amd64.deb Different components are available: @@ -58,7 +58,7 @@ Alternatively, the .tar.gz file can be extracted and installed manually. .. code-block:: sh - sudo tar xzf alpaqa-1.0.0a14.dev0-Linux-x86_64.tar.gz -C /usr/local --strip-components=1 + sudo tar xzf alpaqa-1.0.0a14-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: @@ -74,7 +74,7 @@ command in the MATLAB command window: .. code-block:: matlab - unzip(['https://github.com/kul-optec/alpaqa/releases/download/1.0.0a14.dev0/alpaqa-matlab-' computer('arch') '.zip'], userpath) + unzip(['https://github.com/kul-optec/alpaqa/releases/download/1.0.0a14/alpaqa-matlab-' computer('arch') '.zip'], userpath) You need CasADi to be installed as well: https://web.casadi.org/get diff --git a/pyproject.toml b/pyproject.toml index dc348177bd..a291c11424 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ dynamic = ["version", "description"] [project.optional-dependencies] docs = ["sphinx>=7.2.2,<8", "matplotlib", "breathe~=4.35.0", "furo==2023.08.19"] -debug = ["alpaqa-debug==1.0.0a14.dev0"] +debug = ["alpaqa-debug==1.0.0a14"] test = ["pytest>=7.2.0,<7.5", "qpalm~=1.2.1", "scipy>=1.9.3,<1.12"] [project.urls] diff --git a/python/alpaqa-debug/pyproject.toml b/python/alpaqa-debug/pyproject.toml index 4d35bca8d4..572aa4485d 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.0a14.dev0"] -version = "1.0.0a14.dev0" +dependencies = ["alpaqa==1.0.0a14"] +version = "1.0.0a14" description = "Debug symbols for the alpaqa package." [project.urls] diff --git a/python/alpaqa/__init__.py b/python/alpaqa/__init__.py index 6c39cad734..81e2f20bbc 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.0a14.dev0" +__version__ = "1.0.0a14" from .alpaqa import * from .alpaqa import __c_version__ diff --git a/scripts/dev/install-locally.sh b/scripts/dev/install-locally.sh index 6b089d46e3..34a7b00c53 100755 --- a/scripts/dev/install-locally.sh +++ b/scripts/dev/install-locally.sh @@ -90,8 +90,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.0a14.dev0" "alpaqa-debug==1.0.0a14.dev0" + "alpaqa==1.0.0a14" "alpaqa-debug==1.0.0a14" pip install -f staging \ - "alpaqa[test]==1.0.0a14.dev0" "alpaqa-debug==1.0.0a14.dev0" + "alpaqa[test]==1.0.0a14" "alpaqa-debug==1.0.0a14" fi pytest