diff --git a/requirements/constraints.txt b/requirements/constraints.txt index ee5dc4ddb8..ec325e4998 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -11,3 +11,25 @@ # six is at 1.12.0, but transifex-client requires ==1.11.0 # https://github.com/transifex/transifex-client/issues/252 six==1.11.0 + +# version 2.6.0 changes the data model, which results in a failure in common.djangoapps.util.tests.test_db.MigrationTests.test_migrations_are_in_sync +django-simple-history==2.5.1 + +# Convert text markup to HTML; used in capa problems, forums, and course wikis; pin Markdown version as tests failed for its upgrade to latest release +Markdown==2.6.11 + +# required by edx-lint and pinned explicitly here because newer versions don't guarantee python 2 support. +# Can be removed when we get to Python 3. +pylint-plugin-utils==0.3 + +# Testing framework # Pinned due to https://github.com/pytest-dev/pytest/issues/3749 +pytest==3.6.3 + +# pytest plugin for measuring code coverage. # Pinned due to https://openedx.atlassian.net/browse/TE-2731 +pytest-cov<2.6 + +# Browser driver used by lettuce - pinned because splinter==0.10.0 breaks lettuce tests. EDUCATOR-3795 +splinter==0.9.0 + +# transifex-client 0.13.5 requires urllib3<1.24, but requests will pull in urllib3==1.24 (https://github.com/transifex/transifex-client/pull/241/files) +urllib3<1.24 diff --git a/requirements/edx/base.in b/requirements/edx/base.in index bf0d6d6601..e36a17747f 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -101,7 +101,7 @@ ipaddr==2.1.11 # Ip network support for Embargo feature jsonfield # Django model field for validated JSON; used in several apps mailsnake==1.6.2 # Needed for mailchimp (mailing djangoapp) mako==1.0.2 # Primary template language used for server-side page rendering -Markdown==2.6.11 # Convert text markup to HTML; used in capa problems, forums, and course wikis; pin Markdown version as tests failed for its upgrade to latest release +Markdown # Convert text markup to HTML; used in capa problems, forums, and course wikis mongoengine==0.10.0 # Object-document mapper for MongoDB, used in the LMS dashboard MySQL-python # Driver for the default production relational database newrelic # New Relic agent for performance monitoring diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 3b3c02c61e..5989d2497f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -270,7 +270,7 @@ pytest-cov==2.5.1 pytest-django==3.1.2 pytest-forked==0.2 pytest-randomly==1.2.3 -pytest-xdist==1.24.1 +pytest-xdist==1.25.0 pytest==3.6.3 python-dateutil==2.4.0 python-levenshtein==0.12.0 @@ -325,7 +325,7 @@ text-unidecode==1.2 tincan==0.0.5 toml==0.10.0 tox-battery==0.5.1 -tox==3.5.3 +tox==3.6.0 traceback2==1.4.0 transifex-client==0.13.5 twisted==16.6.0 diff --git a/requirements/edx/paver.in b/requirements/edx/paver.in index a051ed3173..85b0656b3c 100644 --- a/requirements/edx/paver.in +++ b/requirements/edx/paver.in @@ -21,7 +21,6 @@ psutil==1.2.1 # Library for retrieving information on runn pymongo==2.9.1 # via edx-opaque-keys python-memcached==1.48 # Python interface to the memcached memory cache daemon requests # Simple interface for making HTTP requests -urllib3<1.24 # transifex-client 0.13.5 requires urllib3<1.24, but requests will pull in urllib3==1.24 (https://github.com/transifex/transifex-client/pull/241/files) stevedore==1.10.0 # via edx-opaque-keys watchdog # Used in paver watch_assets wrapt==1.10.5 # Decorator utilities used in the @timed paver task decorator diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 0555710508..f0d2c0689c 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -25,6 +25,6 @@ pyyaml==3.13 # via watchdog requests==2.21.0 six==1.11.0 # via edx-opaque-keys, libsass, paver, stevedore stevedore==1.10.0 -urllib3==1.23 +urllib3==1.23 # via requests watchdog==0.9.0 wrapt==1.10.5 diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in index cb4ffb8d83..9834405ee3 100644 --- a/requirements/edx/testing.in +++ b/requirements/edx/testing.in @@ -24,8 +24,6 @@ cssselect # Used to extract HTML fragments via CSS selectors in ddt # Run a test case multiple times with different input; used in many, many of our tests edx-i18n-tools>=0.4.6 # Commands for developers and translators to extract, compile and validate translations edx-lint==0.6.0 # pylint extensions for Open edX repositories -pylint-plugin-utils==0.3 # required by edx-lint and pinned explicitly here because newer versions don't guarantee python 2 support. - # can be removed when we get to python 3 factory_boy==2.8.1 # Library for creating test fixtures, used in many tests freezegun # Allows tests to mock the output of assorted datetime module functions httpretty # Library for mocking HTTP requests, used in many tests @@ -36,16 +34,16 @@ pycodestyle # Checker for compliance with the Python style guide ( polib # Library for manipulating gettext translation files, used to test paver i18n commands pyquery # jQuery-like API for retrieving fragments of HTML and XML files in tests pysqlite # DB-API 2.0 interface for SQLite 3.x (used as the relational database for most tests) -pytest==3.6.3 # Testing framework # Pinned due to https://github.com/pytest-dev/pytest/issues/3749 +pytest # Testing framework pytest-attrib # Select tests based on attributes -pytest-cov<2.6 # pytest plugin for measuring code coverage. # Pinned due to https://openedx.atlassian.net/browse/TE-2731 +pytest-cov # pytest plugin for measuring code coverage. pytest-django==3.1.2 # Django support for pytest pytest-randomly # pytest plugin to randomly order tests pytest-xdist # Parallel execution of tests on multiple CPU cores or hosts radon # Calculates cyclomatic complexity of Python code (code quality utility) selenium # Browser automation library, used for acceptance tests singledispatch # Backport of functools.singledispatch from Python 3.4+, used in tests of XBlock rendering -splinter==0.9.0 # Browser driver used by lettuce - pinned because splinter==0.10.0 breaks lettuce tests. EDUCATOR-3795 +splinter # Browser driver used by lettuce testfixtures # Provides a LogCapture utility used by several tests tox # virtualenv management for tests tox-battery # Makes tox aware of requirements file changes diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 7269ae2e00..636be8d449 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -245,7 +245,7 @@ pyjwkest==1.3.2 pyjwt==1.5.2 pylint-celery==0.3 # via edx-lint pylint-django==0.7.2 # via edx-lint -pylint-plugin-utils==0.3 +pylint-plugin-utils==0.3 # via pylint-celery, pylint-django pylint==1.7.6 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils pymongo==2.9.1 pynliner==0.8.0 @@ -259,7 +259,7 @@ pytest-cov==2.5.1 pytest-django==3.1.2 pytest-forked==0.2 # via pytest-xdist pytest-randomly==1.2.3 -pytest-xdist==1.24.1 +pytest-xdist==1.25.0 pytest==3.6.3 python-dateutil==2.4.0 python-levenshtein==0.12.0 @@ -310,7 +310,7 @@ text-unidecode==1.2 # via faker tincan==0.0.5 toml==0.10.0 # via tox tox-battery==0.5.1 -tox==3.5.3 +tox==3.6.0 traceback2==1.4.0 # via testtools, unittest2 transifex-client==0.13.5 twisted==16.6.0 # via pa11ycrawler, scrapy