From 95aee94089055c41241585dff981ddf15c97a96f Mon Sep 17 00:00:00 2001 From: "J. Cliff Dyer" Date: Thu, 28 Mar 2019 15:24:47 -0700 Subject: [PATCH] INCR-41: Replace pdfminer with pdfminer.six --- pavelib/prereqs.py | 1 + requirements/edx/base.in | 4 ++-- requirements/edx/base.txt | 5 +++-- requirements/edx/development.txt | 7 ++++--- requirements/edx/testing.txt | 7 ++++--- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py index b0132c6577..d35cd7d9cc 100644 --- a/pavelib/prereqs.py +++ b/pavelib/prereqs.py @@ -200,6 +200,7 @@ PACKAGES_TO_UNINSTALL = [ "edx-oauth2-provider", # Because it moved from github to pypi "i18n-tools", # Because now it's called edx-i18n-tools "python-saml", # Because python3-saml shares the same directory name + "pdfminer", # Replaced by pdfminer.six, which shares the same directory name ] diff --git a/requirements/edx/base.in b/requirements/edx/base.in index b873fb4dfe..c26d888701 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -106,7 +106,7 @@ mysqlclient # Driver for the default production relation newrelic # New Relic agent for performance monitoring nodeenv==1.1.1 # Utility for managing Node.js environments; we use this for deployments and testing oauthlib # OAuth specification support for authenticating via LTI or other Open edX services -pdfminer # Used in shoppingcart for extracting/parsing pdf text +pdfminer.six # Used in shoppingcart for extracting/parsing pdf text piexif==1.0.2 # Exif image metadata manipulation, used in the profile_images app Pillow # Image manipulation library; used for course assets, profile images, invoice PDFs, etc. py2neo<4.0.0 # Used to communicate with Neo4j, which is used internally for modulestore inspection @@ -122,7 +122,7 @@ pymongo # MongoDB driver pynliner # Inlines CSS styles into HTML for email notifications python-dateutil==2.4 python-Levenshtein -python3-openid ; python_version>='3' +python3-openid ; python_version>='3' python3-saml pyuca==1.1 # For more accurate sorting of translated country names in django-countries reportlab # Used for shopping cart's pdf invoice/receipt generation diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index ebf6b5edba..07a3c23578 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -113,7 +113,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==1.0.3 edx-drf-extensions==2.1.0 -edx-enterprise==1.3.5 +edx-enterprise==1.3.7 edx-i18n-tools==0.4.8 edx-milestones==0.1.13 edx-oauth2-provider==1.2.2 @@ -179,7 +179,7 @@ path.py==8.2.1 pathtools==0.1.2 paver==1.3.4 pbr==5.1.3 -pdfminer==20140328 +pdfminer.six==20181108 piexif==1.0.2 pillow==5.4.1 pkgconfig==1.4.0 # via xmlsec @@ -189,6 +189,7 @@ py2neo==3.1.2 pycontracts==1.7.1 pycountry==18.12.8 pycparser==2.19 +pycryptodome==3.8.0 # via pdfminer.six pycryptodomex==3.4.7 pygments==2.3.1 pygraphviz==1.5 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index a2415ca2ab..7cabdd4c90 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -135,7 +135,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==1.0.3 edx-drf-extensions==2.1.0 -edx-enterprise==1.3.5 +edx-enterprise==1.3.7 edx-i18n-tools==0.4.8 edx-lint==1.1.1 edx-milestones==0.1.13 @@ -236,7 +236,7 @@ pathlib2==2.3.3 pathtools==0.1.2 paver==1.3.4 pbr==5.1.3 -pdfminer==20140328 +pdfminer.six==20181108 piexif==1.0.2 pillow==5.4.1 pip-tools==3.5.0 @@ -252,6 +252,7 @@ pycodestyle==2.5.0 pycontracts==1.7.1 pycountry==18.12.8 pycparser==2.19 +pycryptodome==3.8.0 pycryptodomex==3.4.7 pydispatcher==2.0.5 pyflakes==2.1.1 @@ -334,7 +335,7 @@ text-unidecode==1.2 tincan==0.0.5 toml==0.10.0 tox-battery==0.5.1 -tox==3.8.0 +tox==3.8.1 traceback2==1.4.0 transifex-client==0.13.6 twisted==18.9.0 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index b9eef64eb6..d0078b8e60 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -131,7 +131,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==1.0.3 edx-drf-extensions==2.1.0 -edx-enterprise==1.3.5 +edx-enterprise==1.3.7 edx-i18n-tools==0.4.8 edx-lint==1.1.1 edx-milestones==0.1.13 @@ -229,7 +229,7 @@ pathlib2==2.3.3 # via pytest, pytest-django pathtools==0.1.2 paver==1.3.4 pbr==5.1.3 -pdfminer==20140328 +pdfminer.six==20181108 piexif==1.0.2 pillow==5.4.1 pkgconfig==1.4.0 @@ -244,6 +244,7 @@ pycodestyle==2.5.0 pycontracts==1.7.1 pycountry==18.12.8 pycparser==2.19 +pycryptodome==3.8.0 pycryptodomex==3.4.7 pydispatcher==2.0.5 # via scrapy pyflakes==2.1.1 # via flake8 @@ -321,7 +322,7 @@ text-unidecode==1.2 # via faker tincan==0.0.5 toml==0.10.0 # via tox tox-battery==0.5.1 -tox==3.8.0 +tox==3.8.1 traceback2==1.4.0 # via testtools, unittest2 transifex-client==0.13.6 twisted==18.9.0 # via scrapy