Skip to content

Commit

Permalink
2024 maintenance
Browse files Browse the repository at this point in the history
  • Loading branch information
Syndace committed Jul 9, 2024
1 parent da929f8 commit 48eb258
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 21 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/test-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.9"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.9"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -44,13 +44,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build source distribution and wheel
run: python3 setup.py sdist bdist_wheel

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: dist
path: |
dist/*.tar.gz
dist/*.whl
Expand All @@ -61,12 +62,12 @@ jobs:
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
merge-multiple: true

- uses: pypa/gh-action-pypi-publish@v1.5.1
- uses: pypa/gh-action-pypi-publish@v1.9.0
with:
user: __token__
password: ${{ secrets.pypi_token }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ __pycache__/
.mypy_cache/
.coverage

build/
docs/_build/
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## [1.0.3] - 9th of July, 2024

### Changed
- Removed unnecessary complexity/flexibility by returning `None` instead of `Any` from abstract methods whose return values are not used
- The bundle publishing logic in the signed pre key rotation did not correctly double the retry delay
- Log message improvements
- 2024 maintenance (bumped Python versions, adjusted for updates to pydantic, mypy, pylint, pytest and GitHub actions)

### Fixed
- Fixed a bug where a modified bundle might not be uploaded correctly

## [1.0.2] - 4th of November, 2022

Expand Down Expand Up @@ -133,7 +139,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Changed
- Upon serialization the current library version is added to the serialized structures, to allow for seamless updates in the future.

[Unreleased]: https://github.com/Syndace/python-omemo/compare/v1.0.2...HEAD
[Unreleased]: https://github.com/Syndace/python-omemo/compare/v1.0.3...HEAD
[1.0.3]: https://github.com/Syndace/python-omemo/compare/v1.0.2...v1.0.3
[1.0.2]: https://github.com/Syndace/python-omemo/compare/v1.0.1...v1.0.2
[1.0.1]: https://github.com/Syndace/python-omemo/compare/v1.0.0...v1.0.1
[1.0.0]: https://github.com/Syndace/python-omemo/compare/v0.14.0...v1.0.0
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

Copyright (c) 2022 Tim Henkes (Syndace)
Copyright (c) 2024 Tim Henkes (Syndace)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions functionality.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@

# Part of the respective backends

- [ ] a state migration tool/function is provided for migration from legacy python-omemo to the new storage format
- [x] a state migration tool/function is provided for migration from legacy python-omemo to the new storage format
- [ ] a state migration tool/function is provided for migration from libsignal to python-omemo

- [ ] convenience functions for XML (de)serialization is provided using the ElementTree API
- [ ] this part is fully optional, the application may take care of (de)serialization itself
- [ ] installed only when doing `pip install python-omemo-backend-foo[etree]`
- [x] convenience functions for XML (de)serialization is provided using the ElementTree API
- [x] this part is fully optional, the application may take care of (de)serialization itself
- [x] installed only when doing `pip install *backend*[xml]`
2 changes: 1 addition & 1 deletion omemo/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name" : "OMEMO",
"description" : "A Python implementation of the OMEMO Multi-End Message and Object Encryption protocol.",
"url" : "https://github.com/Syndace/python-omemo",
"year" : "2022",
"year" : "2024",
"author" : "Tim Henkes (Syndace)",
"author_email" : "[email protected]",
"categories" : [
Expand Down
2 changes: 1 addition & 1 deletion omemo/version.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
__all__ = [ "__version__" ] # pylint: disable=unused-variable

__version__ = {}
__version__["short"] = "1.0.2"
__version__["short"] = "1.0.3"
__version__["tag"] = "stable"
__version__["full"] = f"{__version__['short']}-{__version__['tag']}"
4 changes: 2 additions & 2 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -494,5 +494,5 @@ min-public-methods=0

# Exceptions that will emit a warning when being caught. Defaults to
# "BaseException, Exception".
overgeneral-exceptions=BaseException,
Exception
overgeneral-exceptions=builtins.BaseException,
builtins.Exception
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import os
from typing import Dict, Union, List

from setuptools import setup, find_packages # type: ignore[import]
from setuptools import setup, find_packages # type: ignore[import-untyped]

source_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), "omemo")

Expand All @@ -27,11 +27,11 @@
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",

"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",

"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy"
Expand Down Expand Up @@ -61,7 +61,7 @@
"XEdDSA>=1.0.0,<2",
"typing-extensions>=4.3.0"
],
python_requires=">=3.7",
python_requires=">=3.8",
include_package_data=True,
zip_safe=False,
classifiers=classifiers,
Expand Down

0 comments on commit 48eb258

Please sign in to comment.