From 4079ca6d02ae988bc73eef7e21295c1fe68f3aa6 Mon Sep 17 00:00:00 2001
From: Amandine PERRIN <amandine.perrin@pasteur.fr>
Date: Thu, 7 Sep 2023 11:19:44 +0200
Subject: [PATCH] install dev requirements from pyproject.toml
---
.gitlab-ci.yml | 2 +-
make | 12 ++++++------
pyproject.toml | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d81f29fe..5844dc84 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ build-from-prokka-quicktree:
- install
script:
- pip3 install --upgrade pip
- - pip3 install -r requirements-dev.txt
+ - pip3 install -e .[dev]
- py.test test/test_install/test_make_prokka-quicktree.py -xv
build-from-prodigal:
diff --git a/make b/make
index 98399d33..92dc9cd0 100755
--- a/make
+++ b/make
@@ -86,12 +86,12 @@ def install_all(install_dir, target, dev=False, user=False):
opt = ""
if dev:
logger.info("Installing developer packages needed for PanACoTA")
- cmd = "pip3 install " + opt + " -e ."
- cmd2 = "pip3 install -r requirements-dev.txt"
- error2 = ("Problem while trying to install developer tools. If you have "
- "permission errors, try to add 'sudo' before your command line. If "
- "you do not have root access, install with the '--user' option")
- run_cmd(cmd2, error2, eof=True)
+ cmd = "pip3 install " + opt + " -e .[dev]"
+ # cmd2 = "pip3 install -r requirements-dev.txt"
+ # error2 = ("Problem while trying to install developer tools. If you have "
+ # "permission errors, try to add 'sudo' before your command line. If "
+ # "you do not have root access, install with the '--user' option")
+ # run_cmd(cmd2, error2, eof=True)
else:
cmd = "pip3 install " + opt + " ."
error = ("A problem occurred while trying to install PanACoTA. If you have "
diff --git a/pyproject.toml b/pyproject.toml
index f13a75ee..2d31f8d7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ classifiers = [
"Operating System :: OS Independent",
"Topic :: Scientific/Engineering :: Bio-Informatics",
]
-dynamic = ["version", "readme", "dependencies"]
+dynamic = ["version", "readme", "dependencies", "optional-dependencies"]
[tool.setuptools.dynamic]
version = {attr = "PanACoTA.__init__.__version__"}
--
GitLab