Merge pull request #6885 from readthedocs/update-requirements

Update requirements

Author: stsewd

readthedocs/rtd_tests/tests/test_api.py

@@ -344,15 +344,15 @@ def _try_post():
 
         _try_post()
 
-        api_user = get(User, staff=False, password='test')
+        api_user = get(User, is_staff=False, password='test')
         assert api_user.is_staff is False
         client.force_authenticate(user=api_user)
         _try_post()
 
     def test_update_build_without_permission(self):
         """Ensure anonymous/non-staff users cannot update build endpoints."""
         client = APIClient()
-        api_user = get(User, staff=False, password='test')
+        api_user = get(User, is_staff=False, password='test')
         client.force_authenticate(user=api_user)
         build = get(Build, project_id=1, version_id=1, state='cloning')
         resp = client.put(
@@ -376,7 +376,7 @@ def test_make_build_protected_fields(self):
         build = get(Build, project_id=1, version_id=1, builder='foo')
         client = APIClient()
 
-        api_user = get(User, staff=False, password='test')
+        api_user = get(User, is_staff=False, password='test')
         client.force_authenticate(user=api_user)
         resp = client.get('/api/v2/build/{}/'.format(build.pk), format='json')
         self.assertEqual(resp.status_code, 200)
@@ -438,7 +438,7 @@ def test_get_raw_log_success(self):
         )
         client = APIClient()
 
-        api_user = get(User, user='test', password='test')
+        api_user = get(User)
         client.force_authenticate(user=api_user)
         resp = client.get('/api/v2/build/{}.txt'.format(build.pk))
         self.assertEqual(resp.status_code, 200)
@@ -482,7 +482,7 @@ def test_get_raw_log_building(self):
         )
         client = APIClient()
 
-        api_user = get(User, user='test', password='test')
+        api_user = get(User)
         client.force_authenticate(user=api_user)
         resp = client.get('/api/v2/build/{}.txt'.format(build.pk))
         self.assertEqual(resp.status_code, 200)
@@ -525,7 +525,7 @@ def test_get_raw_log_failure(self):
         )
         client = APIClient()
 
-        api_user = get(User, user='test', password='test')
+        api_user = get(User)
         client.force_authenticate(user=api_user)
         resp = client.get('/api/v2/build/{}.txt'.format(build.pk))
         self.assertEqual(resp.status_code, 200)
@@ -551,7 +551,7 @@ def test_get_raw_log_failure(self):
     def test_get_invalid_raw_log(self):
         client = APIClient()
 
-        api_user = get(User, user='test', password='test')
+        api_user = get(User)
         client.force_authenticate(user=api_user)
         resp = client.get('/api/v2/build/{}.txt'.format(404))
         self.assertEqual(resp.status_code, status.HTTP_404_NOT_FOUND)
@@ -565,7 +565,7 @@ def test_build_filter_by_commit(self):
         get(Build, project_id=1, version_id=1, builder='foo', commit='test')
         get(Build, project_id=2, version_id=1, builder='foo', commit='other')
         client = APIClient()
-        api_user = get(User, staff=False, password='test')
+        api_user = get(User, is_staff=False, password='test')
         client.force_authenticate(user=api_user)
         resp = client.get('/api/v2/build/', {'commit': 'test'}, format='json')
         self.assertEqual(resp.status_code, 200)

readthedocs/rtd_tests/tests/test_builds.py

@@ -416,19 +416,19 @@ def test_get_previous_build(self):
             Build,
             project=self.project,
             version=self.version,
-            config={'version': 1},
+            _config={'version': 1},
         )
         build_two = get(
             Build,
             project=self.project,
             version=self.version,
-            config={'version': 2},
+            _config={'version': 2},
         )
         build_three = get(
             Build,
             project=self.project,
             version=self.version,
-            config={'version': 3},
+            _config={'version': 3},
             success=False,
         )
 
@@ -631,7 +631,7 @@ def test_build_is_external(self):
             Build,
             project=self.project,
             version=self.version,
-            config={'version': 1},
+            _config={'version': 1},
         )
 
         self.assertTrue(external_build.is_external)
@@ -641,7 +641,7 @@ def test_build_is_not_external(self):
             Build,
             project=self.project,
             version=self.version,
-            config={'version': 1},
+            _config={'version': 1},
         )
 
         self.assertFalse(build.is_external)
@@ -651,7 +651,7 @@ def test_no_external_version_name(self):
             Build,
             project=self.project,
             version=self.version,
-            config={'version': 1},
+            _config={'version': 1},
         )
 
         self.assertEqual(build.external_version_name, None)
