From 66294cf7f66ae380683dbb7f43a16a8922249fc8 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Mon, 1 May 2023 11:35:20 -0400 Subject: [PATCH] release 3.2.15 --- CHANGELOG.rst | 13 +++++++++++++ CMakeLists.txt | 2 +- OLMKit.podspec | 2 +- Package.swift | 2 +- README.md | 15 +++++++++------ android/gradle.properties | 2 +- common.mk | 2 +- javascript/package.json | 2 +- python/README.md | 12 ++++++++++++ python/olm/__version__.py | 6 +++--- python/pyproject.toml | 2 +- 11 files changed, 44 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c5f6ea6..4a8c8f3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,16 @@ +Changes in `3.2.15 `_ +=========================================================================== + +This release includes the following changes since 3.2.15: + +* Improvements to Python packaging + * No longer depend on ``future`` since Python 2 is no longer supported. + * Improve compatibility with tox 4. + * Add support for making standalone sdist. +* Improvements to Nix flake (Thanks to Jon Ringer) + * Improve structure. + * Enable Darwin builds. + Changes in `3.2.14 `_ =========================================================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index b4e28f1..a271b54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.4) -project(olm VERSION 3.2.14 LANGUAGES CXX C) +project(olm VERSION 3.2.15 LANGUAGES CXX C) option(OLM_TESTS "Build tests" ON) option(BUILD_SHARED_LIBS "Build as a shared library" ON) diff --git a/OLMKit.podspec b/OLMKit.podspec index 72e629d..3e4b3f8 100644 --- a/OLMKit.podspec +++ b/OLMKit.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| # The libolm version MAJOR = 3 MINOR = 2 - PATCH = 14 + PATCH = 15 s.name = "OLMKit" s.version = "#{MAJOR}.#{MINOR}.#{PATCH}" diff --git a/Package.swift b/Package.swift index 0b36582..19389f7 100644 --- a/Package.swift +++ b/Package.swift @@ -2,7 +2,7 @@ import PackageDescription -let major = 3, minor = 2, patch = 14 +let major = 3, minor = 2, patch = 15 let package = Package( name: "Olm", diff --git a/README.md b/README.md index 0eecc5b..db305e1 100644 --- a/README.md +++ b/README.md @@ -52,13 +52,16 @@ You can use pre-built npm packages, available at #### Python -Pre-built packages for Python are available for certain architectures at -. They can be -installed by running +A Python source package and pre-built packages for certain architectures from +. If a pre-built package is not +available for your architecture, you will need: -```bash -pip install python-olm --extra-index-url https://gitlab.matrix.org/api/v4/projects/27/packages/pypi/simple -``` +- cmake (recommended) or GNU make +- a C/C++ compiler + +to build the source package. + +You can then run `pip install python-olm`. Currently, we try to provide packages for all supported versions of Python on x86-64, i686, and aarch64, but we cannot guarantee that packages for all diff --git a/android/gradle.properties b/android/gradle.properties index 67722b2..6617728 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -26,7 +26,7 @@ org.gradle.configureondemand=false # Ref: https://github.com/vanniktech/gradle-maven-publish-plugin GROUP=org.matrix.android POM_ARTIFACT_ID=olm -VERSION_NAME=3.2.14 +VERSION_NAME=3.2.15 POM_PACKAGING=aar diff --git a/common.mk b/common.mk index a352086..ef854dc 100644 --- a/common.mk +++ b/common.mk @@ -1,4 +1,4 @@ MAJOR := 3 MINOR := 2 -PATCH := 14 +PATCH := 15 diff --git a/javascript/package.json b/javascript/package.json index 346c46c..3903d10 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -1,6 +1,6 @@ { "name": "@matrix-org/olm", - "version": "3.2.14", + "version": "3.2.15", "description": "An implementation of the Double Ratchet cryptographic ratchet", "main": "olm.js", "files": [ diff --git a/python/README.md b/python/README.md index c9c8027..bf6d15d 100644 --- a/python/README.md +++ b/python/README.md @@ -15,6 +15,18 @@ found [here][6]. The full API reference can be found [here][7]. +# Installation instructions + +To install from the source package, you will need: + +- cmake (recommended) or GNU make +- a C/C++ compiler + +You can then run `pip install python-olm`. + +This should work in UNIX-like environments, including macOS, and may work in +other environments too, but is known to not work yet in Windows. + # Accounts Accounts create and hold the central identity of the Olm protocol, they consist of a fingerprint and identity diff --git a/python/olm/__version__.py b/python/olm/__version__.py index 631cadd..a3144ae 100644 --- a/python/olm/__version__.py +++ b/python/olm/__version__.py @@ -1,9 +1,9 @@ __title__ = "python-olm" __description__ = ("python CFFI bindings for the olm " "cryptographic ratchet library") -__url__ = "https://github.com/poljar/python-olm" -__version__ = "3.2.14" +__url__ = "https://gitlab.matrix.org/matrix-org/olm/-/tree/master/python" +__version__ = "3.2.15" __author__ = "Damir Jelić" __author_email__ = "poljar@termina.org.uk" __license__ = "Apache 2.0" -__copyright__ = "Copyright 2018-2019 Damir Jelić" +__copyright__ = "Copyright 2018-2019 Damir Jelić, 2019-2023 The Matrix.org Foundation C.I.C." diff --git a/python/pyproject.toml b/python/pyproject.toml index a28e551..3416456 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "python-olm" -version = "3.2.14" +version = "3.2.15" description = "python CFFI bindings for the olm cryptographic ratchet library" authors = [{name = "Damir Jelić", email = "poljar@termina.org.uk"}] classifiers = [