Use poetry 1.0.0b7 until MSYS2 issues are fixed
This commit is contained in:
parent
493614765d
commit
4ef319fd75
@ -100,5 +100,5 @@ skip_glob = "*/uml2.py"
|
||||
filter_files = true
|
||||
|
||||
[build-system]
|
||||
requires = ["poetry==1.0.2"]
|
||||
requires = ["poetry==1.0.0b7"]
|
||||
build-backend = "poetry.masonry.api"
|
||||
|
16
venv
16
venv
@ -9,6 +9,7 @@
|
||||
# Call `./venv -f` to force a new development installation.
|
||||
#
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
|
||||
# If on Macos with brew, make sure we can find the brewed libffi (which is not "linked"):
|
||||
echo "Are we on Macos with Homebrew installed?"
|
||||
@ -62,18 +63,19 @@ uname -a | grep -q MSYS_NT && {
|
||||
|
||||
PYTHON_VER="$(python3 --version | sed 's/^Python \([0-9]\.[0-9]\).[0-9]$/\1/')"
|
||||
|
||||
test -d .venv || {
|
||||
test -d $DIR/.venv || {
|
||||
echo "Setting up a virtual env for Gaphor..."
|
||||
python3 -m venv --prompt Gaphor ${VENV_OPTS:-} .venv
|
||||
python3 -m venv --prompt Gaphor ${VENV_OPTS:-} $DIR/.venv
|
||||
}
|
||||
|
||||
source .venv/bin/activate
|
||||
source $DIR/.venv/bin/activate
|
||||
|
||||
{ ${NO_FORCE_INSTALL} && test -f .venv/lib/python${PYTHON_VER}/site-packages/gaphor.egg-link; } || {
|
||||
{ ${NO_FORCE_INSTALL} && test -f $DIR/.venv/lib/python${PYTHON_VER}/site-packages/gaphor.egg-link; } || {
|
||||
echo "Installing Gaphor in the virtualenv..."
|
||||
pip install -U pip
|
||||
pip install --upgrade poetry==1.0.2
|
||||
|
||||
# Use 1.0.0b7 until https://github.com/python-poetry/poetry/issues/1880 is fixed
|
||||
pip install --upgrade poetry==1.0.0b7
|
||||
poetry config virtualenvs.create false
|
||||
poetry install
|
||||
}
|
||||
|
||||
@ -101,4 +103,4 @@ uname -a | grep -q MSYS_NT && {
|
||||
"import gaphor.UML" \
|
||||
"Gaphor was not installed properly, that should not have happened. Please open an issue on GitHub"
|
||||
|
||||
) && source .venv/bin/activate
|
||||
) && source $DIR/.venv/bin/activate
|
||||
|
Loading…
x
Reference in New Issue
Block a user