diff --git a/README.rst b/README.rst index ca07818976aafde7f6575248feccbadcc3fc1b04..c72d41cf0b5d384644ddda3a9ced68eda82efe58 100644 --- a/README.rst +++ b/README.rst @@ -68,6 +68,14 @@ and committed to the git repo using: Changes to style rules should be made to the Sass files, compiled to CSS, and committed to the git repository. +Package Requirements +-------------------- + +setup.py contains a list of package dependencies which are required for this XBlock package. +This list is what is used to resolve dependencies when an upstream project is consuming +this XBlock package. requirements.txt is used to install the same dependencies when running +the tests for this package. + License ------- diff --git a/requirements.txt b/requirements.txt index b5f12f0f1cf0a7a9e43d5139a5116efc65926694..f9ec186b1faa196dfd50f4613da990bd297a1c2e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -lxml==3.4.4 -bleach==1.4.2 -oauthlib==1.0.3 -mako==1.0.2 -git+https://github.com/edx/XBlock.git@xblock-0.4.1#egg=XBlock==0.4.1 +lxml +bleach +oauthlib +mako +git+https://github.com/edx/XBlock.git#egg=XBlock git+https://github.com/edx/xblock-utils.git@v1.0.0#egg=xblock-utils==v1.0.0 -e . diff --git a/setup.py b/setup.py index 93a0dfd5360b74b7181843b33985c7d831d68f5f..52fca39327a4730f3f7775a4b2fcb7e3ca935591 100644 --- a/setup.py +++ b/setup.py @@ -28,12 +28,12 @@ setup( 'lti_consumer', ], install_requires=[ - 'lxml==3.4.4', - 'bleach==1.4.2', - 'oauthlib==1.0.3', - 'mako==1.0.2', - 'XBlock==0.4.1', - 'xblock-utils==v1.0.0', + 'lxml', + 'bleach', + 'oauthlib', + 'mako', + 'XBlock', + 'xblock-utils>=v1.0.0', ], dependency_links=[ 'https://github.com/edx/xblock-utils/tarball/c39bf653e4f27fb3798662ef64cde99f57603f79#egg=xblock-utils',