Merge branch 'dependencies-care-2' into 'develop'

Dependency care

See merge request funkwhale/funkwhale!1207

api/requirements/base.txt

@@ -1,80 +1,74 @@
-# Bleeding edge Django
+django~=3.0.8
-django>=3.0.8,<3.1
+setuptools>=49
-setuptools>=36
 # Configuration
-django-environ>=0.4,<0.5
+django-environ~=0.4
 
 # Images
-Pillow>=7,<8
+Pillow~=7.0
 
-# For user registration, either via email or social
+django-allauth~=0.42
-# Well-built with regular release cycles!
-django-allauth>=0.42,<0.43
 
-
+psycopg2-binary~=2.8
-# Python-PostgreSQL Database Adapter
-psycopg2-binary>=2.8,<=2.9
 
 # Time zones support
 pytz==2020.1
 
 # Redis support
-django-redis>=4.12.1,<4.13
+django-redis~=4.12
-redis>=3.5.3,<3.6
+redis~=3.5
-kombu>=4.6.11,<4.7
+kombu~=4.6
 
-celery>=4.4.6,<4.5
+celery~=4.4
 
 
 # Your custom requirements go here
-django-cors-headers>=3.4,<3.5
+django-cors-headers~=3.4
-musicbrainzngs>=0.7.1,<0.8
+musicbrainzngs~=0.7.1
-djangorestframework>=3.11,<3.12
+djangorestframework~=3.11
-djangorestframework-jwt>=1.11,<1.12
+djangorestframework-jwt~=1.11
-arrow>=0.15.5,<0.16
+arrow~=0.15.5
-persisting-theory>=0.2,<0.3
+persisting-theory~=0.2
-django-versatileimagefield>=2.0,<2.1
+django-versatileimagefield~=2.0
-django-filter>=2.3,<2.4
+django-filter~=2.3
-django-rest-auth>=0.9,<0.10
+django-rest-auth~=0.9
-ipython>=7.10,<8
+ipython~=7.10
-mutagen>=1.45,<1.46
+mutagen~=1.45
 
-pymemoize==1.0.3
+pymemoize~=1.0
 
-django-dynamic-preferences>=1.10,<1.11
+django-dynamic-preferences~=1.10
-raven>=6.10,<7
+raven~=6.10
-python-magic==0.4.18
+python-magic~=0.4
-channels>=2.4,<2.5
+channels~=2.4
-channels_redis>=3,<3.1
+channels_redis~=3.0
-uvicorn>=0.11.5,<0.12
+uvicorn~=0.11
-gunicorn>=20.0.4,<20.1
+gunicorn~=20.0
 
-cryptography>=2.8,<3
+cryptography~=2.9
 # requests-http-signature==0.0.3
 # clone until the branch is merged and released upstream
 git+https://github.com/EliotBerriot/requests-http-signature.git@signature-header-support
-django-cleanup>=5,<5.1
+django-cleanup~=5.0
-requests>=2.22<2.23
+requests~=2.24
-pyOpenSSL>=19<20
+pyOpenSSL~=19.1
 
 # for LDAP authentication
-python-ldap>=3.3.1,<3.4
+python-ldap~=3.3
-django-auth-ldap>=2.2.0,<2.3
+django-auth-ldap~=2.2
 
-pydub>=0.24.1,<0.25
+pydub~=0.24
-pyld>=1,<2
+pyld~=1.0
-aiohttp>=3.6,<3.7
+aiohttp~=3.6
-autobahn>=19.3.3
 
-django-oauth-toolkit>=1.3.2,<1.4
+django-oauth-toolkit~=1.3
-django-storages>=1.9.1,<1.10
+django-storages~=1.9
-boto3<3
+boto3~=1.14
-unicode-slugify==0.1.3
+unicode-slugify~=0.1
-django-cacheops>=5,<5.1
+django-cacheops~=5.0
 
-click>=7,<8
+click~=7.1
-service_identity==18.1.0
+service_identity~=18.1
-markdown>=3.2,<4
+markdown~=3.2
-bleach>=3,<4
+bleach~=3.1
 feedparser==6.0.0b3
-watchdog==0.10.2
+watchdog~=0.10

api/requirements/local.txt

@@ -1,20 +1,20 @@
 # Local development dependencies go here
 
-coverage>=4.5,<4.6
+coverage~=4.5
-django_coverage_plugin>=1.6,<1.7
+django_coverage_plugin~=1.6
-factory_boy>=2.11.1,<3
+factory_boy~=2.11
 
 # django-debug-toolbar that works with Django 1.5+
-django-debug-toolbar>=2.2,<2.3
+django-debug-toolbar~=2.2
 
 # improved REPL
-ipdb==0.11
+ipdb~=0.11
-prompt_toolkit<3
+prompt_toolkit~=2.0
 black
 #profiling
 
-asynctest==0.12.2
+asynctest~=0.12
-aioresponses==0.6.0
+aioresponses~=0.6
 #line_profiler<3
 #https://github.com/dmclain/django-debug-toolbar-line-profiler/archive/master.zip
 #django-silk

api/requirements/test.txt

@@ -1,13 +1,12 @@
 # Test dependencies go here.
 
-flake8
+flake8~=3.8
-pytest>=5,<5.3.3
+pytest~=6.0
-pytest-django>=3.5.1
+pytest-cov~=2.10
-pytest-mock
+pytest-django~=3.9
-pytest-sugar
+pytest-env~=0.6
-pytest-xdist
+pytest-mock~=3.2
-pytest-cov
+pytest-randomly~=3.4
-pytest-env
+pytest-sugar~=0.9
-requests-mock
+requests-mock~=1.8
-pytest-randomly
 #pytest-profiling<1.4