Merge pull request #153675 from mweinelt/funkwhale-deps
This commit is contained in:
commit
e00d16cfbd
7 changed files with 93 additions and 36 deletions
|
@ -3,14 +3,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-allauth";
|
||||
version = "0.40.0";
|
||||
version = "0.47.0";
|
||||
|
||||
# no tests on PyPI
|
||||
src = fetchFromGitHub {
|
||||
owner = "pennersr";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "10id4k01p1hg5agb8cmllg8mv4kc7ryl75br10idwxabqqp4vla1";
|
||||
sha256 = "sha256-wKrsute6TCl331UrxNEBf/zTtGnyGHsOZQwdiicbg2o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ];
|
||||
|
|
|
@ -1,22 +1,58 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub
|
||||
, django, requests, oauthlib
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# propagates
|
||||
, django
|
||||
, jwcrypto
|
||||
, requests
|
||||
, oauthlib
|
||||
|
||||
# tests
|
||||
, djangorestframework
|
||||
, pytest-django
|
||||
, pytest-xdist
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-oauth-toolkit";
|
||||
version = "1.2.0";
|
||||
version = "1.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1zbksxrcxlqnapmlvx4rgvpqc4plgnq0xnf45cjwzwi1626zs8g6";
|
||||
sha256 = "sha256-TOrFxQULwiuwpVFqRwRkfTW+GRudLNy6F/gIjUYjZhI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django requests oauthlib ];
|
||||
postPatch = ''
|
||||
sed -i '/cov/d' tox.ini
|
||||
'';
|
||||
|
||||
# django.core.exceptions.ImproperlyConfigured: Requested setting OAUTH2_PROVIDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
|
||||
doCheck = false;
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
jwcrypto
|
||||
oauthlib
|
||||
requests
|
||||
];
|
||||
|
||||
DJANGO_SETTINGS_MODULE = "tests.settings";
|
||||
|
||||
checkInputs = [
|
||||
djangorestframework
|
||||
pytest-django
|
||||
pytest-xdist
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Failed to get a valid response from authentication server. Status code: 404, Reason: Not Found.
|
||||
"test_response_when_auth_server_response_return_404"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OAuth2 goodies for the Djangonauts";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, django_environ, mock, django
|
||||
, django-environ, mock, django
|
||||
, pytest, pytest-runner, pytest-django
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
sha256 = "c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pytest-runner pytest-django django_environ mock ];
|
||||
checkInputs = [ pytest pytest-runner pytest-django django-environ mock ];
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,31 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, pytest
|
||||
, cryptography
|
||||
|
||||
# propagates
|
||||
, blinker
|
||||
, cryptography
|
||||
, pyjwt
|
||||
|
||||
# test
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oauthlib";
|
||||
version = "unstable-2020-05-08";
|
||||
version = "3.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
# master supports pyjwt==1.7.1
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "46647402896db5f0d979eba9594623e889739060";
|
||||
sha256 = "1wrdjdvlfcd74lckcgascnasrffg8sip0z673si4ag5kv4afiz3l";
|
||||
rev = "v${version}";
|
||||
hash = "sha256:1bgxpzh11i0x7h9py3a29cz5z714b3p498b62znnn5ciy0cr80sv";
|
||||
};
|
||||
|
||||
checkInputs = [ mock pytest ];
|
||||
propagatedBuildInputs = [ cryptography blinker pyjwt ];
|
||||
propagatedBuildInputs = [
|
||||
blinker
|
||||
cryptography
|
||||
pyjwt
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
py.test tests/
|
||||
'';
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/idan/oauthlib";
|
||||
|
|
|
@ -1,8 +1,18 @@
|
|||
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, scipy, ffmpeg-full }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# tests
|
||||
, ffmpeg-full
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydub";
|
||||
version = "0.25.1";
|
||||
format = "setuptools";
|
||||
|
||||
# pypi version doesn't include required data files for tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "jiaaro";
|
||||
|
@ -11,23 +21,24 @@ buildPythonPackage rec {
|
|||
sha256 = "0xskllq66wqndjfmvp58k26cv3w480sqsil6ifwp4gghir7hqc8m";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pydub"
|
||||
"pydub.audio_segment"
|
||||
"pydub.playback"
|
||||
];
|
||||
|
||||
# disable a test that fails on aarch64 due to rounding errors
|
||||
postPatch = lib.optionalString stdenv.isAarch64 ''
|
||||
substituteInPlace test/test.py \
|
||||
--replace "test_overlay_with_gain_change" "notest_overlay_with_gain_change"
|
||||
'';
|
||||
|
||||
checkInputs = [ scipy ffmpeg-full ];
|
||||
checkInputs = [
|
||||
ffmpeg-full
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
python test/test.py
|
||||
${python.interpreter} test/test.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manipulate audio with a simple and easy high level interface.";
|
||||
homepage = "http://pydub.com/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
description = "Manipulate audio with a simple and easy high level interface";
|
||||
homepage = "http://pydub.com";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -44,6 +44,7 @@ mapAliases ({
|
|||
diff_cover = diff-cover; # added 2021-07-02
|
||||
discogs_client = discogs-client; # added 2021-07-02
|
||||
djangorestframework-jwt = drf-jwt; # added 2021-07-20
|
||||
django_environ = django-environ; # added 2021-12-25
|
||||
django_redis = django-redis; # added 2021-10-11
|
||||
django_taggit = django-taggit; # added 2021-10-11
|
||||
dns = dnspython; # added 2017-12-10
|
||||
|
|
|
@ -2208,7 +2208,7 @@ in {
|
|||
|
||||
django-dynamic-preferences = callPackage ../development/python-modules/django-dynamic-preferences { };
|
||||
|
||||
django_environ = callPackage ../development/python-modules/django_environ { };
|
||||
django-environ = callPackage ../development/python-modules/django_environ { };
|
||||
|
||||
django_extensions = callPackage ../development/python-modules/django-extensions { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue