Remove _loading, copy it into __init__ #2594
Conversation
That's the no _loading rasterio PR rasterio/rasterio#2594.
|
@snowman2 I'm testing this on Windows with a rasterio-wheels branch and seeing a couple unexpected failures involving PROJ after an upgrade to 9.1.0 https://github.com/rasterio/rasterio-wheels/actions/runs/3129647645/jobs/5081976996#step:7:237. I'm inclined to merge and then sort out the errors before we make wheels for 1.3.3. |
|
Makes sense 👍 |
Possibly related: #2592 |
|
@sgillies I think you might still need to only add expose those DLLs while importing the rasterio extension modules. Because now you add them always when importing rasterio, which might then impact another module that would load GDAL? (like fiona) |
|
For example in pyogrio, we still do the extension module imports within a context manager that adds/removes the DLL directory: https://github.com/geopandas/pyogrio/blob/d1714041153416c0358658746a6b95f067c835a5/pyogrio/core.py#L5-L26 and https://github.com/geopandas/pyogrio/blob/d1714041153416c0358658746a6b95f067c835a5/pyogrio/_env.py#L50-L61 Although, now I am writing this, I realize that we do use delvewheel for pyogrio, which actually patches the |
|
@jorisvandenbossche @snowman2 delvewheel is patching rasterio and fiona (1.9 pre-releases) and mangling DLL names, too. I'm going to check to see if we can rely entirely on it, will add a test to rasterio-wheels that imports rasterio and fiona together. |
* Test build of 34c0dd5 That's the no _loading rasterio PR rasterio/rasterio#2594. * Set fetch depth * Use branch name * Update vcpkg.json * Add vcpkg.json to hash key * Update vcpkg.json * Update win-wheels.yaml * Add a baseline * Add versions feature flag * Build maint-1.3 * Update win-wheels.yaml * Fix PROJ_LIB directory for PROJ 9.1+ * Try manifest feature flag and check against fiona * vcpkg'ing before the checkout action * Add debugging * Use bash shell * change directory before running vcpkg * checkout step * Remove baseline * Add vcpkg as submodule * Install vcpkg using cmd * Get submodules * Bootstrap vcpkg as separate step * Remove platform tags from manifest * Try adding a baseline and using builtin vcpkg * Back to submodule vcpkg * Use gitsha of vcpkg 2022.09.27 * Use vcpkg 2022.09.27 * GDAL 3.5.2 isn't available in a vcpkg release yet * Override VCPKG_INSTALLATION_ROOT set by GHA * Try GDAL 3.5.2 again * One more override try * Use default (powershell) more often * Come on! * Bootstrap from builtin vcpkg like pyproj does * Run step with bash * Suss out install directory changes * Specify install root * Try to find GDAL after installation * add x-install-root * Remove commands destined to fail * Moar debugging * manifests with an s * Set manifest root, grasping at straws * Use capital C in drive path * Remove vcpkg from gitmodules * Search for GDAL_DATA directory * Add VCPKG_DEFAULT_TRIPLET * fix PROJ_:LIB for PROJ 9.0.1 * Skip 2 tests on Windows * Remove submodule directory Co-authored-by: Alan D. Snow <alansnow21@gmail.com>
Resolves #2593.