diff --git a/Makefile b/Makefile index d0dfe5f..77f36bd 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,10 @@ pybinding: venv: ifeq ($(NO_VENV),0) - @virtualenv --python=$(PYTHON_EXE) --prompt="(msspec-$(VERSION)) " $(VENV_PATH) +# @virtualenv --python=$(PYTHON_EXE) --prompt="(msspec-$(VERSION)) " $(VENV_PATH) + $(PYTHON) -m venv $(VENV_PATH) $(INSIDE_VENV) python -m ensurepip --upgrade + $(INSIDE_VENV) pip install -r src/pip.freeze endif # wget https://bootstrap.pypa.io/get-pip.py && \ @@ -24,7 +26,7 @@ endif install: venv pybinding wx @+$(INSIDE_VENV) $(MAKE) -C src sdist @+$(INSIDE_VENV) $(MAKE) -C src frontend - @+$(INSIDE_VENV) pip install src/dist/msspec-$(VERSION)*.whl + @+$(INSIDE_VENV) pip install --force-reinstall src/dist/msspec-$(VERSION)*.whl @echo "Do not forget to check that $(INSTALL_PREFIX)/bin is set in your \$$PATH" diff --git a/src/options.mk b/src/options.mk index 5e08919..b254cb1 100644 --- a/src/options.mk +++ b/src/options.mk @@ -1,4 +1,4 @@ -PYTHON = python +PYTHON = python3 PYMAJ = 3 PYMIN = 5 diff --git a/src/pip.freeze b/src/pip.freeze index 406ab63..871c9b1 100644 --- a/src/pip.freeze +++ b/src/pip.freeze @@ -10,3 +10,5 @@ pycairo scipy setuptools-scm terminaltables +wheel +wxPython