Update make/Docker for new directory structure.

Makefile

@@ -22,7 +22,7 @@ qsim:
 
 .PHONY: pybind
 pybind:
-	$(MAKE) -C interfaces/ pybind
+	$(MAKE) -C pybind_interface/ pybind
 
 .PHONY: cxx-tests
 tests:
@@ -33,10 +33,11 @@ tests:
 run-cxx-tests: cxx-tests
 	$(MAKE) -C tests/ run-all
 
-# TODO: support python tests
+PYTESTS = $(shell find interfaces/tests/ -name '*_test.py')
+
 .PHONY: run-py-tests
 run-py-tests: pybind
-	$(MAKE) -C interfaces/ run-tests
+	for exe in $(PYTESTS); do if ! python3 -m pytest $$exe; then exit 1; fi; done
 
 .PHONY: run-tests
 run-tests: $(TESTS)
@@ -45,4 +46,4 @@ run-tests: $(TESTS)
 clean:
 	-$(MAKE) -C apps/ clean
 	-$(MAKE) -C tests/ clean
-	-$(MAKE) -C interfaces/ clean
+	-$(MAKE) -C pybind_interface/ clean

docker-compose.yml

@@ -19,6 +19,6 @@ services:
         container_name: qsim-py-tests
         build:
             context: ./
-            dockerfile: interfaces/Dockerfile
+            dockerfile: pybind_interface/Dockerfile
         depends_on:
         - qsim

interfaces/Dockerfile → pybind_interface/Dockerfile

@@ -6,6 +6,8 @@ RUN apt-get install -y python3-dev python3-pybind11 python3-pytest python3-pip
 RUN pip3 install cirq
 
 # Copy relevant files
+COPY ./pybind_interface/ /qsim/pybind_interface/
+COPY ./qsimcirq/ /qsim/qsimcirq/
 COPY ./interfaces/ /qsim/interfaces/
 
 WORKDIR /qsim/