diff --git a/README.md b/README.md index c9085f52..8c6b7978 100644 --- a/README.md +++ b/README.md @@ -74,13 +74,11 @@ Once the clone is complete, you have two options: 1. Using Poetry - ```shell - cd python-open-controls - ./setup-poetry.sh - ``` + Follow the instructions from the + [Poetry documentation](https://python-poetry.org/docs/#installation) to + install Poetry. - **Note:** if you are on Windows, you'll need to install - [Poetry](https://poetry.eustace.io) manually, and use: + After you have installed Poetry, use: ```bash cd python-open-controls diff --git a/README.rst b/README.rst index 42486e6f..55745b87 100644 --- a/README.rst +++ b/README.rst @@ -95,13 +95,11 @@ Once the clone is complete, you have two options: #. Using Poetry - .. code-block:: shell - - cd python-open-controls - ./setup-poetry.sh + Follow the instructions from the + `Poetry documentation `_ to + install Poetry. - **Note:** if you are on Windows, you'll need to install - `Poetry `_ manually, and use: + After you have installed Poetry, use: .. code-block:: bash diff --git a/docs/installation.rst b/docs/installation.rst index 3c137b2e..a01650b0 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -57,13 +57,11 @@ Once the clone is complete, you have two options: #. Using Poetry - .. code-block:: shell - - cd python-open-controls - ./setup-poetry.sh + Follow the instructions from the + `Poetry documentation `_ to + install Poetry. - **Note:** if you are on Windows, you'll need to install - `Poetry `_ manually, and use: + After you have installed Poetry, use: .. code-block:: shell diff --git a/setup-poetry.sh b/setup-poetry.sh deleted file mode 100755 index 19ab3b9e..00000000 --- a/setup-poetry.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -echo "--- Checking appropriate prerequisites are installed." - -# Check correct version of Python -python -V | grep 3.7 -if [ $? -ne 0 ] -then - echo "Please ensure you have Python 3.7 activated. Pyenv is recommended." - exit 1 -fi - -# Check Poetry installed -poetry --version | grep 0.12 -if [ $? -ne 0 ] -then - echo "--- Poetry not detected, installing..." - curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python -fi - -# Do dry run to create virtual environment -echo "--- Using Poetry to create virtual environment" -poetry install --dry-run -q - -# Activate created virtual environment -echo "--- Activating virtual environment" -VIRTUAL_ENV=$(poetry run python -c "import os; print(os.environ['VIRTUAL_ENV'])") -echo "Virtual environment path is $VIRTUAL_ENV" -source $VIRTUAL_ENV/bin/activate -if [ $? -ne 0 ] -then - echo "Could not activate the virtual environment!" - exit 2 -fi - -echo "--- Updating pip and setuptools" -pip install -q --upgrade pip setuptools -deactivate - -# Do the final install -echo "--- Installing dependencies" -poetry update \ No newline at end of file