Merge pull request #75 from PrivateStorageio/72.distutils-setup-requires

Add Python runtime requirements to setup.cfg

privacypass-repo.nix

-{ fetchFromGitHub }:
-fetchFromGitHub {
-  owner = "LeastAuthority";
-  repo = "privacypass";
-  rev = "45855401e163f8e622bd93a5c5bce13de8c8510a";
-  sha256 = "sha256:15wv8vas6x8cdicylp0m632c916p7qxq1k4lnchr8c92lldp0rv7";
-}
+let
+  pkgs = import <nixpkgs> {};
+in
+  pkgs.fetchFromGitHub {
+    owner = "LeastAuthority";
+    repo = "privacypass";
+    rev = "17ee180eda6dc9ff30d86b9666ee5c0d511434dc";
+    sha256 = "0yz2pdm3q8z7cs0cl8aw3k6x6rb9zq088bvis3f6vaaidzd061h6";
+  }
\ No newline at end of file

privacypass.nix

-{ fetchFromGitHub, callPackage }:
+{ callPackage }:
 let
-  src = import ./privacypass-repo.nix { inherit fetchFromGitHub; };
+  src = import ./privacypass-repo.nix;
   privacypass = callPackage "${src}" { };
 in
   privacypass.overrideAttrs (old: {

remove-setuptools-scm.patch

 diff --git a/setup.py b/setup.py
-index 70927ff..9bf414d 100644
+index 6da2d4d..32262dd 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -21,7 +21,7 @@ setup(
@@ -8,7 +8,7 @@ index 70927ff..9bf414d 100644
      platforms='any',
 -    setup_requires=['milksnake', 'setuptools_scm'],
 +    setup_requires=['milksnake'],
-     install_requires=['milksnake', 'cffi', 'attrs'],
+     install_requires=['cffi', 'attrs'],
      extras_require={
          "tests": [
 @@ -29,7 +29,6 @@ setup(

requirements.txt

-attrs
-zope.interface
-https://github.com/tahoe-lafs/tahoe-lafs/archive/b35a8908f4096ccae35da78b0e7dde96d6cf1667.zip#egg=tahoe-lafs

setup.cfg

@@ -29,3 +29,12 @@ packages =
     _zkapauthorizer
     _zkapauthorizer.tests
     twisted.plugins
+
+install_requires =
+    attrs
+    zope.interface
+    aniso8601
+    privacypass
+    twisted
+    tahoe-lafs
+    treq

zkapauthorizer.nix

 { buildPythonPackage, sphinx
-, attrs, zope_interface, aniso8601, twisted, tahoe-lafs, privacypass
-, fixtures, testtools, hypothesis, pyflakes, treq, coverage
+, attrs, zope_interface, aniso8601, twisted, tahoe-lafs, privacypass, treq
+, fixtures, testtools, hypothesis, pyflakes, coverage
 , hypothesisProfile ? null
 , collectCoverage ? false
 , testSuite ? null
@@ -30,6 +30,7 @@ buildPythonPackage rec {
     twisted
     tahoe-lafs
     privacypass
+    treq
   ];
 
   checkInputs = [
@@ -37,8 +38,6 @@ buildPythonPackage rec {
     fixtures
     testtools
     hypothesis
-    twisted
-    treq
   ];
 
   checkPhase = ''