From 32a320acbd1a2d54360c99b207e4ebd6751ec15a Mon Sep 17 00:00:00 2001
From: Douglas Hall <dhall@edx.org>
Date: Tue, 1 Dec 2015 05:43:04 -0500
Subject: [PATCH] Do not pin dependency versions to avoid conflicts with
consuming projects
---
README.rst | 8 ++++++++
requirements.txt | 10 +++++-----
setup.py | 12 ++++++------
3 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/README.rst b/README.rst
index ca07818..c72d41c 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 b5f12f0..f9ec186 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 93a0dfd..52fca39 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',
--
GitLab