diff --git a/new.nix b/new.nix index d36bfd0fca0337a913aadae11c1a6f3bfc97e8d9..cc42aca847581639c68a588491dc9d9f3109d990 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 be815dcb3209143824fef4b6fbc1ef801bb076b8..63c01aab4122588a2b366d43a0162c388d2e565f 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 2c22f4ac7f8be9f170f2ec6fe3ed93bc23bc0f82..60e68e774d96d08ea0dd8dc90d033ab7ebe72b05 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 cf895428e5be6bbea6941c5ee02329b3199c87d8..ffc56b05a09b26ab5a9ed885a88c4576dd748eb7 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