@@ -693,7 +693,7 @@ def test_external_version_name_generic(self):
             Build,
             project=self.project,
             version=self.version,
-            config={'version': 1},
+            _config={'version': 1},
         )
 
         self.assertEqual(
@@ -709,7 +709,7 @@ def test_get_commit_url_external_version_github(self):
             Build,
             project=self.pip,
             version=self.external_version,
-            config={'version': 1},
+            _config={'version': 1},
         )
         expected_url = 'https://github.com/pypa/pip/pull/{number}/commits/{sha}'.format(
             number=self.external_version.verbose_name,
@@ -725,7 +725,7 @@ def test_get_commit_url_external_version_gitlab(self):
             Build,
             project=self.pip,
             version=self.external_version,
-            config={'version': 1},
+            _config={'version': 1},
         )
         expected_url = (
             'https://gitlab.com/pypa/pip/commit/'
@@ -741,7 +741,7 @@ def test_get_commit_url_internal_version(self):
             Build,
             project=self.pip,
             version=self.pip_version,
-            config={'version': 1},
+            _config={'version': 1},
         )
         expected_url = 'https://github.com/pypa/pip/commit/{sha}'.format(
             sha=build.commit

readthedocs/rtd_tests/tests/test_middleware.py

@@ -171,13 +171,13 @@ def setUp(self):
         self.project = get(
             Project, slug='pip',
             users=[self.owner], privacy_level='public',
-            mail_language_project=None,
+            main_language_project=None,
         )
         self.subproject = get(
             Project,
             users=[self.owner],
             privacy_level='public',
-            mail_language_project=None,
+            main_language_project=None,
         )
         self.relationship = get(
             ProjectRelationship,

readthedocs/rtd_tests/tests/test_privacy_urls.py

@@ -162,7 +162,7 @@ def setUp(self):
             response_headers='{"foo": "bar"}',
             status_code=200,
         )
-        self.domain = get(Domain, url='http://docs.foobar.com', project=self.pip)
+        self.domain = get(Domain, domain='docs.foobar.com', project=self.pip)
         self.environment_variable = get(EnvironmentVariable, project=self.pip)
         self.automation_rule = RegexAutomationRule.objects.create(
             project=self.pip,
@@ -349,8 +349,8 @@ class APIMixin(URLAccessMixin):
     def setUp(self):
         super().setUp()
         self.build = get(Build, project=self.pip)
-        self.build_command_result = get(BuildCommandResult, project=self.pip)
-        self.domain = get(Domain, url='http://docs.foobar.com', project=self.pip)
+        self.build_command_result = get(BuildCommandResult, build=self.build)
+        self.domain = get(Domain, domain='docs.foobar.com', project=self.pip)
         self.social_account = get(SocialAccount)
         self.remote_org = get(RemoteOrganization)
         self.remote_repo = get(RemoteRepository, organization=self.remote_org)

readthedocs/rtd_tests/tests/test_project_symlinks.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 import shutil
 import tempfile
@@ -147,7 +145,7 @@ def setUp(self):
     def test_symlink_cname(self):
         self.domain = get(
             Domain, project=self.project, domain='woot.com',
-            url='http://woot.com', cname=True,
+            cname=True,
         )
         self.symlink.symlink_cnames()
         filesystem = {
@@ -181,7 +179,7 @@ def test_symlink_cname(self):
     def test_symlink_remove_orphan_symlinks(self):
         self.domain = get(
             Domain, project=self.project, domain='woot.com',
-            url='http://woot.com', cname=True,
+            cname=True,
         )
         self.symlink.symlink_cnames()
 
@@ -267,7 +265,7 @@ def test_symlink_cname_dont_link_missing_domains(self):
         """Domains should be relinked after deletion."""
         self.domain = get(
             Domain, project=self.project, domain='woot.com',
-            url='http://woot.com', cname=True,
+            cname=True,
         )
         self.symlink.symlink_cnames()
         filesystem = {

readthedocs/rtd_tests/tests/test_version_config.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.test import TestCase
 from django_dynamic_fixture import get
 
@@ -16,23 +15,23 @@ def test_get_correct_config(self):
         build_old = Build.objects.create(
             project=self.project,
             version=self.version,
-            config={'version': 1},
+            _config={'version': 1},
         )
         build_new = Build.objects.create(
             project=self.project,
             version=self.version,
-            config={'version': 2},
+            _config={'version': 2},
         )
         build_new_error = Build.objects.create(
             project=self.project,
             version=self.version,
-            config={'version': 3},
+            _config={'version': 3},
             success=False,
         )
         build_new_unfinish = Build.objects.create(
             project=self.project,
             version=self.version,
-            config={'version': 4},
+            _config={'version': 4},
             state='building',
         )
         self.assertEqual(self.version.config, {'version': 2})
@@ -42,7 +41,7 @@ def test_get_correct_config_when_same_config(self):
             Build,
             project=self.project,
             version=self.version,
-            config={},
+            _config={},
         )
         build_old.config = {'version': 1}
         build_old.save()
@@ -51,7 +50,7 @@ def test_get_correct_config_when_same_config(self):
             Build,
             project=self.project,
             version=self.version,
-            config={},
+            _config={},
         )
         build_new.config = {'version': 1}
         build_new.save()
@@ -60,7 +59,7 @@ def test_get_correct_config_when_same_config(self):
             Build,
             project=self.project,
             version=self.version,
-            config={},
+            _config={},
             success=False,
         )
         build_new_error.config = {'version': 3}
@@ -70,7 +69,7 @@ def test_get_correct_config_when_same_config(self):
             Build,
             project=self.project,
             version=self.version,
-            config={},
+            _config={},
             state='building',
         )
         build_new_unfinish.config = {'version': 1}

