From 25982258d03129d3f524b02bd707a507888fa9ab Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@private.storage>
Date: Mon, 11 Oct 2021 13:05:22 -0600
Subject: [PATCH] Done?
---
new.nix | 8 --------
requirements/base.txt | 10 +++-------
requirements/test.txt | 2 +-
scripts/pin-requirements | 6 +++---
4 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/new.nix b/new.nix
index d36bfd0..cc42aca 100644
--- a/new.nix
+++ b/new.nix
@@ -23,8 +23,6 @@ in
chardet = "wheel";
urllib3 = "wheel";
zipp = "wheel";
- # marked broken
- magic-wormhole = "wheel";
};
tahoe-lafs = mach-nix.buildPythonPackage {
python = "python27";
@@ -63,12 +61,6 @@ in
}
)
];
- requirementsExtra = ''
- pyrsistent
- foolscap == 0.13.1
- configparser
- eliot
- '';
format = "setuptools";
# Record some settings here, so downstream nix files can consume them.
meta.mach-nix = { inherit python providers; };
diff --git a/requirements/base.txt b/requirements/base.txt
index be815dc..63c01aa 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile
# To update, run:
#
-# pip-compile --allow-unsafe --output-file=requirements/base.txt requirements/base.in
+# pip-compile --output-file=requirements/base.txt requirements/base.in
#
aniso8601==9.0.1
# via -r requirements/base.in
@@ -149,7 +149,7 @@ six==1.16.0
# txaio
spake2==0.8
# via magic-wormhole
-https://github.com/tahoe-lafs/tahoe-lafs/archive/be5f5839b3484c278a051f375d18952e23940677.tar.gz
+tahoe-lafs
# via -r requirements/base.in
tqdm==4.62.3
# via magic-wormhole
@@ -183,8 +183,4 @@ zope.interface==5.4.0
# txtorcon
# The following packages are considered to be unsafe in a requirements file:
-setuptools==44.1.1
- # via
- # collections-extended
- # tahoe-lafs
- # zope.interface
+# setuptools
diff --git a/requirements/test.txt b/requirements/test.txt
index 2c22f4a..60e68e7 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile
# To update, run:
#
-# pip-compile --allow-unsafe --output-file=requirements/test.txt --pip-args='-c requirements/base.txt' requirements/test.in
+# pip-compile --output-file=requirements/test.txt --pip-args='-c requirements/base.txt' requirements/test.in
#
argparse==1.4.0
# via unittest2
diff --git a/scripts/pin-requirements b/scripts/pin-requirements
index cf89542..ffc56b0 100755
--- a/scripts/pin-requirements
+++ b/scripts/pin-requirements
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
export PYTHONPATH=.
-pip-compile -q --allow-unsafe requirements/base.in -o requirements/base.txt
-pip-compile -q --allow-unsafe requirements/test.in -o requirements/test.txt --pip-args "-c requirements/base.txt"
+pip-compile -q requirements/base.in -o requirements/base.txt
+pip-compile -q requirements/test.in -o requirements/test.txt --pip-args "-c requirements/base.txt"
-sed -i '\,http://github.com/tahoe-lafs/tahoe-lafs,s,.*,tahoe-lafs,' requirements/base.txt
+sed -i '\,https://github.com/tahoe-lafs/tahoe-lafs,s,.*,tahoe-lafs,' requirements/base.txt
--
GitLab