Skip to content

Upgrade protobuf and deapi version #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CSSFrancis merged 2 commits into from
Sep 25, 2026
Merged

Upgrade protobuf and deapi version #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c25c68b
Upgrade protobuf and deapi version
CoolFanyu Sep 25, 2026
ae5dc4c
Select protobuf 6.33 gencode in buffer_protocols and require Python >…
CSSFrancis Sep 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
python-version: ["3.12", "3.13"]
include:
- os: ubuntu-latest
python-version: "3.11"
DEPENDENCIES: protobuf==5.26.0
python-version: "3.10"
DEPENDENCIES: protobuf==6.33.5
LABEL: -oldest
steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 1 addition & 2 deletions deapi/buffer_protocols/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@

long = int # python 3 no longer has int
if int(pyVersion[1]) >= 10:
# import pb_3_19_3 as pb
import deapi.buffer_protocols.pb_3_23_3 as pb
import deapi.buffer_protocols.pb_6_33_4 as pb
elif int(pyVersion[1]) >= 8:
import deapi.buffer_protocols.pb_3_11_4 as pb
else:
Expand Down
47 changes: 47 additions & 0 deletions deapi/buffer_protocols/pb_6_33_4.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@ classifiers = [
"Intended Audience :: Developers",
"Intended Audience :: Science/Research",
"Operating System :: OS Independent",
"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 :: 3.13",
"Topic :: Scientific/Engineering",
]
dependencies = [
"numpy>=1.20.0",
"protobuf>=3.20.0",
"protobuf>=6.33.5,<7",
"pillow",
"matplotlib",
"scipy",
Expand All @@ -37,7 +36,7 @@ keywords = [
"4D STEM",
]
name = "deapi"
requires-python = ">=3.8"
requires-python = ">=3.10"

[tool.setuptools.packages.find]
include = ["deapi*", "deapi.*"]
Expand Down
1 change: 1 addition & 0 deletions upcoming_changes/64.maintenance.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bumped the google protobuf version to 6.33 and dropped support for Python < 3.10. Closes #3691
Loading