From 4ef134188329c9ae16d46dc20d41e9d69b43ecf2 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 3 Jun 2022 21:21:44 +0200 Subject: [PATCH] Remove old import of distutils --- implementations/python/.envrc | 11 ++++++++--- implementations/python/setup.py | 5 +---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/implementations/python/.envrc b/implementations/python/.envrc index 71ab1d4..a500642 100644 --- a/implementations/python/.envrc +++ b/implementations/python/.envrc @@ -1,3 +1,8 @@ -[ -d .venv ] || python -m venv .venv -. .venv/bin/activate -pip install -U coverage setuptools setuptools_scm wheel +if ! [ -d .venv ] +then + python -m venv .venv + . .venv/bin/activate + pip install -U coverage setuptools setuptools_scm wheel +else + . .venv/bin/activate +fi diff --git a/implementations/python/setup.py b/implementations/python/setup.py index 7405409..5fb4848 100644 --- a/implementations/python/setup.py +++ b/implementations/python/setup.py @@ -1,7 +1,4 @@ -try: - from setuptools import setup -except ImportError: - from distutils.core import setup +from setuptools import setup setup( name="preserves",