Merge pull request #13 from fastapi-mvc/update_poetry

Update Poetry to 1.3.x

Author: rszamszur

.github/workflows/main.yml

@@ -64,7 +64,7 @@ jobs:
       - name: Generate poetry.lock
         if: steps.lock-cache.outputs.cache-hit != 'true'
         working-directory: ./example
-        run: nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/04a75b2eecc0acf6239acf9dd04485ff8d14f425.tar.gz -p poetry --run "poetry lock --no-update"
+        run: nix-shell -p poetry --run "poetry lock --no-update"
       - name: Set short commit SHA
         run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
       - name: Push generated test project

template/Dockerfile.jinja

@@ -14,7 +14,7 @@ ENV PYTHONUNBUFFERED=1 \
     POETRY_HOME="/opt/poetry" \
     POETRY_VIRTUALENVS_IN_PROJECT=true \
     POETRY_NO_INTERACTION=1 \
-    POETRY_VERSION=1.2.0 \
+    POETRY_VERSION=1.3.2 \
     POETRY_INSTALL_OPTS="--no-interaction --without dev --no-root" \
     PYSETUP_PATH="/pysetup" \
     VENV_PATH="/pysetup/.venv"

template/Makefile.jinja

@@ -12,7 +12,7 @@ SHELL=/usr/bin/env bash -o pipefail -o errexit
 TAG ?= $(shell cat TAG)
 POETRY_HOME ?= ${HOME}/.local/share/pypoetry
 POETRY_BINARY ?= ${POETRY_HOME}/venv/bin/poetry
-POETRY_VERSION ?= 1.2.0
+POETRY_VERSION ?= 1.3.2
 
 help:  ## Display this help
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

template/build/install.sh.jinja

@@ -29,10 +29,10 @@ fi
 
 POETRY_HOME="${POETRY_HOME:=${HOME}/.local/share/pypoetry}"
 POETRY_BINARY="${POETRY_BINARY:=${POETRY_HOME}/venv/bin/poetry}"
-POETRY_VERSION="${POETRY_VERSION:=1.2.0}"
+POETRY_VERSION="${POETRY_VERSION:=1.3.2}"
 if ! command -v "$POETRY_BINARY" &> /dev/null; then
   echo "[install] Poetry is not installed. Begin download and install."
-  curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.2.0/install-poetry.py | POETRY_HOME=$POETRY_HOME POETRY_VERSION=$POETRY_VERSION $PYTHON -
+  curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.3.2/install-poetry.py | POETRY_HOME=$POETRY_HOME POETRY_VERSION=$POETRY_VERSION $PYTHON -
 fi
 
 POETRY_INSTALL_OPTS="${POETRY_INSTALL_OPTS:="--no-interaction"}"

template/{% if nix %}flake.lock{% endif %}.jinja

@@ -32,11 +32,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1670461440,
-        "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=",
+        "lastModified": 1675681488,
+        "narHash": "sha256-0E/oYpixC+joFk7UrY60TwZcdthzP2BXmJwne3Ni8ZI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425",
+        "rev": "13fdd3945d8a2da5e4afe35d8a629193a9680911",
         "type": "github"
       },
       "original": {
@@ -54,16 +54,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1670390991,
-        "narHash": "sha256-+7Ix9k1Mg/argNWOox32P5AiUhMKW+OEJjzHXGKNNjc=",
+        "lastModified": 1670681815,
+        "narHash": "sha256-znag7V2HRi9w78hSoTx2snIrPmVJy7O5h6Klqz8aZ00=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "dbbf4c83e02c3a25d9d87041386a4981fe699661",
+        "rev": "bb7f4e1d046c5f19fda8bebb638d5d5bc07573d9",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "1.38.0",
+        "ref": "1.39.1",
         "repo": "poetry2nix",
         "type": "github"
       }

template/{% if nix %}flake.nix{% endif %}.jinja

@@ -6,7 +6,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
     flake-utils.url = "github:numtide/flake-utils";
     poetry2nix = {
-      url = "github:nix-community/poetry2nix?ref=1.38.0";
+      url = "github:nix-community/poetry2nix?ref=1.39.1";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

template/{% if nix %}overlay.nix{% endif %}.jinja

@@ -17,10 +17,6 @@ final: prev: {
         buildInputs = old.buildInputs or [ ] ++ [ py-final.setuptools ];
       });
 
-      packaging = py-prev.packaging.overridePythonAttrs (old: {
-        buildInputs = old.buildInputs or [ ] ++ [ py-final.flit-core ];
-      });
-
       pathspec = py-prev.pathspec.overridePythonAttrs (old: {
         buildInputs = old.buildInputs or [ ] ++ [ py-final.flit-core ];
       });
@@ -35,7 +31,6 @@ final: prev: {
           py-final.hatchling
           py-final.build
           py-final.setuptools-scm
-          py-final.setuptools
         ];
       });