diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d81f29fe862c7d1caef4a2bd383e6d07db2cb1c1..5844dc8468d0643404b78c5ff2b5d026774f4b6b 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 98399d3319fbddbdf40543dea39114335e9721b6..92dc9cd0ab36ab2f764845776b6e33e2edc8cf6c 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 f13a75ee9fc62295407d782f0d377cf3395d8989..2d31f8d7acf3243e00b6416eb0428bc6a1e4ecc0 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__"}