From c8ea2c5fde389e0a76212eace5f2160cdada9147 Mon Sep 17 00:00:00 2001 From: "M. Zulqarnain" Date: Thu, 13 Aug 2020 01:20:04 +0500 Subject: [PATCH] Unpin psutil (#24745) --- lms/djangoapps/instructor_task/subtasks.py | 4 ++-- requirements/edx/base.txt | 10 +++++----- requirements/edx/development.txt | 12 ++++++------ requirements/edx/github.in | 2 +- requirements/edx/paver.in | 2 +- requirements/edx/paver.txt | 2 +- requirements/edx/testing.txt | 12 ++++++------ 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lms/djangoapps/instructor_task/subtasks.py b/lms/djangoapps/instructor_task/subtasks.py index d3839ba3e8..0d1024dd06 100644 --- a/lms/djangoapps/instructor_task/subtasks.py +++ b/lms/djangoapps/instructor_task/subtasks.py @@ -57,11 +57,11 @@ def track_memory_usage(metric, course_id): """ memory_types = ['rss', 'vms'] process = psutil.Process() - baseline_memory_info = process.get_memory_info() + baseline_memory_info = process.memory_info() baseline_usages = [getattr(baseline_memory_info, memory_type) for memory_type in memory_types] yield for memory_type, baseline_usage in zip(memory_types, baseline_usages): - total_memory_info = process.get_memory_info() + total_memory_info = process.memory_info() total_usage = getattr(total_memory_info, memory_type) memory_used = total_usage - baseline_usage diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 0c6ca7ff2c..8aeda1bcdb 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -27,7 +27,7 @@ attrs==19.3.0 # via -r requirements/edx/base.in, edx-ace babel==2.8.0 # via -r requirements/edx/base.in, enmerkar, enmerkar-underscore beautifulsoup4==4.9.1 # via pynliner billiard==3.3.0.23 # via celery -bleach==3.1.5 # via -r requirements/edx/base.in, django-wiki, edx-enterprise, lti-consumer-xblock, ora2 +bleach==3.1.5 # via -r requirements/edx/base.in, django-wiki, edx-enterprise, lti-consumer-xblock, ora2, xblock-poll boto3==1.4.8 # via -r requirements/edx/base.in, fs-s3fs boto==2.39.0 # via -r requirements/edx/base.in, django-ses, edxval, ora2 botocore==1.8.17 # via -r requirements/edx/base.in, boto3, s3transfer @@ -97,7 +97,7 @@ edx-celeryutils==0.5.1 # via -r requirements/edx/base.in, super-csv edx-completion==3.2.4 # via -r requirements/edx/base.in edx-django-release-util==0.4.4 # via -r requirements/edx/base.in edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.in -edx-django-utils==3.7.2 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when +edx-django-utils==3.7.3 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.1.1 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval edx-enterprise==3.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in edx-i18n-tools==0.5.3 # via ora2 @@ -114,7 +114,7 @@ edx-submissions==3.1.12 # via -r requirements/edx/base.in, ora2 edx-tincan-py35==0.0.9 # via edx-enterprise edx-user-state-client==1.2.0 # via -r requirements/edx/base.in edx-when==1.3.0 # via -r requirements/edx/base.in, edx-proctoring -edxval==1.4.0 # via -r requirements/edx/base.in +edxval==1.4.1 # via -r requirements/edx/base.in elasticsearch==1.9.0 # via edx-search enmerkar-underscore==1.0.0 # via -r requirements/edx/base.in enmerkar==0.7.1 # via enmerkar-underscore @@ -176,7 +176,7 @@ pdfminer.six==20200726 # via -r requirements/edx/base.in piexif==1.1.3 # via -r requirements/edx/base.in pillow==7.2.0 # via -r requirements/edx/base.in, edx-enterprise, edx-organizations polib==1.1.0 # via edx-i18n-tools -psutil==1.2.1 # via -r requirements/edx/paver.txt, edx-django-utils +psutil==5.7.2 # via -r requirements/edx/paver.txt, edx-django-utils py2neo==3.1.2 # via -r requirements/edx/base.in pycontracts==1.8.12 # via -r requirements/edx/base.in, edx-user-state-client pycountry==20.7.3 # via -r requirements/edx/base.in @@ -243,7 +243,7 @@ webencodings==0.5.1 # via bleach, html5lib webob==1.8.6 # via xblock, xmodule wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-drag-and-drop-v2==2.2.10 # via -r requirements/edx/github.in -git+https://github.com/open-craft/xblock-poll@da2d8fd21791a7af128595cf82bee83ee579e00f#egg=xblock-poll==1.9.6 # via -r requirements/edx/github.in +git+https://github.com/open-craft/xblock-poll@1efd04bd6e16252a20e39a7516f9b69a000ace24#egg=xblock-poll==1.10.0 # via -r requirements/edx/github.in xblock-utils==2.1.1 # via -r requirements/edx/base.in, edx-sga, lti-consumer-xblock, staff-graded-xblock, xblock-drag-and-drop-v2, xblock-google-drive xblock==1.4.0 # via -r requirements/edx/base.in, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils xmlsec==1.3.8 # via python3-saml diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 2c98e3c213..edb0ea26ee 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -30,7 +30,7 @@ attrs==19.3.0 # via -r requirements/edx/testing.txt, edx-ace, jsonsc babel==2.8.0 # via -r requirements/edx/testing.txt, enmerkar, enmerkar-underscore, sphinx beautifulsoup4==4.9.1 # via -r requirements/edx/testing.txt, pynliner billiard==3.3.0.23 # via -r requirements/edx/testing.txt, celery -bleach==3.1.5 # via -r requirements/edx/testing.txt, django-wiki, edx-enterprise, lti-consumer-xblock, ora2 +bleach==3.1.5 # via -r requirements/edx/testing.txt, django-wiki, edx-enterprise, lti-consumer-xblock, ora2, xblock-poll bok-choy==1.1.1 # via -r requirements/edx/testing.txt boto3==1.4.8 # via -r requirements/edx/testing.txt, fs-s3fs boto==2.39.0 # via -r requirements/edx/testing.txt, django-ses, edxval, ora2 @@ -108,7 +108,7 @@ edx-celeryutils==0.5.1 # via -r requirements/edx/testing.txt, super-csv edx-completion==3.2.4 # via -r requirements/edx/testing.txt edx-django-release-util==0.4.4 # via -r requirements/edx/testing.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/testing.txt -edx-django-utils==3.7.2 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when +edx-django-utils==3.7.3 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.1.1 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval edx-enterprise==3.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/testing.txt, ora2 @@ -127,7 +127,7 @@ edx-submissions==3.1.12 # via -r requirements/edx/testing.txt, ora2 edx-tincan-py35==0.0.9 # via -r requirements/edx/testing.txt, edx-enterprise edx-user-state-client==1.2.0 # via -r requirements/edx/testing.txt edx-when==1.3.0 # via -r requirements/edx/testing.txt, edx-proctoring -edxval==1.4.0 # via -r requirements/edx/testing.txt +edxval==1.4.1 # via -r requirements/edx/testing.txt elasticsearch==1.9.0 # via -r requirements/edx/testing.txt, edx-search enmerkar-underscore==1.0.0 # via -r requirements/edx/testing.txt enmerkar==0.7.1 # via -r requirements/edx/testing.txt, enmerkar-underscore @@ -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==1.2.1 # via -r requirements/edx/testing.txt, edx-django-utils +psutil==5.7.2 # via -r requirements/edx/testing.txt, edx-django-utils 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 @@ -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 @@ -317,7 +317,7 @@ webencodings==0.5.1 # via -r requirements/edx/testing.txt, bleach, html5li webob==1.8.6 # via -r requirements/edx/testing.txt, xblock, xmodule wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, astroid git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-drag-and-drop-v2==2.2.10 # via -r requirements/edx/testing.txt -git+https://github.com/open-craft/xblock-poll@da2d8fd21791a7af128595cf82bee83ee579e00f#egg=xblock-poll==1.9.6 # via -r requirements/edx/testing.txt +git+https://github.com/open-craft/xblock-poll@1efd04bd6e16252a20e39a7516f9b69a000ace24#egg=xblock-poll==1.10.0 # via -r requirements/edx/testing.txt xblock-utils==2.1.1 # via -r requirements/edx/testing.txt, edx-sga, lti-consumer-xblock, staff-graded-xblock, xblock-drag-and-drop-v2, xblock-google-drive xblock==1.4.0 # via -r requirements/edx/testing.txt, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils xmlsec==1.3.8 # via -r requirements/edx/testing.txt, python3-saml diff --git a/requirements/edx/github.in b/requirements/edx/github.in index aff982b397..0c41689914 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -72,5 +72,5 @@ git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a5#egg=django-rate # Third Party XBlocks -git+https://github.com/open-craft/xblock-poll@da2d8fd21791a7af128595cf82bee83ee579e00f#egg=xblock-poll==1.9.6 +git+https://github.com/open-craft/xblock-poll@1efd04bd6e16252a20e39a7516f9b69a000ace24#egg=xblock-poll==1.10.0 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-drag-and-drop-v2==2.2.10 diff --git a/requirements/edx/paver.in b/requirements/edx/paver.in index a5f1aa37ee..c5e80916e9 100644 --- a/requirements/edx/paver.in +++ b/requirements/edx/paver.in @@ -17,7 +17,7 @@ markupsafe # XML/HTML/XHTML Markup safe strings mock # Stub out code with mock objects and make assertions about how they have been used path # Easier manipulation of filesystem paths paver # Build, distribution and deployment scripting tool -psutil==1.2.1 # Library for retrieving information on running processes and system utilization +psutil # Library for retrieving information on running processes and system utilization pymongo # via edx-opaque-keys python-memcached # Python interface to the memcached memory cache daemon requests # Simple interface for making HTTP requests diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 93dd278843..21b4b430cb 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -18,7 +18,7 @@ path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requi pathtools==0.1.2 # via watchdog paver==1.3.4 # via -r requirements/edx/paver.in pbr==5.4.5 # via stevedore -psutil==1.2.1 # via -r requirements/edx/paver.in +psutil==5.7.2 # via -r requirements/edx/paver.in pymongo==3.10.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in, edx-opaque-keys python-memcached==1.59 # via -r requirements/edx/paver.in requests==2.24.0 # via -r requirements/edx/paver.in diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 87b3d883da..a9a18a4d8d 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -29,7 +29,7 @@ attrs==19.3.0 # via -r requirements/edx/base.txt, edx-ace, pytest babel==2.8.0 # via -r requirements/edx/base.txt, enmerkar, enmerkar-underscore beautifulsoup4==4.9.1 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, pynliner billiard==3.3.0.23 # via -r requirements/edx/base.txt, celery -bleach==3.1.5 # via -r requirements/edx/base.txt, django-wiki, edx-enterprise, lti-consumer-xblock, ora2 +bleach==3.1.5 # via -r requirements/edx/base.txt, django-wiki, edx-enterprise, lti-consumer-xblock, ora2, xblock-poll bok-choy==1.1.1 # via -r requirements/edx/testing.in boto3==1.4.8 # via -r requirements/edx/base.txt, fs-s3fs boto==2.39.0 # via -r requirements/edx/base.txt, django-ses, edxval, ora2 @@ -105,7 +105,7 @@ edx-celeryutils==0.5.1 # via -r requirements/edx/base.txt, super-csv edx-completion==3.2.4 # via -r requirements/edx/base.txt edx-django-release-util==0.4.4 # via -r requirements/edx/base.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.txt -edx-django-utils==3.7.2 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when +edx-django-utils==3.7.3 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.1.1 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval edx-enterprise==3.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2 @@ -123,7 +123,7 @@ edx-submissions==3.1.12 # via -r requirements/edx/base.txt, ora2 edx-tincan-py35==0.0.9 # via -r requirements/edx/base.txt, edx-enterprise edx-user-state-client==1.2.0 # via -r requirements/edx/base.txt edx-when==1.3.0 # via -r requirements/edx/base.txt, edx-proctoring -edxval==1.4.0 # via -r requirements/edx/base.txt +edxval==1.4.1 # via -r requirements/edx/base.txt elasticsearch==1.9.0 # via -r requirements/edx/base.txt, edx-search enmerkar-underscore==1.0.0 # via -r requirements/edx/base.txt enmerkar==0.7.1 # via -r requirements/edx/base.txt, enmerkar-underscore @@ -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==1.2.1 # via -r requirements/edx/base.txt, edx-django-utils +psutil==5.7.2 # via -r requirements/edx/base.txt, edx-django-utils 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 @@ -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 @@ -295,7 +295,7 @@ webencodings==0.5.1 # via -r requirements/edx/base.txt, bleach, html5lib webob==1.8.6 # via -r requirements/edx/base.txt, xblock, xmodule wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, astroid git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-drag-and-drop-v2==2.2.10 # via -r requirements/edx/base.txt -git+https://github.com/open-craft/xblock-poll@da2d8fd21791a7af128595cf82bee83ee579e00f#egg=xblock-poll==1.9.6 # via -r requirements/edx/base.txt +git+https://github.com/open-craft/xblock-poll@1efd04bd6e16252a20e39a7516f9b69a000ace24#egg=xblock-poll==1.10.0 # via -r requirements/edx/base.txt xblock-utils==2.1.1 # via -r requirements/edx/base.txt, edx-sga, lti-consumer-xblock, staff-graded-xblock, xblock-drag-and-drop-v2, xblock-google-drive xblock==1.4.0 # via -r requirements/edx/base.txt, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils xmlsec==1.3.8 # via -r requirements/edx/base.txt, python3-saml