From d9a0f898a50a93b8c129c621194e124192186dd1 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Mon, 24 May 2021 18:06:01 +0500 Subject: [PATCH] fix: resolved the pip and pip-tools version conflict --- .travis.yml | 1 - Makefile | 2 ++ requirements/base.txt | 45 +++++++++++++++++--------- requirements/constraints.txt | 1 + requirements/pip.in | 5 +++ requirements/pip.txt | 14 +++++++++ requirements/pip_tools.txt | 11 +++++-- requirements/test.txt | 61 ++++++++++++++++++++++++++---------- requirements/travis.txt | 61 ++++++++++++++++++++++++++---------- setup.py | 2 +- 10 files changed, 151 insertions(+), 52 deletions(-) create mode 100644 requirements/pip.in create mode 100644 requirements/pip.txt diff --git a/.travis.yml b/.travis.yml index f48459e..47e2e7c 100644 --- a/.travis.yml +++ b/.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 diff --git a/Makefile b/Makefile index 544c9bb..dd44350 100644 --- a/Makefile +++ b/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 diff --git a/requirements/base.txt b/requirements/base.txt index b77a0ee..d823938 100644 --- a/requirements/base.txt +++ b/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 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 94595ab..ed072c2 100644 --- a/requirements/constraints.txt +++ b/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. + diff --git a/requirements/pip.in b/requirements/pip.in new file mode 100644 index 0000000..21ce8e9 --- /dev/null +++ b/requirements/pip.in @@ -0,0 +1,5 @@ +# Core dependencies for installing other packages + +pip +setuptools +wheel diff --git a/requirements/pip.txt b/requirements/pip.txt new file mode 100644 index 0000000..562b7e3 --- /dev/null +++ b/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 diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 279019f..322a867 100644 --- a/requirements/pip_tools.txt +++ b/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 diff --git a/requirements/test.txt b/requirements/test.txt index ec1702b..089e8bf 100644 --- a/requirements/test.txt +++ b/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 diff --git a/requirements/travis.txt b/requirements/travis.txt index 3d8677e..28c7492 100644 --- a/requirements/travis.txt +++ b/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 diff --git a/setup.py b/setup.py index a15a4b6..f8962aa 100644 --- a/setup.py +++ b/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',