From 809802d920c4d69ea8b6de78cedd08e873bceba5 Mon Sep 17 00:00:00 2001 From: "zhu.boxiang" Date: Fri, 10 Sep 2021 17:56:44 +0800 Subject: [PATCH] fix: Change the version of setuptools The setuptools(>=58.0.0) has removed the support of use_2to3 during build[1]. There is a package named tempita[2] which has set use_2to3 in setup.py. So here, we set the version of setuptools less than 58.0.0 [1]: https://setuptools.readthedocs.io/en/latest/history.html#v58-0-0 [2]: https://github.com/agramfort/tempita/blob/master/setup.py#L53 Change-Id: I0fffaa63eb91c4d4c4bf8d7e149e7087e514aa51 --- Makefile | 2 +- libs/skyline-apiserver/Makefile | 2 +- libs/skyline-config/Makefile | 2 +- libs/skyline-log/Makefile | 2 +- libs/skyline-nginx/Makefile | 2 +- libs/skyline-policy-manager/Makefile | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 488c8d7..a339ee7 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ venv: git_config .PHONY: install $(INSTALL_LIBS) INSTALL_LIBS := $(addsuffix .install,$(LIB_PATHS)) install: venv $(INSTALL_LIBS) - poetry run pip install -U pip setuptools + poetry run pip install -U pip setuptools'<58.0.0' poetry install -vvv $(INSTALL_LIBS): $(MAKE) -C $(basename $@) install diff --git a/libs/skyline-apiserver/Makefile b/libs/skyline-apiserver/Makefile index c4a2103..502ff34 100644 --- a/libs/skyline-apiserver/Makefile +++ b/libs/skyline-apiserver/Makefile @@ -24,7 +24,7 @@ venv: .PHONY: install install: venv - poetry run pip install -U pip setuptools + poetry run pip install -U pip setuptools'<58.0.0' poetry install -vvv diff --git a/libs/skyline-config/Makefile b/libs/skyline-config/Makefile index 4f08377..552dbbb 100644 --- a/libs/skyline-config/Makefile +++ b/libs/skyline-config/Makefile @@ -12,7 +12,7 @@ venv: .PHONY: install install: venv - poetry run pip install -U pip setuptools + poetry run pip install -U pip setuptools'<58.0.0' poetry install -vvv diff --git a/libs/skyline-log/Makefile b/libs/skyline-log/Makefile index 4f08377..552dbbb 100644 --- a/libs/skyline-log/Makefile +++ b/libs/skyline-log/Makefile @@ -12,7 +12,7 @@ venv: .PHONY: install install: venv - poetry run pip install -U pip setuptools + poetry run pip install -U pip setuptools'<58.0.0' poetry install -vvv diff --git a/libs/skyline-nginx/Makefile b/libs/skyline-nginx/Makefile index 4f08377..552dbbb 100644 --- a/libs/skyline-nginx/Makefile +++ b/libs/skyline-nginx/Makefile @@ -12,7 +12,7 @@ venv: .PHONY: install install: venv - poetry run pip install -U pip setuptools + poetry run pip install -U pip setuptools'<58.0.0' poetry install -vvv diff --git a/libs/skyline-policy-manager/Makefile b/libs/skyline-policy-manager/Makefile index 96f8423..32c9cb4 100644 --- a/libs/skyline-policy-manager/Makefile +++ b/libs/skyline-policy-manager/Makefile @@ -12,8 +12,7 @@ venv: .PHONY: install install: venv - poetry run pip install -U pip setuptools - poetry run pip install tempita==0.5.2 + poetry run pip install -U pip setuptools'<58.0.0' poetry install -vvv tools/post_install.sh