Simplify poetry install

poetry 1.2 has a new install script
mysociety · Sep 1, 2022 · d8359de · d8359de
1 parent 6176b39
commit d8359de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,5 +9,4 @@ RUN cd /setup/ \
     && chmod +x packages_setup.bash \
     && ./packages_setup.bash \
     && mkdir --parents /setup/src/data_common && touch /setup/src/data_common/__init__.py \
-    && export PATH="$HOME/.poetry/bin:$PATH" \
-    && cd /setup/ && poetry install 
+    && cd /setup/ && ~/.local/share/pypoetry/bin/poetry install 
diff --git a/bin/packages_setup.bash b/bin/packages_setup.bash
@@ -1,10 +1,7 @@
 #!/bin/bash 
 
-curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
-echo "export PATH=\"$HOME/.poetry/bin:$PATH\"" > ~/.bashrc
-export PATH="$HOME/.poetry/bin:$PATH" 
-poetry config virtualenvs.create false
-
+curl -sSL https://install.python-poetry.org | python -
+~/.local/share/pypoetry/bin/poetry config virtualenvs.create false
 
 curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
       && echo 'deb https://deb.nodesource.com/node_14.x buster main' > /etc/apt/sources.list.d/nodesource.list