From f391cde930fd2dfeb01be0a8faaef46f5df2df51 Mon Sep 17 00:00:00 2001 From: Theophile du Laz Date: Thu, 18 Jan 2024 13:40:34 -0800 Subject: [PATCH] Install packaging first separately (#375) --- Makefile | 1 + requirements.txt | 1 - tools/check_app_environment.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ad58223..bcefe49 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,7 @@ help: @python ./baselayer/tools/makefile_to_help.py $(MAKEFILE_LIST) dependencies: README.md + @PYTHONPATH=. pip install packaging @baselayer/tools/check_app_environment.py @PYTHONPATH=. python baselayer/tools/pip_install_requirements.py baselayer/requirements.txt requirements.txt @./baselayer/tools/silent_monitor.py baselayer/tools/check_js_deps.sh diff --git a/requirements.txt b/requirements.txt index ade94e4..d477f37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -packaging # only needed until python 3.10 supervisor>=4.2.1 psycopg2-binary>=2.8.6 pyyaml>=5.3.1 diff --git a/tools/check_app_environment.py b/tools/check_app_environment.py index 7448053..8277173 100755 --- a/tools/check_app_environment.py +++ b/tools/check_app_environment.py @@ -3,8 +3,8 @@ import subprocess import sys import textwrap -from packaging.version import Version +from packaging.version import Version from status import status