From a184c219fd2a2e28de1583f8aa683d06db7415ec Mon Sep 17 00:00:00 2001 From: "M. Zulqarnain" <muhammad.zulqarnain@arbisoft.com> Date: Wed, 26 Aug 2020 18:29:05 +0500 Subject: [PATCH] Use pytest-xdist[psutil] (#24845) --- requirements/edx/base.txt | 6 +++--- requirements/edx/development.txt | 12 ++++++------ requirements/edx/testing.in | 2 +- requirements/edx/testing.txt | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 1a2b9d631e5..fabb821b839 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -50,7 +50,7 @@ decorator==4.4.2 # via pycontracts defusedxml==0.6.0 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core django-appconf==1.0.4 # via -r requirements/edx/base.in, django-statici18n django-celery==3.3.1 # via -r requirements/edx/base.in, edx-bulk-grades -django-classy-tags==1.0.0 # via django-sekizai +django-classy-tags==2.0.0 # via django-sekizai django-config-models==2.0.2 # via -r requirements/edx/base.in, edx-enterprise django-cookies-samesite==0.6.6 # via -r requirements/edx/base.in django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in @@ -72,7 +72,7 @@ django-pyfs==2.2 # via -r requirements/edx/base.in git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a5#egg=django-ratelimit-backend==2.0.1a5 # via -r requirements/edx/github.in django-ratelimit==3.0.1 # via -r requirements/edx/base.in django-require==1.0.11 # via -r requirements/edx/base.in -django-sekizai==1.1.0 # via -r requirements/edx/base.in, django-wiki +django-sekizai==2.0.0 # via -r requirements/edx/base.in, django-wiki django-ses==0.8.14 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in django-simple-history==2.11.0 # via -r requirements/edx/base.in, edx-enterprise, edx-organizations, ora2 django-splash==0.2.9 # via -r requirements/edx/base.in @@ -216,7 +216,7 @@ scipy==1.4.1 # via -c requirements/edx/../constraints.txt, chem, op semantic-version==2.8.5 # via edx-drf-extensions shapely==1.7.1 # via -r requirements/edx/base.in simplejson==3.17.2 # via -r requirements/edx/base.in, sailthru-client, super-csv, xblock-utils -six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, chem, crowdsourcehinter-xblock, cryptography, django-classy-tags, django-countries, django-sekizai, django-simple-history, django-statici18n, django-wiki, drf-yasg, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, fs, fs-s3fs, help-tokens, html5lib, isodate, libsass, mock, openedx-calc, packaging, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock +six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, chem, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, django-statici18n, django-wiki, drf-yasg, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, fs, fs-s3fs, help-tokens, html5lib, isodate, libsass, mock, openedx-calc, packaging, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock slumber==0.7.1 # via edx-bulk-grades, edx-enterprise, edx-rest-api-client social-auth-app-django==4.0.0 # via -r requirements/edx/base.in social-auth-core==3.3.3 # via -r requirements/edx/base.in, social-auth-app-django diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 08c6016b5b2..e38d4ca9db3 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -60,7 +60,7 @@ diff-cover==3.0.1 # via -r requirements/edx/testing.txt distlib==0.3.1 # via -r requirements/edx/testing.txt, virtualenv django-appconf==1.0.4 # via -r requirements/edx/testing.txt, django-statici18n django-celery==3.3.1 # via -r requirements/edx/testing.txt, edx-bulk-grades -django-classy-tags==1.0.0 # via -r requirements/edx/testing.txt, django-sekizai +django-classy-tags==2.0.0 # via -r requirements/edx/testing.txt, django-sekizai django-config-models==2.0.2 # via -r requirements/edx/testing.txt, edx-enterprise django-cookies-samesite==0.6.6 # via -r requirements/edx/testing.txt django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt @@ -83,7 +83,7 @@ django-pyfs==2.2 # via -r requirements/edx/testing.txt git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a5#egg=django-ratelimit-backend==2.0.1a5 # via -r requirements/edx/testing.txt django-ratelimit==3.0.1 # via -r requirements/edx/testing.txt django-require==1.0.11 # via -r requirements/edx/testing.txt -django-sekizai==1.1.0 # via -r requirements/edx/testing.txt, django-wiki +django-sekizai==2.0.0 # via -r requirements/edx/testing.txt, django-wiki django-ses==0.8.14 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt django-simple-history==2.11.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-organizations, ora2 django-splash==0.2.9 # via -r requirements/edx/testing.txt @@ -211,7 +211,7 @@ pillow==7.2.0 # via -r requirements/edx/testing.txt, edx-enterprise, pip-tools==4.5.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/pip-tools.txt pluggy==0.13.1 # via -r requirements/edx/testing.txt, diff-cover, pytest, tox polib==1.1.0 # via -r requirements/edx/testing.txt, edx-i18n-tools -psutil==5.7.2 # via -r requirements/edx/testing.txt, edx-django-utils +psutil==5.7.2 # via -r requirements/edx/testing.txt, edx-django-utils, pytest-xdist py2neo==3.1.2 # via -r requirements/edx/testing.txt py==1.9.0 # via -r requirements/edx/testing.txt, pytest, pytest-forked, tox pycodestyle==2.6.0 # via -r requirements/edx/testing.txt @@ -239,7 +239,7 @@ pytest-forked==1.3.0 # via -r requirements/edx/testing.txt, pytest-xdist pytest-json-report==1.2.1 # via -r requirements/edx/testing.txt pytest-metadata==1.8.0 # via -r requirements/edx/testing.txt, pytest-json-report pytest-randomly==3.4.1 # via -r requirements/edx/testing.txt -pytest-xdist==2.1.0 # via -r requirements/edx/testing.txt +pytest-xdist[psutil]==2.1.0 # via -r requirements/edx/testing.txt pytest==6.0.1 # via -r requirements/edx/testing.txt, pytest-attrib, pytest-cov, pytest-django, pytest-forked, pytest-json-report, pytest-metadata, pytest-randomly, pytest-xdist python-dateutil==2.4.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, analytics-python, botocore, edx-ace, edx-drf-extensions, edx-enterprise, edx-proctoring, faker, freezegun, icalendar, ora2, xblock python-levenshtein==0.12.0 # via -r requirements/edx/testing.txt @@ -271,7 +271,7 @@ semantic-version==2.8.5 # via -r requirements/edx/testing.txt, edx-drf-extensi shapely==1.7.1 # via -r requirements/edx/testing.txt simplejson==3.17.2 # via -r requirements/edx/testing.txt, sailthru-client, super-csv, xblock-utils singledispatch==3.4.0.3 # via -r requirements/edx/testing.txt -six==1.15.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, chem, crowdsourcehinter-xblock, cryptography, diff-cover, django-classy-tags, django-countries, django-sekizai, django-simple-history, django-statici18n, django-wiki, drf-yasg, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, jsonschema, libsass, mock, openedx-calc, packaging, pathlib2, paver, pip-tools, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, sphinxcontrib-httpdomain, stevedore, tox, transifex-client, virtualenv, xblock +six==1.15.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, chem, crowdsourcehinter-xblock, cryptography, diff-cover, django-countries, django-simple-history, django-statici18n, django-wiki, drf-yasg, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, jsonschema, libsass, mock, openedx-calc, packaging, pathlib2, paver, pip-tools, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, sphinxcontrib-httpdomain, stevedore, tox, transifex-client, virtualenv, xblock slumber==0.7.1 # via -r requirements/edx/testing.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client smmap==3.0.4 # via -r requirements/edx/testing.txt, gitdb snowballstemmer==2.0.0 # via sphinx @@ -304,7 +304,7 @@ transifex-client==0.13.11 # via -r requirements/edx/testing.txt typed-ast==1.4.1 # via -r requirements/edx/testing.txt, astroid ua-parser==0.10.0 # via -r requirements/edx/testing.txt, django-cookies-samesite unicodecsv==0.14.1 # via -r requirements/edx/testing.txt, edx-enterprise -unidiff==0.6.0 # via -r requirements/edx/testing.txt, coverage-pytest-plugin +unidiff==0.6.0 # via -r requirements/edx/testing.txt uritemplate==3.0.1 # via -r requirements/edx/testing.txt, coreapi, drf-yasg urllib3==1.25.10 # via -r requirements/edx/testing.txt, elasticsearch, geoip2, requests, selenium, transifex-client user-util==0.2 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in index 0a1ecbf9989..90772028cd7 100644 --- a/requirements/edx/testing.in +++ b/requirements/edx/testing.in @@ -40,7 +40,7 @@ pytest-django # Django support for pytest pytest-json-report # Output json formatted warnings after running pytest pytest-metadata==1.8.0 # To prevent 'make upgrade' failure, dependency of pytest-json-report pytest-randomly # pytest plugin to randomly order tests -pytest-xdist # Parallel execution of tests on multiple CPU cores or hosts +pytest-xdist[psutil] # Parallel execution of tests on multiple CPU cores or hosts selenium # Browser automation library, used for acceptance tests singledispatch # Backport of functools.singledispatch from Python 3.4+, used in tests of XBlock rendering testfixtures # Provides a LogCapture utility used by several tests diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 95a1b6e459e..601aa1b5cdb 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -59,7 +59,7 @@ diff-cover==3.0.1 # via -r requirements/edx/coverage.txt distlib==0.3.1 # via virtualenv django-appconf==1.0.4 # via -r requirements/edx/base.txt, django-statici18n django-celery==3.3.1 # via -r requirements/edx/base.txt, edx-bulk-grades -django-classy-tags==1.0.0 # via -r requirements/edx/base.txt, django-sekizai +django-classy-tags==2.0.0 # via -r requirements/edx/base.txt, django-sekizai django-config-models==2.0.2 # via -r requirements/edx/base.txt, edx-enterprise django-cookies-samesite==0.6.6 # via -r requirements/edx/base.txt django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt @@ -81,7 +81,7 @@ django-pyfs==2.2 # via -r requirements/edx/base.txt git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a5#egg=django-ratelimit-backend==2.0.1a5 # via -r requirements/edx/base.txt django-ratelimit==3.0.1 # via -r requirements/edx/base.txt django-require==1.0.11 # via -r requirements/edx/base.txt -django-sekizai==1.1.0 # via -r requirements/edx/base.txt, django-wiki +django-sekizai==2.0.0 # via -r requirements/edx/base.txt, django-wiki django-ses==0.8.14 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt django-simple-history==2.11.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-organizations, ora2 django-splash==0.2.9 # via -r requirements/edx/base.txt @@ -202,7 +202,7 @@ piexif==1.1.3 # via -r requirements/edx/base.txt pillow==7.2.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-organizations pluggy==0.13.1 # via -r requirements/edx/coverage.txt, diff-cover, pytest, tox polib==1.1.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, edx-i18n-tools -psutil==5.7.2 # via -r requirements/edx/base.txt, edx-django-utils +psutil==5.7.2 # via -r requirements/edx/base.txt, edx-django-utils, pytest-xdist py2neo==3.1.2 # via -r requirements/edx/base.txt py==1.9.0 # via pytest, pytest-forked, tox pycodestyle==2.6.0 # via -r requirements/edx/testing.in @@ -229,7 +229,7 @@ pytest-forked==1.3.0 # via pytest-xdist pytest-json-report==1.2.1 # via -r requirements/edx/testing.in pytest-metadata==1.8.0 # via -r requirements/edx/testing.in, pytest-json-report pytest-randomly==3.4.1 # via -r requirements/edx/testing.in -pytest-xdist==2.1.0 # via -r requirements/edx/testing.in +pytest-xdist[psutil]==2.1.0 # via -r requirements/edx/testing.in pytest==6.0.1 # via -r requirements/edx/testing.in, pytest-attrib, pytest-cov, pytest-django, pytest-forked, pytest-json-report, pytest-metadata, pytest-randomly, pytest-xdist python-dateutil==2.4.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, analytics-python, botocore, edx-ace, edx-drf-extensions, edx-enterprise, edx-proctoring, faker, freezegun, icalendar, ora2, xblock python-levenshtein==0.12.0 # via -r requirements/edx/base.txt @@ -260,7 +260,7 @@ semantic-version==2.8.5 # via -r requirements/edx/base.txt, edx-drf-extensions shapely==1.7.1 # via -r requirements/edx/base.txt simplejson==3.17.2 # via -r requirements/edx/base.txt, sailthru-client, super-csv, xblock-utils singledispatch==3.4.0.3 # via -r requirements/edx/testing.in -six==1.15.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, chem, crowdsourcehinter-xblock, cryptography, diff-cover, django-classy-tags, django-countries, django-sekizai, django-simple-history, django-statici18n, django-wiki, drf-yasg, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, libsass, mock, openedx-calc, packaging, pathlib2, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, stevedore, tox, transifex-client, virtualenv, xblock +six==1.15.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, chem, crowdsourcehinter-xblock, cryptography, diff-cover, django-countries, django-simple-history, django-statici18n, django-wiki, drf-yasg, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, libsass, mock, openedx-calc, packaging, pathlib2, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, stevedore, tox, transifex-client, virtualenv, xblock slumber==0.7.1 # via -r requirements/edx/base.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client smmap==3.0.4 # via gitdb social-auth-app-django==4.0.0 # via -r requirements/edx/base.txt @@ -283,7 +283,7 @@ transifex-client==0.13.11 # via -r requirements/edx/testing.in typed-ast==1.4.1 # via astroid ua-parser==0.10.0 # via -r requirements/edx/base.txt, django-cookies-samesite unicodecsv==0.14.1 # via -r requirements/edx/base.txt, edx-enterprise -unidiff==0.6.0 # via -r requirements/edx/testing.in, coverage-pytest-plugin +unidiff==0.6.0 # via -r requirements/edx/testing.in uritemplate==3.0.1 # via -r requirements/edx/base.txt, coreapi, drf-yasg urllib3==1.25.10 # via -r requirements/edx/base.txt, elasticsearch, geoip2, requests, selenium, transifex-client user-util==0.2 # via -r requirements/edx/base.txt -- GitLab