Merge pull request #24 from edx/jawayria/fix-upgrade-workflow

fix: Resolve the pip and pip-tools version conflict

Author: Jawayria

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 dist: xenial # required for Python >= 3.7 (travis-ci/travis-ci#9069)
 python:
-- 3.5
 - 3.8
 install:
 - pip install -r requirements/travis.txt

Makefile

@@ -1,6 +1,8 @@
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
+	pip install -r requirements/pip.txt
 	pip install -q -r requirements/pip_tools.txt
+	pip-compile --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
 	pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
 	pip-compile --upgrade -o requirements/base.txt requirements/base.in
 	pip-compile --upgrade -o requirements/test.txt requirements/test.in

requirements/base.txt

@@ -4,21 +4,36 @@
 #
 #    make upgrade
 #
-appdirs==1.4.4            # via fs
-bleach==3.1.5             # via -r requirements/base.in
-boto==2.49.0              # via -r requirements/base.in
-fs==2.4.11                # via -r requirements/base.in
-mako==1.1.3               # via -r requirements/base.in
-markupsafe==1.1.1         # via mako
-packaging==20.4           # via bleach
-pyparsing==2.4.7          # via packaging
-pytz==2020.1              # via fs
-simplejson==3.17.0        # via -r requirements/base.in
-six==1.15.0               # via bleach, fs, packaging
-typing==3.7.4.1           # via fs
-web-fragments==0.3.2      # via -r requirements/base.in
-webencodings==0.5.1       # via bleach
-webob==1.8.6              # via -r requirements/base.in
+appdirs==1.4.4
+    # via fs
+bleach==3.3.0
+    # via -r requirements/base.in
+boto==2.49.0
+    # via -r requirements/base.in
+fs==2.4.13
+    # via -r requirements/base.in
+mako==1.1.4
+    # via -r requirements/base.in
+markupsafe==2.0.1
+    # via mako
+packaging==20.9
+    # via bleach
+pyparsing==2.4.7
+    # via packaging
+pytz==2021.1
+    # via fs
+simplejson==3.17.2
+    # via -r requirements/base.in
+six==1.16.0
+    # via
+    #   bleach
+    #   fs
+web-fragments==1.0.0
+    # via -r requirements/base.in
+webencodings==0.5.1
+    # via bleach
+webob==1.8.7
+    # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/constraints.txt

@@ -7,3 +7,4 @@
 # link to other information that will help people in the future to remove the
 # pin when possible.  Writing an issue against the offending project and
 # linking to it here is good.
+

requirements/pip.in

@@ -0,0 +1,5 @@
+# Core dependencies for installing other packages
+
+pip
+setuptools
+wheel

requirements/pip.txt

@@ -0,0 +1,14 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    make upgrade
+#
+wheel==0.36.2
+    # via -r requirements/pip.in
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==20.3.4
+    # via -r requirements/pip.in
+setuptools==50.3.2
+    # via -r requirements/pip.in

requirements/pip_tools.txt

@@ -4,9 +4,14 @@
 #
 #    make upgrade
 #
-click==7.1.2              # via pip-tools
-pip-tools==5.2.1          # via -r requirements/pip_tools.in
-six==1.15.0               # via pip-tools
+click==8.0.1
+    # via pip-tools
+pep517==0.10.0
+    # via pip-tools
+pip-tools==6.1.0
+    # via -r requirements/pip_tools.in
+toml==0.10.2
+    # via pep517
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

requirements/test.txt

@@ -4,22 +4,51 @@
 #
 #    make upgrade
 #
