diff --git a/pkgs/python-packages-overrides.nix b/pkgs/python-packages-overrides.nix --- a/pkgs/python-packages-overrides.nix +++ b/pkgs/python-packages-overrides.nix @@ -164,12 +164,6 @@ self: super: { }; }); - "pytest-runner" = super."pytest-runner".override (attrs: { - propagatedBuildInputs = [ - self."setuptools-scm" - ]; - }); - "python-ldap" = super."python-ldap".override (attrs: { propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ pkgs.openldap diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -1752,7 +1752,6 @@ self: super: { ]; doCheck = true; propagatedBuildInputs = [ - self."setuptools-scm" self."amqp" self."authomatic" self."babel" @@ -1942,17 +1941,6 @@ self: super: { license = [ pkgs.lib.licenses.mit ]; }; }; - "setuptools-scm" = super.buildPythonPackage { - name = "setuptools-scm-2.1.0"; - doCheck = false; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/e5/62/f9e1ac314464eb5945c97542acb6bf6f3381dfa5d7a658de7730c36f31a1/setuptools_scm-2.1.0.tar.gz"; - sha256 = "0yb364cgk15sfw3x8ln4ssh98z1dj6n8iiz4r2rw1cfsxhgi8rx7"; - }; - meta = { - license = [ pkgs.lib.licenses.mit ]; - }; - }; "simplegeneric" = super.buildPythonPackage { name = "simplegeneric-0.8.1"; doCheck = false; diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ ## dependencies -setuptools-scm==2.1.0 amqp==2.3.1 # not released authomatic that has updated some oauth providers https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801#egg=authomatic==0.1.0.post1 diff --git a/rhodecode/config/licenses.json b/rhodecode/config/licenses.json --- a/rhodecode/config/licenses.json +++ b/rhodecode/config/licenses.json @@ -272,17 +272,6 @@ { "license": [ { - "fullName": "MIT License", - "shortName": "mit", - "spdxId": "MIT", - "url": "http://spdx.org/licenses/MIT.html" - } - ], - "name": "python2.7-setuptools-scm-2.1.0" - }, - { - "license": [ - { "fullName": "BSD 4-clause \"Original\" or \"Old\" License", "shortName": "bsdOriginal", "spdxId": "BSD-4-Clause",