diff --git a/08-pizza-party/python-pizza-party/README.md b/08-pizza-party/python-pizza-party/README.md index 94f7bee..804be7b 100644 --- a/08-pizza-party/python-pizza-party/README.md +++ b/08-pizza-party/python-pizza-party/README.md @@ -3,11 +3,11 @@ ##to run ``` -./main.py +python3 main.py ``` ##tests ``` -python -m unittest discover -s tests +python3 -m unittest discover -s tests ``` diff --git a/08-pizza-party/python-pizza-party/main.py b/08-pizza-party/python-pizza-party/main.py index 15c7fac..fdac6df 100755 --- a/08-pizza-party/python-pizza-party/main.py +++ b/08-pizza-party/python-pizza-party/main.py @@ -1,6 +1,5 @@ -#!/usr/bin/python +#!/usr/bin/env python3 -from __future__ import print_function from party import PizzaParty @@ -18,4 +17,4 @@ def run(read, prt): prt('There are %s leftover pieces.' % (party.leftovers())) if __name__ == "__main__": - run(raw_input, print) + run(input, print) diff --git a/08-pizza-party/python-pizza-party/party/__init__.py b/08-pizza-party/python-pizza-party/party/__init__.py index fb59141..718b00a 100644 --- a/08-pizza-party/python-pizza-party/party/__init__.py +++ b/08-pizza-party/python-pizza-party/party/__init__.py @@ -1 +1 @@ -from party import PizzaParty # noqa F401 +from .party import PizzaParty # noqa: F401 diff --git a/08-pizza-party/python-pizza-party/party/party.py b/08-pizza-party/python-pizza-party/party/party.py index 5b226d1..e6187ba 100644 --- a/08-pizza-party/python-pizza-party/party/party.py +++ b/08-pizza-party/python-pizza-party/party/party.py @@ -20,7 +20,7 @@ def order(self, pizzas, size=None): return self def pieces_per_person(self): - return self.slices / self.people + return self.slices // self.people def leftovers(self): return self.slices % self.people diff --git a/Dockerfile b/Dockerfile index 97d084e..dc5112a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,9 @@ FROM lochnesh/exercises-docker:latest MAINTAINER Skyler Nesheim +RUN set -eux; \ + apk add --no-cache python3 + COPY ./ /usr/src/exercises WORKDIR /usr/src/exercises RUN ./verify.sh diff --git a/verify.sh b/verify.sh index b6d80d0..7a142c7 100755 --- a/verify.sh +++ b/verify.sh @@ -13,6 +13,11 @@ verify_python() python -m unittest discover -s tests } +verify_python3() +{ + python3 -m unittest discover -s tests +} + verify_scala() { sbt scalastyle test:scalastyle assembly @@ -40,7 +45,7 @@ pushd 06-retirement-calculator/elixir_retirement_calculator && verify_elixir && pushd 07-area-of-room/elixir_area_of_room && verify_elixir && popd #08 -pushd 08-pizza-party/python-pizza-party && verify_python && popd +pushd 08-pizza-party/python-pizza-party && verify_python3 && popd #09 pushd 09-paint-calculator/scala-paint-calculator && verify_scala && popd