Updated files to match project template (#21)

.github/workflows/docs.yaml

@@ -34,7 +34,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9.7"
+          python-version: "3.10.6"
       - name: Set up pip cache
         run: python3 -m pip config set global.cache-dir ${{ env.PIP_CACHE_DIR }}
       - name: Install mkdocs

.github/workflows/pypi.yaml

@@ -31,7 +31,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9.7"
+          python-version: "3.10.6"
       - name: Set up pip cache
         run: python3 -m pip config set global.cache-dir ${{ env.PIP_CACHE_DIR }}
       - name: Install poetry

.github/workflows/test-multiplatform.yaml

@@ -70,7 +70,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9.7"
+          python-version: "3.10.6"
       - name: Set up pip cache
         run: python3 -m pip config set global.cache-dir ${{ env.PIP_CACHE_DIR }}
       - name: Install poetry

Dockerfile

@@ -6,17 +6,14 @@ WORKDIR /app/
 
 # install poetry
 COPY ./requirements.txt ./requirements.txt
-RUN python3 -m pip install --no-cache-dir -r ./requirements.txt
+RUN --mount=type=cache,target=/root/.cache \
+    python3 -m pip install -r ./requirements.txt
 
 # create new environment
-# see: https://jcristharif.com/conda-docker-tips.html
 # warning: for some reason conda can hang on "Executing transaction" for a couple of minutes
 COPY environment.yaml ./environment.yaml
-RUN conda env create -f ./environment.yaml && \
-    conda clean -afy && \
-    find /opt/conda/ -follow -type f -name '*.a' -delete && \
-    find /opt/conda/ -follow -type f -name '*.pyc' -delete && \
-    find /opt/conda/ -follow -type f -name '*.js.map' -delete
+RUN --mount=type=cache,target=/opt/conda/pkgs \
+    conda env create -f ./environment.yaml
 
 # "activate" environment for all commands (note: ENTRYPOINT is separate from SHELL)
 SHELL ["conda", "run", "--no-capture-output", "-n", "kilroy-face-twitter", "/bin/bash", "-c"]
@@ -28,9 +25,9 @@ COPY ./kilroy_face_twitter/pyproject.toml ./kilroy_face_twitter/poetry.lock ./
 
 FROM base AS test
 
-# install dependencies only (notice that no source code is present yet) and delete cache
-RUN poetry install --no-root --only main,test && \
-    rm -rf ~/.cache/pypoetry
+# install dependencies only (notice that no source code is present yet)
+RUN --mount=type=cache,target=/root/.cache \
+    poetry install --no-root --only main,test
 
 # add source, tests and necessary files
 COPY ./kilroy_face_twitter/src/ ./src/
@@ -51,9 +48,9 @@ CMD []
 
 FROM base AS production
 
-# install dependencies only (notice that no source code is present yet) and delete cache
-RUN poetry install --no-root --only main && \
-    rm -rf ~/.cache/pypoetry
+# install dependencies only (notice that no source code is present yet)
+RUN --mount=type=cache,target=/root/.cache \
+    poetry install --no-root --only main
 
 # add source and necessary files
 COPY ./kilroy_face_twitter/src/ ./src/

environment.yaml

@@ -1,4 +1,7 @@
 name: kilroy-face-twitter
+channels:
+  - defaults
+  - conda-forge
 dependencies:
-  - python==3.9.7
-  - pip==21.2.4
+  - python==3.10.6
+  - pip==22.2.2

kilroy_face_twitter/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kilroy-face-twitter"
-version = "0.5.0"
+version = "0.5.1"
 description = "kilroy face for Twitter 🐦"
 readme = "README.md"
 authors = ["kilroy <kilroymail@pm.me>"]
@@ -10,7 +10,7 @@ repository = "https://github.com/kilroybot/kilroy-face-twitter"
 documentation = "https://kilroybot.github.io/kilroy-face-twitter"
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.10"
 pydantic =  { version = "^1.10", extras = ["dotenv"] }
 omegaconf = "^2.2"
 typer = { version = "^0.6", extras = ["all"] }
@@ -42,7 +42,7 @@ kilroy-face-twitter-fetch-model = "kilroy_face_twitter.toxicity:fetch_model"
 
 [tool.black]
 line-length = 79
-target-version = ['py39']
+target-version = ['py310']
 
 [tool.poe]
 verbosity = -1