Skip to content

Commit

Permalink
Merge pull request #2753 from IntersectMBO/use_python3.11
Browse files Browse the repository at this point in the history
feat: update base dev shell to use Python 3.11
  • Loading branch information
mkoura authored Nov 12, 2024
2 parents 2233f47 + 1f6c761 commit 5aa9269
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/repo_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
id: setup-python
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'
- name: Install Poetry
uses: snok/install-poetry@v1
with:
Expand Down
8 changes: 5 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
(system:
let
pkgs = nixpkgs.legacyPackages.${system};
py3pkgs = pkgs.python311Packages;
py3Full = pkgs.python311Full;
in
{
devShells = rec {
base = pkgs.mkShell {
nativeBuildInputs = with pkgs; [ bash coreutils curl git gnugrep gnumake gnutar jq python3Packages.supervisor xz ];
nativeBuildInputs = with pkgs; [ py3Full bash coreutils curl git gnugrep gnumake gnutar jq py3pkgs.supervisor xz ];
};
# TODO: can be removed once sync tests are fully moved to separate repo
python = pkgs.mkShell {
Expand All @@ -39,8 +41,8 @@
).overrideAttrs (oldAttrs: rec {
nativeBuildInputs = base.nativeBuildInputs ++ postgres.nativeBuildInputs ++ oldAttrs.nativeBuildInputs ++ [
cardano-node.packages.${system}.cardano-submit-api
pkgs.python3Packages.pip
pkgs.python3Packages.virtualenv
py3pkgs.pip
py3pkgs.virtualenv
];
});
# Use 'venv' directly as 'default' and 'dev'
Expand Down
2 changes: 1 addition & 1 deletion setup_dev_venv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Install cardano_node_tests and its dependencies into a virtual environment.

PYTHON_VERSION="3.10"
PYTHON_VERSION="3.11"

abort_install=0

Expand Down

0 comments on commit 5aa9269

Please sign in to comment.