requirements/local-docs-build.txt

@@ -20,10 +20,10 @@ git+https://github.com/agjohnson/sphinx-intl.git@7b5c66bdb30f872b3b1286e371f569c
 git+https://github.com/readthedocs/readthedocs-sphinx-search@master
 
 
-Pygments==2.4.2
+Pygments==2.6.1
 
-mkdocs==1.0.4
-Markdown==3.1.1
+mkdocs==1.1
+Markdown==3.2.1
 
 # Docs
 sphinxcontrib-httpdomain==1.7.0

requirements/pip.txt

@@ -1,10 +1,10 @@
 # Base packages
-pip==19.3.1
+pip==20.0.2
 appdirs==1.4.3
-virtualenv==16.7.7
+virtualenv==20.0.16
 
-django==2.2.11  # pyup: <2.3
-django-extensions==2.2.5
+django==2.2.12  # pyup: <2.3
+django-extensions==2.2.9
 django_polymorphic==2.1.2
 
 djangorestframework==3.10.3
@@ -23,11 +23,11 @@ drf-extensions==0.5.0
 django-vanilla-views==1.0.6
 jsonfield==2.0.2
 
-requests==2.22.0
+requests==2.23.0
 requests-toolbelt==0.9.1
 slumber==0.7.1
-pyyaml==5.1.2
-Pygments==2.4.2
+pyyaml==5.3.1
+Pygments==2.6.1
 
 # Basic tools
 # Redis 3.x has an incompatible change and fails
@@ -69,12 +69,12 @@ selectolax==0.2.1
 orjson==2.0.7  # pyup: ignore
 
 # Utils
-django-gravatar2==1.4.2
+django-gravatar2==1.4.4
 pytz==2019.3
 Unipath==1.1
 django-kombu==0.9.4
-stripe==2.38.0
-regex==2019.11.1
+stripe==2.44.0
+regex==2020.4.4
 
 # unicode-slugify==0.1.5 is not released on PyPI yet
 git+https://github.com/mozilla/unicode-slugify@b696c37#egg=unicode-slugify==0.1.5
@@ -91,8 +91,7 @@ nltk==3.4.5
 textblob==0.15.3
 
 django-annoying==0.10.5
-# Messages-extends needs a fix for Django 2.2 which isn't released (0.6.1 isn't out yet)
-git+https://github.com/AliLozano/django-messages-extends.git@5e1cd27#egg=django-messages-extends==0.6.1-dev1
+django-messages-extends==0.6.2 
 djangorestframework-jsonp==1.0.2
 django-taggit==1.1.0
 dj-pagination==2.4.0
@@ -104,7 +103,7 @@ packaging==19.2
 django-cors-middleware==1.4.0
 
 # User agent parsing - used for analytics purposes
-user-agents==2.0
+user-agents==2.1
 
 # Utilities used to upload build media to cloud storage
 # django-storages is pinned to this particular commit because it
@@ -113,7 +112,7 @@ user-agents==2.0
 git+https://github.com/jschneier/django-storages@d0f027c98a877f75615cfc42b4d51c038fa41bf6#egg=django-storages[azure]==1.9.1
 
 # Required only in development and linting
-django-debug-toolbar==2.0
+django-debug-toolbar==2.2
 
 # For enabling content-security-policy
 django-csp==3.6

requirements/testing.txt

@@ -23,4 +23,4 @@ pytest-mock==1.11.2
 
 # local debugging tools
 datadiff==2.0.0
-ipdb==0.12.2
+ipdb==0.13.2