Merge branch 'master' into 47-add_text

.github/workflows/ci.yml

@@ -0,0 +1,25 @@
+name: CI
+on: [push, pull_request]
+env:
+  BASEDIR: https://raw.githubusercontent.com/open-contracting/standard-maintenance-scripts/master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v1
+      with:
+        python-version: 3.6
+    - uses: actions/cache@v1
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements_dev.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+    - run: curl -s -S --retry 3 $BASEDIR/tests/install.sh | bash -
+    - run: pip install -r requirements_dev.txt
+    - run: curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -
+    - run: coverage run --source default,ocdstoucan manage.py test
+    - env:
+        COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+      run: coveralls

requirements.txt

@@ -5,7 +5,7 @@
 #    pip-compile
 #
 attrs==19.3.0             # via jsonschema
-bleach==3.1.1             # via libcove, libcoveocds
+bleach==3.1.4             # via libcove, libcoveocds
 cached-property==1.5.1    # via libcove, libcoveocds
 certifi==2019.9.11        # via requests, sentry-sdk
 chardet==3.0.4            # via requests
@@ -15,18 +15,19 @@ django==2.2.10
 et-xmlfile==1.0.1         # via openpyxl
 flattentool==0.9.0
 idna==2.8                 # via requests
-ijson==2.5.1              # via ocdskit
+ijson==3.0                # via ocdskit
 importlib-metadata==1.3.0  # via jsonschema
 jdcal==1.4.1              # via openpyxl
 json-merge-patch==0.2     # via libcove, libcoveocds, ocdsextensionregistry
+jsonpointer==2.0          # via ocdskit
 jsonref==0.2
 jsonschema==3.2.0         # via libcove, libcoveocds, ocdskit
 libcove==0.12.0           # via libcoveocds
 libcoveocds==0.7.4
 lxml==4.4.1               # via flattentool
 more-itertools==8.0.2     # via zipp
 ocdsextensionregistry==0.0.16
-ocdskit[perf]==0.2.1
+ocdskit[perf]==0.2.6
 ocdsmerge==0.6.4
 openpyxl==3.0.1           # via flattentool
 orjson==2.1.3             # via ocdskit

requirements_dev.in

@@ -1,5 +1,5 @@
 -r requirements.txt
-coverage
+coveralls
 flake8
 isort
 pip-tools

requirements_dev.txt

@@ -5,25 +5,28 @@
 #    pip-compile requirements_dev.in
 #
 attrs==19.3.0
-bleach==3.1.1
+bleach==3.1.4
 cached-property==1.5.1
 certifi==2019.9.11
 chardet==3.0.4
 click==7.0                # via pip-tools
 commonmark==0.9.1
 contextlib2==0.5.5
-coverage==5.0.2
+coverage==5.0.2           # via coveralls
+coveralls==2.0.0
 django==2.2.10
+docopt==0.6.2             # via coveralls
 entrypoints==0.3          # via flake8
 et-xmlfile==1.0.1
 flake8==3.7.9
 flattentool==0.9.0
 idna==2.8
-ijson==2.5.1
+ijson==3.0
 importlib-metadata==1.3.0
 isort==4.3.21
 jdcal==1.4.1
 json-merge-patch==0.2
+jsonpointer==2.0
 jsonref==0.2
 jsonschema==3.2.0
 libcove==0.12.0
@@ -32,7 +35,7 @@ lxml==4.4.1
 mccabe==0.6.1             # via flake8
 more-itertools==8.0.2
 ocdsextensionregistry==0.0.16
-ocdskit[perf]==0.2.1
+ocdskit[perf]==0.2.6
 ocdsmerge==0.6.4
 openpyxl==3.0.1
 orjson==2.1.3

tests/test_to_spreadsheet.py

@@ -43,9 +43,7 @@ def test_go_with_files(self):
                              read('results/flattened/' + name))
 
         actual = self.get_zipfile(contents['xlsx'])
-        with open(path('results/flattened.xlsx'), 'rb') as f:
-            expected = ZipFile(f)
-
+        with ZipFile(path('results/flattened.xlsx')) as expected:
             self.assertEqual(_worksheets_length(actual), _worksheets_length(expected))
             for name in results['xlsx']:
                 self.assertEqual(actual.read(name), expected.read(name))