-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Reintroduce now-working GitHub Workflows validation - Use Python 3.12 - Bump all Python packages - Work around argon2-cffi-bindings being incompatible with Python 3.12 <nix-community/poetry2nix#1795> - Patch sat-search and sat-stac for Python 3.12 compatibility - Add Poetry packages to `python` with multiple `withPackages` calls to avoid collisions - Avoid using very out of date sat-stac package
- Loading branch information
Showing
11 changed files
with
2,755 additions
and
2,533 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3,404 changes: 1,742 additions & 1,662 deletions
3,404
flooding/sentinel2_water_extraction/poetry.lock
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| import ( | ||
| builtins.fetchTarball { | ||
| url = "https://github.com/nixos/nixpkgs/archive/2057814051972fa1453ddfb0d98badbea9b83c06.tar.gz"; | ||
| sha256 = "1a8jafyawg8mysv787q0cwghkza9kahbbniism7v2rcxas89b575"; | ||
| name = "nixos-unstable-2024-09-06"; | ||
| url = "https://github.com/nixos/nixpkgs/archive/ad416d066ca1222956472ab7d0555a6946746a80.tar.gz"; | ||
| sha256 = "0b9x5sghija7gy4lzf6l9s2kchdwj0zxs37ndlms2r8z1g3gwa7v"; | ||
| } | ||
| ) {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,85 @@ | ||
| {pkgs}: | ||
| import ( | ||
| builtins.fetchTarball { | ||
| name = "poetry2nix-2024.8.2346599"; | ||
| url = "https://github.com/nix-community/poetry2nix/archive/7619e43c2b48c29e24b88a415256f09df96ec276.tar.gz"; | ||
| sha256 = "10nf9213h7vkzrqhrgk88r5sd2rq19cvdpnn59f65ifak790sgc0"; | ||
| } | ||
| ) { | ||
| inherit pkgs; | ||
| } | ||
| {pkgs}: let | ||
| poetry2nix = | ||
| import ( | ||
| builtins.fetchTarball { | ||
| url = "https://github.com/nix-community/poetry2nix/archive/2024.9.285936.tar.gz"; | ||
| sha256 = "11a3wd1lgcq4qknh3almy9pcyqgm9f1q9iihdvy08g2hvmj2zris"; | ||
| } | ||
| ) { | ||
| inherit pkgs; | ||
| }; | ||
| in | ||
| poetry2nix.overrideScope (_finalPoetry2nix: prevPoetry2nix: { | ||
| defaultPoetryOverrides = prevPoetry2nix.defaultPoetryOverrides.extend (final: prev: { | ||
| jupyter-server = prev.jupyter-server.overridePythonAttrs (old: { | ||
| # Already in poetry2nix but needed here because we're mixing old and new versions of jupyter-server | ||
| nativeBuildInputs = (old.nativeBuildInputs or []) ++ [final.jupyter-packaging]; | ||
| }); | ||
| sat-search = prev.sat-search.overridePythonAttrs (old: { | ||
| # https://github.com/sat-utils/sat-search/pull/136 | ||
| patches = | ||
| (old.patches or []) | ||
| ++ pkgs.lib.optionals (!(old.src.isWheel or false)) [ | ||
| (pkgs.writeText "sat-search-importlib.patch" '' | ||
| --- a/setup.py | ||
| +++ b/setup.py | ||
| @@ -1,9 +1,20 @@ | ||
| #!/usr/bin/env python | ||
| +import importlib.util | ||
| +import importlib.machinery | ||
| from setuptools import setup, find_packages | ||
| -from imp import load_source | ||
| from os import path | ||
| import io | ||
| +def load_source(modname, filename): | ||
| + loader = importlib.machinery.SourceFileLoader(modname, filename) | ||
| + spec = importlib.util.spec_from_file_location(modname, filename, loader=loader) | ||
| + module = importlib.util.module_from_spec(spec) | ||
| + # The module is always executed and not cached in sys.modules. | ||
| + # Uncomment the following line to cache the module. | ||
| + # sys.modules[module.__name__] = module | ||
| + loader.exec_module(module) | ||
| + return module | ||
| + | ||
| __version__ = load_source('satsearch.version', 'satsearch/version.py').__version__ | ||
| here = path.abspath(path.dirname(__file__)) | ||
| '') | ||
| ]; | ||
| }); | ||
| sat-stac = prev.sat-stac.overridePythonAttrs (old: { | ||
| # https://github.com/sat-utils/sat-stac/pull/75 | ||
| patches = | ||
| (old.patches or []) | ||
| ++ pkgs.lib.optionals (!(old.src.isWheel or false)) [ | ||
| (pkgs.writeText "sat-stac-importlib.patch" '' | ||
| --- a/setup.py | ||
| +++ b/setup.py | ||
| @@ -1,9 +1,20 @@ | ||
| #!/usr/bin/env python | ||
| +import importlib.util | ||
| +import importlib.machinery | ||
| from setuptools import setup, find_packages | ||
| -from imp import load_source | ||
| from os import path | ||
| import io | ||
| +def load_source(modname, filename): | ||
| + loader = importlib.machinery.SourceFileLoader(modname, filename) | ||
| + spec = importlib.util.spec_from_file_location(modname, filename, loader=loader) | ||
| + module = importlib.util.module_from_spec(spec) | ||
| + # The module is always executed and not cached in sys.modules. | ||
| + # Uncomment the following line to cache the module. | ||
| + # sys.modules[module.__name__] = module | ||
| + loader.exec_module(module) | ||
| + return module | ||
| + | ||
| __version__ = load_source('satstac.version', 'satstac/version.py').__version__ | ||
| here = path.abspath(path.dirname(__file__)) | ||
| '') | ||
| ]; | ||
| }); | ||
| }); | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters