mirror of https://git.matrix.org/git/olm.git
Compare commits
6 Commits
Author | SHA1 | Date |
---|---|---|
Hubert Chathi | 7e0c827703 | |
Hubert Chathi | 972faaadd5 | |
Hubert Chathi | 807b252331 | |
parona' via Olm | bbdac4045d | |
Hubert Chathi | 4beb2487ce | |
Hubert Chathi | b54fa37fae |
|
@ -1,8 +1,15 @@
|
|||
Changes in `3.2.15 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.15>`_
|
||||
Changes in `3.2.16 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.16>`_
|
||||
===========================================================================
|
||||
|
||||
This release includes the following changes since 3.2.15:
|
||||
|
||||
* Fix and modernize the Python packaging (thanks to Alfred Wingate)
|
||||
|
||||
Changes in `3.2.15 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.15>`_
|
||||
===========================================================================
|
||||
|
||||
This release includes the following changes since 3.2.14:
|
||||
|
||||
* Improvements to Python packaging
|
||||
* No longer depend on ``future`` since Python 2 is no longer supported.
|
||||
* Improve compatibility with tox 4.
|
||||
|
@ -10,6 +17,7 @@ This release includes the following changes since 3.2.15:
|
|||
* Improvements to Nix flake (Thanks to Jon Ringer)
|
||||
* Improve structure.
|
||||
* Enable Darwin builds.
|
||||
* Typescript type fix.
|
||||
|
||||
Changes in `3.2.14 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.14>`_
|
||||
===========================================================================
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
cmake_minimum_required(VERSION 3.4)
|
||||
|
||||
project(olm VERSION 3.2.15 LANGUAGES CXX C)
|
||||
project(olm VERSION 3.2.16 LANGUAGES CXX C)
|
||||
|
||||
option(OLM_TESTS "Build tests" ON)
|
||||
option(BUILD_SHARED_LIBS "Build as a shared library" ON)
|
||||
|
|
|
@ -3,7 +3,7 @@ Pod::Spec.new do |s|
|
|||
# The libolm version
|
||||
MAJOR = 3
|
||||
MINOR = 2
|
||||
PATCH = 15
|
||||
PATCH = 16
|
||||
|
||||
s.name = "OLMKit"
|
||||
s.version = "#{MAJOR}.#{MINOR}.#{PATCH}"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
import PackageDescription
|
||||
|
||||
let major = 3, minor = 2, patch = 15
|
||||
let major = 3, minor = 2, patch = 16
|
||||
|
||||
let package = Package(
|
||||
name: "Olm",
|
||||
|
|
|
@ -206,9 +206,8 @@ endorsed by the Matrix.org Foundation C.I.C.
|
|||
## Release process
|
||||
|
||||
First: bump version numbers in ``common.mk``, ``CMakeLists.txt``,
|
||||
``javascript/package.json``, ``python/olm/__version__.py``,
|
||||
``python/pyproject.toml``, ``OLMKit.podspec``, ``Package.swift``, and
|
||||
``android/gradle.properties``.
|
||||
``javascript/package.json``, ``python/pyproject.toml``, ``OLMKit.podspec``,
|
||||
``Package.swift``, and ``android/gradle.properties``.
|
||||
|
||||
Also, ensure the changelog is up to date, and that everything is committed to
|
||||
git.
|
||||
|
|
|
@ -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.15
|
||||
VERSION_NAME=3.2.16
|
||||
|
||||
POM_PACKAGING=aar
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@matrix-org/olm",
|
||||
"version": "3.2.15",
|
||||
"version": "3.2.16",
|
||||
"description": "An implementation of the Double Ratchet cryptographic ratchet",
|
||||
"main": "olm.js",
|
||||
"files": [
|
||||
|
@ -31,8 +31,5 @@
|
|||
"homepage": "https://gitlab.matrix.org/matrix-org/olm",
|
||||
"devDependencies": {
|
||||
"jasmine": "^3.0.0"
|
||||
},
|
||||
"publishConfig": {
|
||||
"@matrix-org:registry":"https://gitlab.matrix.org/api/v4/projects/27/packages/npm/"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ test:python:
|
|||
image: docker.io/python:$PYTHON_VERSIONS
|
||||
parallel:
|
||||
matrix:
|
||||
- PYTHON_VERSIONS: [ "3.6", "3.7", "3.8", "3.9" ]
|
||||
- PYTHON_VERSIONS: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
|
||||
script:
|
||||
- pip install tox
|
||||
- make headers
|
||||
|
|
|
@ -24,7 +24,7 @@ find libolm -name \#\*\# -delete
|
|||
|
||||
echo "Building"
|
||||
patch -p1 < $SRC/packaging.diff
|
||||
python3 setup.py sdist
|
||||
python3 -m build -s
|
||||
|
||||
echo "Copying result"
|
||||
mkdir -p $SRC/dist
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
__title__ = "python-olm"
|
||||
__description__ = ("python CFFI bindings for the olm "
|
||||
"cryptographic ratchet library")
|
||||
__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ć, 2019-2023 The Matrix.org Foundation C.I.C."
|
|
@ -1,14 +1,22 @@
|
|||
[build-system]
|
||||
requires = ["setuptools", "cffi>=1.0.0"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "python-olm"
|
||||
version = "3.2.15"
|
||||
version = "3.2.16"
|
||||
description = "python CFFI bindings for the olm cryptographic ratchet library"
|
||||
authors = [{name = "Damir Jelić", email = "poljar@termina.org.uk"}]
|
||||
license = {text = "Apache-2.0"}
|
||||
readme = "README.md"
|
||||
classifiers = [
|
||||
"License :: OSI Approved :: Apache Software License",
|
||||
"Topic :: Communications",
|
||||
]
|
||||
dependencies = ["cffi>=1.0.0"]
|
||||
|
||||
[build-system]
|
||||
requires = ["setuptools", "cffi>=1.0.0"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
[project.urls]
|
||||
homepage = "https://gitlab.matrix.org/matrix-org/olm/-/tree/master/python"
|
||||
|
||||
[tool.setuptools]
|
||||
packages = [ "olm" ]
|
||||
|
|
|
@ -3,6 +3,3 @@ testpaths = tests
|
|||
flake8-ignore =
|
||||
olm/*.py F401
|
||||
tests/*.py W503
|
||||
|
||||
[coverage:run]
|
||||
omit=olm/__version__.py
|
||||
|
|
|
@ -1,33 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
import os
|
||||
from codecs import open
|
||||
|
||||
from setuptools import setup
|
||||
|
||||
here = os.path.abspath(os.path.dirname(__file__))
|
||||
|
||||
about = {}
|
||||
with open(os.path.join(here, "olm", "__version__.py"), "r", "utf-8") as f:
|
||||
exec(f.read(), about)
|
||||
|
||||
setup(
|
||||
name=about["__title__"],
|
||||
version=about["__version__"],
|
||||
description=about["__description__"],
|
||||
author=about["__author__"],
|
||||
author_email=about["__author_email__"],
|
||||
url=about["__url__"],
|
||||
license=about["__license__"],
|
||||
packages=["olm"],
|
||||
setup_requires=["cffi>=1.0.0"],
|
||||
cffi_modules=["olm_build.py:ffibuilder"],
|
||||
install_requires=[
|
||||
"cffi>=1.0.0",
|
||||
"typing;python_version<'3.5'"
|
||||
],
|
||||
zip_safe=False,
|
||||
package_data={
|
||||
"olm": ["py.typed"]
|
||||
}
|
||||
cffi_modules=["olm_build.py:ffibuilder"]
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue