Merge branch 'master' into 42-in_out_options

# Conflicts: # requirements.txt # requirements_dev.txt
open-contracting-archive · Mar 31, 2020 · dc11fa9 · dc11fa9
2 parents 67073ff + 3f06a72
commit dc11fa9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ env:
   - BASEDIR="https://raw.githubusercontent.com/open-contracting/standard-maintenance-scripts/master"
 install:
   - curl -s -S --retry 3 $BASEDIR/tests/install.sh | bash -
-  - pip install -r requirements.txt
+  - pip install -r requirements_dev.txt
   - pip install coveralls
 script:
   - curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -

diff --git a/requirements.txt b/requirements.txt
@@ -6,7 +6,7 @@
 #
 attrs==19.3.0             # via jsonschema
 beautifulsoup4==4.8.2     # via google
-bleach==3.1.1             # via libcove, libcoveocds
+bleach==3.1.4             # via libcove, libcoveocds
 cached-property==1.5.1    # via libcove, libcoveocds
 cachetools==4.0.0         # via google-auth
 certifi==2019.9.11        # via requests, sentry-sdk

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -6,7 +6,7 @@
 #
 attrs==19.3.0
 beautifulsoup4==4.8.2
-bleach==3.1.1
+bleach==3.1.4
 cached-property==1.5.1
 cachetools==4.0.0
 certifi==2019.9.11