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 0aa4e7de47..72f8dddb68 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -105,7 +105,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 @@ -121,7 +121,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 81aee64b11..f7bdb27832 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -177,7 +177,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 @@ -187,6 +187,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 b5989de951..18767cc00a 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -234,7 +234,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 @@ -250,6 +250,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 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 6e5adad1e6..aaa726164f 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -227,7 +227,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 @@ -242,6 +242,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