Merge pull request #20 from bento-platform/chore/poetry-reconfig

chore: update dependencies/images & reconfigure Poetry

.github/workflows/test.yml

@@ -31,6 +31,6 @@ jobs:
       - name: Install dependencies
         run: poetry install
       - name: Test
-        run: pytest -svv --cov=bento_notification_service --cov-branch
-      - name: Codecov
-        run: codecov
+        run: poetry run pytest -svv --cov=bento_notification_service --cov-branch
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3

.gitignore

@@ -8,8 +8,7 @@ db.sqlite3
 htmlcov/
 
 # IDE stuff
-.idea/workspace.xml
-.idea/dataSources*
+.idea/*
 *.swp
 *.swo
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.02.27
+FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.05.12
 
 # Run as root in the Dockerfile until we drop down to the service user in the entrypoint
 USER root
@@ -15,13 +15,13 @@ WORKDIR /notification
 RUN mkdir -p /notification/data
 
 COPY pyproject.toml .
-COPY poetry.toml .
 COPY poetry.lock .
 
 # Install production dependencies
 # Without --no-root, we get errors related to the code not being copied in yet.
 # But we don't want the code here, otherwise Docker cache doesn't work well.
-RUN poetry install --without dev --no-root
+RUN poetry config virtualenvs.create false && \
+    poetry install --without dev --no-root
 
 # Manually copy only what's relevant
 # (Don't use .dockerignore, which allows us to have development containers too)

README.md

@@ -30,14 +30,23 @@ installed using the following command:
 poetry install
 ```
 
-Afterwards we need to set up the DB:
+Afterward, we need to set up the DB:
 
 ```bash
-flask db upgrade
+poetry run flask db upgrade
 ```
 
 To create migrations, make sure your database is on the latest migration. Then, do the following:
 
 ```bash
-flask db migrate -m "Some message here"
+poetry run flask db migrate -m "Some message here"
+```
+
+
+## Testing
+
+To test locally, run:
+
+```bash
+poetry run tox
 ```

dev.Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.02.27
+FROM ghcr.io/bento-platform/bento_base_image:python-debian-2023.05.12
 
 SHELL ["/bin/bash", "-c"]
 
@@ -8,7 +8,6 @@ USER root
 RUN apt-get update -y && \
     apt-get install -y libpq-dev python-dev && \
     rm -rf /var/lib/apt/lists/* && \
-    source /env/bin/activate && \
     pip install --no-cache-dir gunicorn==20.1.0
 
 WORKDIR /notification
@@ -17,15 +16,15 @@ WORKDIR /notification
 RUN mkdir -p /notification/data
 
 COPY pyproject.toml .
-COPY poetry.toml .
 COPY poetry.lock .
 COPY entrypoint.bash .
 COPY run.dev.bash .
 
 # Install production + development dependencies
 # Without --no-root, we get errors related to the code not being copied in yet.
 # But we don't want the code here, otherwise Docker cache doesn't work well.
-RUN source /env/bin/activate && poetry install --no-root
+RUN poetry config virtualenvs.create false && \
+    poetry install --no-root
 
 # Don't include actual code in the development image - will be mounted in using a volume.