Skip to content

Commit

Permalink
More standard installation (#2508)
Browse files Browse the repository at this point in the history
Signed-off-by: David Hotham <david.hotham@blueyonder.co.uk>
  • Loading branch information
dimbleby authored Feb 27, 2025
1 parent 7f49fac commit 70bacde
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,12 @@ install-sysdeps:

install-pydeps-test: ## Install python deps necessary to run unit tests.
${MAKE} install-pip
$(PYTHON) -m pip install $(PIP_INSTALL_ARGS) pip setuptools
$(PYTHON) -m pip install $(PIP_INSTALL_ARGS) `$(PYTHON) -c "import setup; print(' '.join(setup.TEST_DEPS))"`
$(PYTHON) -m pip install $(PIP_INSTALL_ARGS) -e .[test]

install-pydeps-dev: ## Install python deps meant for local development.
${MAKE} install-git-hooks
${MAKE} install-pip
$(PYTHON) -m pip install $(PIP_INSTALL_ARGS) pip setuptools
$(PYTHON) -m pip install $(PIP_INSTALL_ARGS) `$(PYTHON) -c "import setup; print(' '.join(setup.TEST_DEPS + setup.DEV_DEPS))"`
$(PYTHON) -m pip install $(PIP_INSTALL_ARGS) -e .[test,dev]

install-git-hooks: ## Install GIT pre-commit hook.
ln -sf ../../scripts/internal/git_pre_commit.py .git/hooks/pre-commit
Expand Down
10 changes: 2 additions & 8 deletions scripts/internal/winmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@

sys.path.insert(0, ROOT_DIR) # so that we can import setup.py

import setup # noqa: E402


TEST_DEPS = setup.TEST_DEPS
DEV_DEPS = setup.DEV_DEPS

_cmds = {}

GREEN = 2
Expand Down Expand Up @@ -302,14 +296,14 @@ def install_pydeps_test():
"""Install useful deps."""
install_pip()
install_git_hooks()
sh([PYTHON, "-m", "pip", "install", "--user", "-U"] + TEST_DEPS)
sh([PYTHON, "-m", "pip", "install", "--user", "-U", "-e", ".[test]"])


def install_pydeps_dev():
"""Install useful deps."""
install_pip()
install_git_hooks()
sh([PYTHON, "-m", "pip", "install", "--user", "-U"] + DEV_DEPS)
sh([PYTHON, "-m", "pip", "install", "--user", "-U", "-e", ".[dev]"])


def test(args=None):
Expand Down

0 comments on commit 70bacde

Please sign in to comment.