diff --git a/new.nix b/new.nix
index cc42aca847581639c68a588491dc9d9f3109d990..f2bf583e9544998c40f1b99095b13abb48d654ef 100644
--- a/new.nix
+++ b/new.nix
@@ -15,33 +15,31 @@ in
python-challenge-bypass-ristretto = "wheel";
# Pure python packages that don't build correctly from sdists
# - patches in nixpkgs that don't apply
- # - missing build dependencies
- platformdirs = "wheel";
boltons = "wheel";
- klein = "wheel";
- humanize = "wheel";
chardet = "wheel";
urllib3 = "wheel";
- zipp = "wheel";
+ # - incorrectly detected dependencies due to pbr
+ fixtures = "wheel";
+ testtools = "wheel";
+ traceback2 = "wheel";
};
tahoe-lafs = mach-nix.buildPythonPackage {
python = "python27";
- pname = "tahoe-lafs";
- version = "1.16.0rc1";
+ name = "tahoe-lafs";
+ version = "1.16.post999";
inherit providers;
- #inherit requirements providers;
# See https://github.com/DavHau/mach-nix/issues/190
requirementsExtra = ''
- pyrsistent
+ pyrsistent < 0.17
foolscap == 0.13.1
configparser
eliot
- '';
+ '';
postPatch = ''
cat > src/allmydata/_version.py <<EOF
# This _version.py is generated by nix.
- verstr = "$version"
+ verstr = "1.16.post999+git-${tahoe-lafs-repo.rev}"
__version__ = verstr
EOF
'';
@@ -53,7 +51,11 @@ in
name = "zero-knowledge-access-pass-authorizer";
src = ./.;
inherit providers;
- requirements = builtins.readFile ./requirements/base.txt;
+ # We need to specify requirements here, since mach-nix does not
+ # grab reqs from nixpkg dependencies
+ # TODO: File issue
+ requirementsExtra = tahoe-lafs.requirements;
+ # Add
overridesPre = [
(
self: super: {
diff --git a/nix/sources.json b/nix/sources.json
index 9d2dfc57eb2169a4a7c55fca14d2b2cab8cb1126..3f1ed6b1ba21db8fd4d9cd4ea95236a75fdb81fc 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -1,14 +1,14 @@
{
"mach-nix": {
- "branch": "master",
+ "branch": "merged",
"description": "Create highly reproducible python environments",
"homepage": "",
- "owner": "DavHau",
+ "owner": "tp-la",
"repo": "mach-nix",
- "rev": "d223656fc0eff33f4da77d69db19752edc9a5ba5",
- "sha256": "1lnj8g83nsjl21yy4xbz7mrx152xdj01dyzz1mqrb3zjcwxibc0c",
+ "rev": "0872dd81afe9c4a6552604f7d21fe7f2baddf454",
+ "sha256": "0hsbm6rmjjjzxdciirmcxyvrrlz19cbhprd2hfksrv6nnl4c3mc3",
"type": "tarball",
- "url": "https://github.com/DavHau/mach-nix/archive/d223656fc0eff33f4da77d69db19752edc9a5ba5.tar.gz",
+ "url": "https://github.com/tp-la/mach-nix/archive/0872dd81afe9c4a6552604f7d21fe7f2baddf454.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"niv": {
diff --git a/requirements/base.in b/requirements/base.in
deleted file mode 100644
index 837f771ef1315b7f60cb421db4718434902d65e0..0000000000000000000000000000000000000000
--- a/requirements/base.in
+++ /dev/null
@@ -1,7 +0,0 @@
-attrs
-zope.interface
-eliot
-aniso8601
-python-challenge-bypass-ristretto
-https://github.com/tahoe-lafs/tahoe-lafs/archive/be5f5839b3484c278a051f375d18952e23940677.tar.gz
-treq
diff --git a/requirements/base.txt b/requirements/base.txt
deleted file mode 100644
index 63c01aab4122588a2b366d43a0162c388d2e565f..0000000000000000000000000000000000000000
--- a/requirements/base.txt
+++ /dev/null
@@ -1,186 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-# pip-compile --output-file=requirements/base.txt requirements/base.in
-#
-aniso8601==9.0.1
- # via -r requirements/base.in
-appdirs==1.4.4
- # via twisted
-argparse==1.4.0
- # via zfec
-attrs==21.2.0
- # via
- # -r requirements/base.in
- # automat
- # magic-wormhole
- # python-challenge-bypass-ristretto
- # service-identity
- # tahoe-lafs
- # treq
- # twisted
-autobahn[twisted]==19.11.2
- # via
- # magic-wormhole
- # tahoe-lafs
-automat==20.2.0
- # via
- # magic-wormhole
- # twisted
- # txtorcon
-bcrypt==3.1.7
- # via twisted
-boltons==21.0.0
- # via eliot
-certifi==2021.5.30
- # via requests
-cffi==1.14.6
- # via
- # bcrypt
- # cryptography
- # pynacl
- # python-challenge-bypass-ristretto
-chardet==4.0.0
- # via requests
-click==7.1.2
- # via magic-wormhole
-collections-extended==1.0.3
- # via tahoe-lafs
-configparser==4.0.2
- # via tahoe-lafs
-constantly==15.1.0
- # via twisted
-cryptography==3.3.2
- # via
- # autobahn
- # pyopenssl
- # service-identity
- # tahoe-lafs
- # twisted
- # txtorcon
-distro==1.6.0
- # via tahoe-lafs
-eliot==1.7.0
- # via
- # -r requirements/base.in
- # tahoe-lafs
-enum34==1.1.10
- # via cryptography
-foolscap==0.13.1
- # via tahoe-lafs
-future==0.18.2
- # via tahoe-lafs
-hkdf==0.0.3
- # via
- # magic-wormhole
- # spake2
-humanize==1.0.0
- # via magic-wormhole
-hyperlink==21.0.0
- # via
- # treq
- # twisted
-idna==2.10
- # via
- # hyperlink
- # requests
- # twisted
-incremental==21.3.0
- # via
- # treq
- # twisted
- # txtorcon
-ipaddress==1.0.23
- # via
- # cryptography
- # service-identity
- # txtorcon
-magic-wormhole==0.12.0
- # via tahoe-lafs
-netifaces==0.11.0
- # via tahoe-lafs
-pyasn1-modules==0.2.8
- # via service-identity
-pyasn1==0.4.8
- # via
- # pyasn1-modules
- # service-identity
- # twisted
-pycparser==2.20
- # via cffi
-pyhamcrest==1.10.1
- # via twisted
-pynacl==1.4.0
- # via magic-wormhole
-pyopenssl==21.0.0
- # via
- # foolscap
- # twisted
-pyrsistent==0.16.1
- # via
- # eliot
- # tahoe-lafs
-python-challenge-bypass-ristretto==2021.7.12
- # via -r requirements/base.in
-pyutil==3.3.0
- # via tahoe-lafs
-pyyaml==5.4.1
- # via tahoe-lafs
-requests==2.26.0
- # via treq
-service-identity==21.1.0
- # via twisted
-six==1.16.0
- # via
- # autobahn
- # automat
- # bcrypt
- # cryptography
- # eliot
- # magic-wormhole
- # pyhamcrest
- # pynacl
- # pyopenssl
- # pyrsistent
- # service-identity
- # tahoe-lafs
- # treq
- # txaio
-spake2==0.8
- # via magic-wormhole
-tahoe-lafs
- # via -r requirements/base.in
-tqdm==4.62.3
- # via magic-wormhole
-treq==21.1.0
- # via -r requirements/base.in
-twisted[conch,tls]==20.3.0
- # via
- # autobahn
- # foolscap
- # magic-wormhole
- # tahoe-lafs
- # treq
- # txtorcon
-txaio==18.8.1
- # via autobahn
-txtorcon==21.1.0
- # via magic-wormhole
-typing==3.10.0.0
- # via hyperlink
-urllib3==1.26.7
- # via requests
-zfec==1.5.5
- # via tahoe-lafs
-zope.interface==5.4.0
- # via
- # -r requirements/base.in
- # autobahn
- # eliot
- # tahoe-lafs
- # twisted
- # txtorcon
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
diff --git a/requirements/test.txt b/requirements/test.txt
deleted file mode 100644
index 60e68e774d96d08ea0dd8dc90d033ab7ebe72b05..0000000000000000000000000000000000000000
--- a/requirements/test.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-# pip-compile --output-file=requirements/test.txt --pip-args='-c requirements/base.txt' requirements/test.in
-#
-argparse==1.4.0
- # via unittest2
-attrs==21.2.0
- # via hypothesis
-configparser==4.0.2
- # via
- # flake8
- # importlib-metadata
-contextlib2==0.6.0.post1
- # via
- # importlib-metadata
- # zipp
-coverage==5.5
- # via -r requirements/test.in
-enum34==1.1.10
- # via
- # flake8
- # hypothesis
-extras==1.0.0
- # via testtools
-fixtures==3.0.0
- # via
- # -r requirements/test.in
- # testtools
-flake8==3.9.2
- # via -r requirements/test.in
-functools32==3.2.3-2
- # via flake8
-hypothesis==4.57.1
- # via -r requirements/test.in
-importlib-metadata==2.1.1
- # via flake8
-linecache2==1.0.0
- # via traceback2
-mccabe==0.6.1
- # via flake8
-pathlib2==2.3.6
- # via importlib-metadata
-pbr==5.6.0
- # via
- # fixtures
- # testtools
-pycodestyle==2.7.0
- # via flake8
-pyflakes==2.3.1
- # via flake8
-python-mimeparse==1.6.0
- # via testtools
-scandir==1.10.0
- # via pathlib2
-six==1.16.0
- # via
- # fixtures
- # pathlib2
- # testtools
- # unittest2
-sortedcontainers==2.4.0
- # via hypothesis
-testtools==2.4.0
- # via
- # -r requirements/test.in
- # fixtures
-traceback2==1.4.0
- # via
- # testtools
- # unittest2
-typing==3.10.0.0
- # via flake8
-unittest2==1.1.0
- # via testtools
-zipp==1.2.0
- # via importlib-metadata
diff --git a/scripts/pin-requirements b/scripts/pin-requirements
deleted file mode 100755
index ffc56b05a09b26ab5a9ed885a88c4576dd748eb7..0000000000000000000000000000000000000000
--- a/scripts/pin-requirements
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-export PYTHONPATH=.
-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 '\,https://github.com/tahoe-lafs/tahoe-lafs,s,.*,tahoe-lafs,' requirements/base.txt
diff --git a/setup.cfg b/setup.cfg
index 7e9b98e6cf8d39d1e553f3fcd240b3e188c507ba..6b99b460b88f7e7f96e14f84f65be7da50a5bee9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -41,9 +41,6 @@ install_requires =
tahoe-lafs >=1.14, <1.17, !=1.15.*
treq
pyutil
- # py2 stuff
- autobahn < 20
- bcrypt < 3.2
[options.extras_require]
test = coverage; fixtures; testtools; hypothesis
diff --git a/tests.nix b/tests.nix
index 6e5d3e9d62815a6d95dd2b1f15dd7805b9ac3b19..f92fe61f4c0a867dca08d9bc87bbe3b903927a17 100644
--- a/tests.nix
+++ b/tests.nix
@@ -23,7 +23,7 @@ in
python = mach-nix.mkPython {
inherit (zkapauthorizer.meta.mach-nix) python providers;
requirements =
- builtins.readFile ./requirements/test.txt;
+ builtins.readFile ./requirements/test.in;
packagesExtra = [ zkapauthorizer ];
_.hypothesis.postUnpack = "";
};