From 15a76e442f957916fe834e4b152a68ddc9390d3d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Jul 2023 18:12:47 +0200
Subject: [PATCH] [1.5.0] env variable support in singularity
---
.envrc | 3 +--
default.nix | 9 +++------
flake.lock | 6 +++---
flake.nix | 6 +++---
pyproject.toml | 2 +-
5 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/.envrc b/.envrc
index b220fb7..d08d724 100644
--- a/.envrc
+++ b/.envrc
@@ -1,4 +1,3 @@
#!/bin/sh
-use flake
-source venv/bin/activate
+# use flake
diff --git a/default.nix b/default.nix
index 56ea97d..e5e7c75 100644
--- a/default.nix
+++ b/default.nix
@@ -1,14 +1,11 @@
{pkgs ? import <nixpkgs> {}}: let
py = pkgs.python3Packages;
in
- py.buildPythonApplication rec {
+ py.buildPythonApplication {
pname = "remote-inria";
- version = "1.4.0";
+ version = "1.5.0";
- src = pkgs.fetchPypi {
- inherit pname version;
- sha256 = "sha256-naL5CJxf4RQG5r5RXWxCki4NsJyaerPzwMsPhtrSPn0=";
- };
+ src = ./.;
format = "pyproject";
diff --git a/flake.lock b/flake.lock
index 5d62abf..79eeadc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1680213900,
- "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
+ "lastModified": 1688590700,
+ "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
+ "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 04424be..8279616 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,9 +48,9 @@
};
};
- devShells.${system}.default = pkgs.mkShell {
- buildInputs = [python];
- };
+ # devShells.${system}.default = pkgs.mkShell {
+ # buildInputs = [python];
+ # };
formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra;
};
diff --git a/pyproject.toml b/pyproject.toml
index 0d9788b..45bb77f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
name = "remote-inria"
description = "Remote Inria: A CLI tool for remotely interacting with Inria computing resources."
-version = "1.4.0"
+version = "1.5.0"
authors = [
{ name = "Gaétan Lepage", email = "gaetan.lepage@inria.fr" }
]
--
GitLab