Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

project: fix security issue in bleach library #181

Merged
merged 1 commit into from
Mar 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ coverage.xml
*,cover
.pytest_cache

# end-to-end testing
.e2e_screenshots

# Translations
*.mo

Expand Down
14 changes: 1 addition & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,6 @@ cache:
services:
- docker

env:
global:
# Print screenshots to console output
- E2E_OUTPUT=base64
# Enable end-to-end tests
- E2E=no
matrix:
- REQUIREMENTS=prod E2E=yes
- REQUIREMENTS=qa

python:
- "3.6"

Expand All @@ -63,7 +53,6 @@ before_install:
- "docker-compose up -d"
# Chrome webdriver for Selenium
- "PATH=$PATH:$HOME/webdrivers"
- "if [ ${E2E} == 'yes' ] && [ ! -f $HOME/webdrivers/chromedriver ]; then wget https://chromedriver.storage.googleapis.com/2.31/chromedriver_linux64.zip -P $HOME/webdrivers; unzip -d $HOME/webdrivers $HOME/webdrivers/chromedriver_linux64.zip; fi"
- "nvm install 8; nvm use 8"
- "travis_retry pip install --upgrade pip setuptools py pipenv"
- "travis_retry pip install twine wheel coveralls"
Expand All @@ -74,12 +63,11 @@ install:
before_script:
# https://docs.travis-ci.com/user/gui-and-headless-browsers/
- "export DISPLAY=:99.0"
- "if [ ${E2E} == 'yes' ]; then sh -e /etc/init.d/xvfb start; sleep 3; fi"
# Allow services running inside docker to start
- "./docker/wait-for-services.sh"

script:
- ./run-tests.sh # E2E tests are skipped if E2E env is set to 'no'
- ./run-tests.sh

after_success:
- coveralls
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ werkzeug = "==0.16.0"
flask-login = "<0.5"
invenio-oaiharvester = {editable = true,ref = "v1.0.0a4",git = "https://github.com/inveniosoftware/invenio-oaiharvester.git"}
# Forced version for security reason
bleach = ">=3.1.1"
bleach = ">=3.1.3"

[dev-packages]
Flask-Debugtoolbar = ">=0.10.1"
Expand Down
Loading