Skip to content

Commit

Permalink
Merge 869319b into fba02b0
Browse files Browse the repository at this point in the history
  • Loading branch information
jvarho committed Feb 7, 2021
2 parents fba02b0 + 869319b commit a928dac
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
6 changes: 6 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[paths]
source =
pylibscrypt
/app/pylibscrypt


[report]
exclude_lines =
# Not called from coverage tests
Expand Down
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
language: python

sudo: required

branches:
only:
- master
Expand All @@ -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
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]

0 comments on commit a928dac

Please sign in to comment.