Skip to content
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

Python38/Windows dll load directory #852

Closed
wants to merge 24 commits into from
Closed

Python38/Windows dll load directory #852

Changes from 2 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
761f724
initial add_dll_directory
rbuffat Jan 10, 2020
7c8967e
remove empty line
rbuffat Jan 10, 2020
69c95b5
search for gdal/bin in PATH, search for dll directories only when imp…
rbuffat Jan 13, 2020
81de199
move del p
rbuffat Jan 13, 2020
a1a7f8c
add missing pathlib import
rbuffat Jan 13, 2020
efcd995
move del path
rbuffat Jan 13, 2020
8a40a98
add python 3.8 / gdal 3.0.2 to build matrix, switch to stable gisinte…
rbuffat Jan 13, 2020
bb3f8d4
refactor import
rbuffat Mar 24, 2020
4241697
remove python 3.8 constraint for finding dll directories
rbuffat Mar 24, 2020
932bfa0
update documentation
rbuffat Mar 24, 2020
cdb4338
update documentation
rbuffat Mar 24, 2020
e475770
formatting
rbuffat Mar 24, 2020
ee46b23
add missing import
rbuffat Mar 24, 2020
472a87d
refactor dll directory search and add
rbuffat Mar 31, 2020
bd97919
doc update
rbuffat Mar 31, 2020
94588c7
bump appveyor gdal versions
rbuffat Apr 1, 2020
b608b2c
refactor to search for gdal*.dll
rbuffat Apr 1, 2020
51bee20
add logging
rbuffat Apr 1, 2020
19cf456
update readme
rbuffat Apr 1, 2020
d6d04ee
add gdal_home directory to logging message
rbuffat Apr 1, 2020
e94e7e1
add dlls using contextmanager
rbuffat Apr 3, 2020
987bc99
move extension import test to _loading
rbuffat Apr 4, 2020
b1f7dbe
search in all directories in PATH for gdal libraries
rbuffat Apr 4, 2020
3247c69
use add_gdal_dll_directories also for import of _geometry, _err
rbuffat Apr 4, 2020
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
13 changes: 12 additions & 1 deletion fiona/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
import os
import sys
import warnings

import platform
from six import string_types
from collections import OrderedDict

Expand All @@ -77,6 +77,17 @@
class Path:
pass


# Add gdal dll directory on Windows and Python >= 3.8, see https://github.com/Toblerity/Fiona/issues/851
if platform.system() == 'Windows' and (3, 8) <= sys.version_info:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is add_dll_directory harmful when gdal dlls are already loaded? E.g. when multiple gdal binaries are present.


# Add GDAL_HOME/bin, if present
gdal_home = os.getenv('GDAL_HOME', None)

if gdal_home is not None and os.path.exists(gdal_home):
os.add_dll_directory(os.path.join(gdal_home, "bin"))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If GDAL_HOME is set, but the directory does not exist, we should emit a warning



# TODO: remove this? Or at least move it, flake8 complains.
if sys.platform == "win32":
libdir = os.path.join(os.path.dirname(__file__), ".libs")
Expand Down