-
Notifications
You must be signed in to change notification settings - Fork 350
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Problem: nixpkgs and python dependencies are out of date
Solution: - update nixpkgs to nixpkgs-unstable - rustc to 1.75 - update python dependencies in integration tests
- Loading branch information
Showing
9 changed files
with
646 additions
and
561 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,26 +5,21 @@ description = "" | |
authors = ["Your Name <[email protected]>"] | ||
|
||
[tool.poetry.dependencies] | ||
python = "^3.8" | ||
pytest = "^7.1.3" | ||
pytest-xdist = "^2.5.0" | ||
flake8 = "^4.0.1" | ||
black = "^22.6" | ||
flake8-black = "^0.3.3" | ||
flake8-isort = "^4.1.1" | ||
grpcio = "^1.53.2" | ||
grpcio-tools = "^1.42.0" | ||
pep8-naming = "^0.11.1" | ||
pytest-github-actions-annotate-failures = "^0.1.7" | ||
protobuf = "^3.20.2" | ||
pyyaml = "^6.0.1" | ||
python-dateutil = "^2.8.1" | ||
pystarport = { git = "https://github.com/crypto-com/pystarport.git", branch = "main", rev = "d86272f" } | ||
python = "^3.9" | ||
pytest = "^8.0" | ||
pytest-xdist = "^3.5" | ||
flake8 = "^7.0" | ||
black = "^24.2" | ||
flake8-black = "^0.3" | ||
flake8-isort = "^6.1" | ||
pep8-naming = "^0.13" | ||
pytest-github-actions-annotate-failures = "^0.2" | ||
protobuf = "^4.25" | ||
pyyaml = "^6.0" | ||
python-dateutil = "^2.8" | ||
pystarport = { git = "https://github.com/crypto-com/pystarport.git", branch = "main" } | ||
chainlibpy = "^2.2.0" | ||
|
||
# manually upgrade to make hatchling build success in poetry2nix | ||
pathspec = "^0.10.1" | ||
|
||
[tool.poetry.dev-dependencies] | ||
|
||
[build-system] | ||
|
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,33 +1,23 @@ | ||
{ poetry2nix, python310, lib }: | ||
{ poetry2nix, python311, lib }: | ||
poetry2nix.mkPoetryEnv { | ||
python = python310; | ||
python = python311; | ||
projectDir = ../integration_tests; | ||
overrides = poetry2nix.overrides.withDefaults (lib.composeManyExtensions [ | ||
(self: super: | ||
let | ||
buildSystems = { | ||
pyparsing = [ "flit-core" ]; | ||
hdwallets = [ "poetry" ]; | ||
pystarport = [ "poetry-core" ]; | ||
durations = [ "setuptools" ]; | ||
multitail2 = [ "setuptools" ]; | ||
pytest-github-actions-annotate-failures = [ "setuptools" ]; | ||
flake8-black = [ "setuptools" ]; | ||
}; | ||
in | ||
lib.mapAttrs | ||
(attr: systems: super.${attr}.overridePythonAttrs | ||
(old: { | ||
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ map (a: self.${a}) systems; | ||
})) | ||
buildSystems | ||
) | ||
(self: super: { | ||
pyyaml-include = super.pyyaml-include.overridePythonAttrs { | ||
preConfigure = '' | ||
substituteInPlace setup.py --replace "setup()" "setup(version=\"1.3\")" | ||
''; | ||
overrides = poetry2nix.overrides.withDefaults (self: super: | ||
let | ||
buildSystems = { | ||
pystarport = [ "poetry-core" ]; | ||
durations = [ "setuptools" ]; | ||
multitail2 = [ "setuptools" ]; | ||
pytest-github-actions-annotate-failures = [ "setuptools" ]; | ||
flake8-black = [ "setuptools" ]; | ||
flake8-isort = [ "hatchling" ]; | ||
}; | ||
}) | ||
]); | ||
in | ||
lib.mapAttrs | ||
(attr: systems: super.${attr}.overridePythonAttrs | ||
(old: { | ||
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ map (a: self.${a}) systems; | ||
})) | ||
buildSystems | ||
); | ||
} |