-appdirs==1.4.4            # via -r requirements/base.txt, fs
-bleach==3.1.5             # via -r requirements/base.txt
-boto==2.49.0              # via -r requirements/base.txt
-fs==2.4.11                # via -r requirements/base.txt
-mako==1.1.3               # via -r requirements/base.txt
-markupsafe==1.1.1         # via -r requirements/base.txt, mako
-packaging==20.4           # via -r requirements/base.txt, bleach
-pycodestyle==2.6.0        # via -r requirements/test.in
-pyparsing==2.4.7          # via -r requirements/base.txt, packaging
-pytz==2020.1              # via -r requirements/base.txt, fs
-simplejson==3.17.0        # via -r requirements/base.txt
-six==1.15.0               # via -r requirements/base.txt, bleach, fs, packaging
-typing==3.7.4.1           # via -r requirements/base.txt, fs
-web-fragments==0.3.2      # via -r requirements/base.txt
-webencodings==0.5.1       # via -r requirements/base.txt, bleach
-webob==1.8.6              # via -r requirements/base.txt
+appdirs==1.4.4
+    # via
+    #   -r requirements/base.txt
+    #   fs
+bleach==3.3.0
+    # via -r requirements/base.txt
+boto==2.49.0
+    # via -r requirements/base.txt
+fs==2.4.13
+    # via -r requirements/base.txt
+mako==1.1.4
+    # via -r requirements/base.txt
+markupsafe==2.0.1
+    # via
+    #   -r requirements/base.txt
+    #   mako
+packaging==20.9
+    # via
+    #   -r requirements/base.txt
+    #   bleach
+pycodestyle==2.7.0
+    # via -r requirements/test.in
+pyparsing==2.4.7
+    # via
+    #   -r requirements/base.txt
+    #   packaging
+pytz==2021.1
+    # via
+    #   -r requirements/base.txt
+    #   fs
+simplejson==3.17.2
+    # via -r requirements/base.txt
+six==1.16.0
+    # via
+    #   -r requirements/base.txt
+    #   bleach
+    #   fs
+web-fragments==1.0.0
+    # via -r requirements/base.txt
+webencodings==0.5.1
+    # via
+    #   -r requirements/base.txt
+    #   bleach
+webob==1.8.7
+    # via -r requirements/base.txt
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/travis.txt

@@ -4,22 +4,51 @@
 #
 #    make upgrade
 #
-appdirs==1.4.4            # via -r requirements/test.txt, fs
-bleach==3.1.5             # via -r requirements/test.txt
-boto==2.49.0              # via -r requirements/test.txt
-fs==2.4.11                # via -r requirements/test.txt
-mako==1.1.3               # via -r requirements/test.txt
-markupsafe==1.1.1         # via -r requirements/test.txt, mako
-packaging==20.4           # via -r requirements/test.txt, bleach
-pycodestyle==2.6.0        # via -r requirements/test.txt
-pyparsing==2.4.7          # via -r requirements/test.txt, packaging
-pytz==2020.1              # via -r requirements/test.txt, fs
-simplejson==3.17.0        # via -r requirements/test.txt
-six==1.15.0               # via -r requirements/test.txt, bleach, fs, packaging
-typing==3.7.4.1           # via -r requirements/test.txt, fs
-web-fragments==0.3.2      # via -r requirements/test.txt
-webencodings==0.5.1       # via -r requirements/test.txt, bleach
-webob==1.8.6              # via -r requirements/test.txt
+appdirs==1.4.4
+    # via
+    #   -r requirements/test.txt
+    #   fs
+bleach==3.3.0
+    # via -r requirements/test.txt
+boto==2.49.0
+    # via -r requirements/test.txt
+fs==2.4.13
+    # via -r requirements/test.txt
+mako==1.1.4
+    # via -r requirements/test.txt
+markupsafe==2.0.1
+    # via
+    #   -r requirements/test.txt
+    #   mako
+packaging==20.9
+    # via
+    #   -r requirements/test.txt
+    #   bleach
+pycodestyle==2.7.0
+    # via -r requirements/test.txt
+pyparsing==2.4.7
+    # via
+    #   -r requirements/test.txt
+    #   packaging
+pytz==2021.1
+    # via
+    #   -r requirements/test.txt
+    #   fs
+simplejson==3.17.2
+    # via -r requirements/test.txt
+six==1.16.0
+    # via
+    #   -r requirements/test.txt
+    #   bleach
+    #   fs
+web-fragments==1.0.0
+    # via -r requirements/test.txt
+webencodings==0.5.1
+    # via
+    #   -r requirements/test.txt
+    #   bleach
+webob==1.8.7
+    # via -r requirements/test.txt
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

setup.py

@@ -47,7 +47,7 @@ def package_data(pkg, root_list):
 
 setup(
     name='recommender-xblock',
-    version='1.4.9',
+    version='2.0.0',
     description='recommender XBlock',   # TODO: write a better description.
     long_description=README,
     author='edX',