From e8233d2a030616eb5296208918cc9862433a2cf2 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 18 Oct 2019 14:26:05 -0400
Subject: [PATCH] Remove PYTHONHOME twiddling which is no longer necessary.
nixpkgs Python tools changed to no longer set PYTHONHOME for us
automatically.
---
nixos/modules/tests/run-client.py | 4 ----
nixos/modules/tests/run-introducer.py | 4 ----
2 files changed, 8 deletions(-)
diff --git a/nixos/modules/tests/run-client.py b/nixos/modules/tests/run-client.py
index bcbca050..e2829398 100755
--- a/nixos/modules/tests/run-client.py
+++ b/nixos/modules/tests/run-client.py
@@ -14,10 +14,6 @@ from configparser import ConfigParser
def main():
(introducerFURL, issuerURL) = argv[1:]
- # PYTHONHOME set for Python 3 for this script breaks Python 2 used by
- # Tahoe. :/ This is kind of a NixOS Python packaging bug.
- del environ["PYTHONHOME"]
-
run(["tahoe", "--version"])
run([
"tahoe", "create-client",
diff --git a/nixos/modules/tests/run-introducer.py b/nixos/modules/tests/run-introducer.py
index 7a69bdb8..33c3ec10 100755
--- a/nixos/modules/tests/run-introducer.py
+++ b/nixos/modules/tests/run-introducer.py
@@ -17,10 +17,6 @@ log = print
def main():
pemFile, introducerPort, introducerFURL = argv[1:]
- # PYTHONHOME set for Python 3 for this script breaks Python 2 used by
- # Tahoe. :/ This is kind of a NixOS Python packaging bug.
- del environ["PYTHONHOME"]
-
run(["tahoe", "--version"])
run([
"tahoe", "create-introducer",
--
GitLab