fix all the imports, get it all working

hjwp · hjwp · commit 48c0a2ba6712 · 2019-07-18T22:11:32.000+01:00
diff --git a/Dockerfile b/Dockerfile
@@ -3,14 +3,16 @@ FROM python:3.7-alpine
 RUN apk add --no-cache --virtual .build-deps gcc postgresql-dev musl-dev python3-dev
 RUN apk add libpq
 
-COPY requirements.txt /tmp
+COPY requirements.txt /tmp/
 RUN pip install -r /tmp/requirements.txt
 
 RUN apk del --no-cache .build-deps
 
-RUN mkdir -p /code
-COPY *.py /code/
-WORKDIR /code
-RUN pip install .
-ENV FLASK_APP=flask_app.py FLASK_DEBUG=1 PYTHONUNBUFFERED=1
+RUN mkdir -p /src
+COPY src/ /src/
+RUN pip install -e /src
+COPY tests/ /tests/
+
+WORKDIR /src
+ENV FLASK_APP=allocation/flask_app.py FLASK_DEBUG=1 PYTHONUNBUFFERED=1
 CMD flask run --host=0.0.0.0 --port=80
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - DB_HOST=postgres
       - DB_PASSWORD=abc123
     volumes:
-      - ./:/code
+      - ./src:/src
     ports:
       - "5005:80"
 
diff --git a/mypy.ini b/mypy.ini
@@ -1,5 +1,7 @@
 [mypy]
 ignore_missing_imports = False
+namespace_packages = True
+mypy_path = ./src
 
 [mypy-pytest.*]
 ignore_missing_imports = True
diff --git a/src/allocation/flask_app.py b/src/allocation/flask_app.py
@@ -3,11 +3,11 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-import config
-import model
-import orm
-import repository
-import services
+from allocation import config
+from allocation import orm
+from allocation import repository
+from allocation import model
+from allocation import services
 
 orm.start_mappers()
 get_session = sessionmaker(bind=create_engine(config.get_postgres_uri()))
diff --git a/src/allocation/model.py b/src/allocation/model.py
diff --git a/src/allocation/orm.py b/src/allocation/orm.py
@@ -4,7 +4,7 @@
 )
 from sqlalchemy.orm import mapper, relationship
 
-import model
+from allocation import model
 
 
 metadata = MetaData()
diff --git a/src/allocation/repository.py b/src/allocation/repository.py
@@ -1,5 +1,5 @@
 import abc
-import model
+from allocation import model
 
 
 class AbstractRepository(abc.ABC):
diff --git a/src/allocation/services.py b/src/allocation/services.py
@@ -2,9 +2,10 @@
 from typing import Optional
 from datetime import date
 
-import model
-from model import OrderLine
-from repository import AbstractRepository
+from allocation.model import OrderLine
+from allocation.repository import AbstractRepository
+from allocation import model
+
 
 class InvalidSku(Exception):
     pass
diff --git a/src/setup.py b/src/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(
-    name='procurement',
+    name='allocation',
     version='0.1',
     packages=['allocation'],
 )
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -9,8 +9,8 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker, clear_mappers
 
-from orm import metadata, start_mappers
-import config
+from allocation.orm import metadata, start_mappers
+from allocation import config
 
 
 @pytest.fixture
@@ -66,7 +66,7 @@ def postgres_session(postgres_db):
 
 @pytest.fixture
 def restart_api():
-    (Path(__file__).parent / 'flask_app.py').touch()
+    (Path(__file__).parent / '../src/allocation/flask_app.py').touch()
     time.sleep(0.5)
     wait_for_webapp_to_come_up()
 
diff --git a/tests/e2e/test_api.py b/tests/e2e/test_api.py
@@ -2,7 +2,7 @@
 import pytest
 import requests
 
-import config
+from allocation import config
 
 def random_suffix():
     return uuid.uuid4().hex[:6]
diff --git a/tests/integration/test_orm.py b/tests/integration/test_orm.py
@@ -1,4 +1,4 @@
-import model
+from allocation import model
 from datetime import date
 
 def test_orderline_mapper_can_load_lines(session):
diff --git a/tests/integration/test_repository.py b/tests/integration/test_repository.py
@@ -1,6 +1,6 @@
 # pylint: disable=protected-access
-import model
-import repository
+from allocation import model
+from allocation import repository
 
 def test_repository_can_save_a_batch(session):
     batch = model.Batch("batch1", "RUSTY-SOAPDISH", 100, eta=None)
diff --git a/tests/mypy.ini b/tests/mypy.ini
@@ -0,0 +1,11 @@
+[mypy]
+ignore_missing_imports = False
+namespace_packages = True
+mypy_path = ../src
+
+[mypy-pytest.*]
+ignore_missing_imports = True
+
+[mypy-sqlalchemy.*]
+ignore_missing_imports = True
+
diff --git a/tests/unit/test_allocate.py b/tests/unit/test_allocate.py
@@ -1,6 +1,6 @@
 from datetime import date, timedelta
 import pytest
-from model import allocate, OrderLine, Batch, OutOfStock
+from allocation.model import allocate, OrderLine, Batch, OutOfStock
 
 today = date.today()
 tomorrow = today + timedelta(days=1)
diff --git a/tests/unit/test_batches.py b/tests/unit/test_batches.py
@@ -1,5 +1,5 @@
 from datetime import date
-from model import Batch, OrderLine
+from allocation.model import Batch, OrderLine
 
 
 def test_allocating_to_a_batch_reduces_the_available_quantity():
diff --git a/tests/unit/test_services.py b/tests/unit/test_services.py
@@ -1,7 +1,5 @@
 import pytest
-import model
-import repository
-import services
+from allocation import repository, services
 
 
 class FakeRepository(repository.AbstractRepository):

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`)`
`5`	`5`	`from sqlalchemy.orm import mapper, relationship`
`6`	`6`
`7`		`-import model`
	`7`	`+from allocation import model`
`8`	`8`
`9`	`9`
`10`	`10`	`metadata = MetaData()`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from setuptools import setup`
`2`	`2`
`3`	`3`	`setup(`
`4`		`- name='procurement',`
	`4`	`+ name='allocation',`
`5`	`5`	`version='0.1',`
`6`	`6`	`packages=['allocation'],`
`7`	`7`	`)`