Skip to content

Commit 9cb5c38

Browse files
committed
Remove some legacy code for conda_raw
Note: At the time of writing, this renders the package unbuildable because we have nothing between 6164 (legacy) and 6219 (broken). But this will soon change when pypdfium2_raw is rebuilt against pdfium-binaries 6281, which will happen before the next helpers release.
1 parent a584927 commit 9cb5c38

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

conda/helpers/recipe/meta.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ requirements:
3030
- setuptools
3131
- wheel !=0.38.0,!=0.38.1
3232
run:
33-
# Set an upper boundary for pypdfium2_raw as defined in craft_packages.py
34-
# NOTE There currently is no significant minimum pdfium requirement, but we could add one should the necessity arise.
35-
# pdfium 6219: blacklisted due to https://crbug.com/pdfium/2112
36-
# (6205 is also affected, but not on conda due to monthly schedule)
33+
# -- Reasons for pdfium version bounds --
34+
# >6164 : API-breaking changes to ctypesgen
35+
# !=6219 : Blacklisted due to https://crbug.com/pdfium/2112 (6205 is also affected, but not on conda due to monthly schedule)
36+
# <={{ pdfium_max }} : Prevents future versions for API safety reasons
3737
- python
38-
- pypdfium2-team::pypdfium2_raw <={{ pdfium_max }},!=6219
38+
- pypdfium2-team::pypdfium2_raw >6164,!=6219,<={{ pdfium_max }}
3939

4040
test:
4141
requires:

src/pypdfium2/__main__.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
from pypdfium2.version import PYPDFIUM_INFO, PDFIUM_INFO
88
from pypdfium2._cli._parsers import setup_logging
99

10-
try:
11-
from pypdfium2_raw.bindings import _libs_info
12-
pdfium_path = _libs_info["pdfium"]["path"]
13-
except ImportError:
14-
# retained for downward compatibility with conda pypdfium2_raw <= 6164 by date of initial build
15-
# actually it's the ctypesgen version that matters, but we don't have info about that
16-
from pypdfium2_raw.bindings import _loader_info
17-
pdfium_path = _loader_info["libpath"]
10+
from pypdfium2_raw.bindings import _libs_info
11+
pdfium_path = _libs_info["pdfium"]["path"]
1812

1913
SubCommands = {
2014
"arrange": "rearrange/merge documents",

0 commit comments

Comments
 (0)