Merge fbb9794 into fba02b0

.coveragerc

@@ -1,3 +1,9 @@
+[paths]
+source =
+    pylibscrypt
+    /app/pylibscrypt
+
+
 [report]
 exclude_lines =
     # Not called from coverage tests

.travis.yml

@@ -1,7 +1,5 @@
 language: python
 
-sudo: required
-
 branches:
     only:
         - master
@@ -17,5 +15,5 @@ script:
     - docker run -v ${PWD}:/app jvarho/pylibscrypt
 
 after_success:
-    - sed -i "s@/app@$TRAVIS_BUILD_DIR@g" .coverage
+    - coverage combine
     - coveralls

Dockerfile

@@ -1,7 +1,5 @@
-FROM ubuntu:18.04
-RUN apt-get update && apt-get install -y python python-pip libscrypt0 libsodium23 python-openssl libssl-dev
-RUN apt-get install -y python3.6 python3-pip libpython3.6-dev
-RUN python -m pip install coverage hypothesis scrypt
-RUN python3.6 -m pip install coverage hypothesis scrypt
+FROM ubuntu:20.04
+RUN apt-get update && apt-get install -y python3 python3-pip libpython3-dev libscrypt0 libsodium23 python-openssl libssl-dev
+RUN python3 -m pip install coverage hypothesis scrypt
 WORKDIR /app
 CMD ["./run_docker.sh"]

run_docker.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 set -e
 PYTHON=python3
-$PYTHON -m coverage run --branch -m pylibscrypt.tests
-$PYTHON -m coverage run --branch -a -m pylibscrypt.test_properties
-$PYTHON -m coverage run --branch -a -m pylibscrypt.pylibscrypt
-$PYTHON -m coverage run --branch -a -m pylibscrypt.pylibsodium
-$PYTHON -m coverage run --branch -a test_fallback.py
-$PYTHON -m coverage run --branch -a test_fallback.py -e
-$PYTHON -m coverage run --branch -a test_fallback.py -p
-$PYTHON -m coverage run --branch -a test_fallback.py -e -p
+$PYTHON -m coverage run --branch -p -m pylibscrypt.tests
+$PYTHON -m coverage run --branch -p -m pylibscrypt.test_properties
+$PYTHON -m coverage run --branch -p -m pylibscrypt.pylibscrypt
+$PYTHON -m coverage run --branch -p -m pylibscrypt.pylibsodium
+$PYTHON -m coverage run --branch -p test_fallback.py
+$PYTHON -m coverage run --branch -p test_fallback.py -e
+$PYTHON -m coverage run --branch -p test_fallback.py -p
+$PYTHON -m coverage run --branch -p test_fallback.py -e -p