Skip to content

Commit

Permalink
Enable running tests via nix
Browse files Browse the repository at this point in the history
Not sure why we had the $(bindir) python prefix, to support multiple
installed pythons perhaps?
  • Loading branch information
NasaGeek committed Nov 18, 2021
1 parent 6bb7a84 commit feaf239
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ TCL_UNDEFS = -UPACKAGE_NAME -UPACKAGE_TARNAME -UPACKAGE_VERSION -UPACKAGE_STRING

EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR)
#EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR)
TCLLIBPATH = $(top_builddir)
TCLLIBPATH ?= $(top_builddir)
TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library`
PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
PATH="$(EXTRA_PATH):$(PATH)" \
Expand Down Expand Up @@ -239,7 +239,7 @@ install-doc: doc

test: binaries libraries
@echo "PYTHON TESTS"
cd tests && $(bindir)/python3 -m unittest
cd tests && python3 -m unittest
@echo "TCL TESTS"
cd tests && $(TCLSH) all.tcl

Expand Down Expand Up @@ -455,10 +455,10 @@ uninstall-binaries:
# tohil python stuff
#
build-python-module:
$(bindir)/python3 setup.py build
python3 setup.py build

install-python-module:
$(bindir)/python3 setup.py install
python3 setup.py install

clean-python-module:
rm -rf build/ dist/ pysrc/tohil.egg-info/ tests/__pycache__/
Expand Down
1 change: 1 addition & 0 deletions setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ setup(
# For an analysis of "install_requires" vs pip's requirements files see:
# https://packaging.python.org/en/latest/requirements.html
# install_requires=['peppercorn'], # Optional
tests_require=["hypothesis"],
# List additional groups of dependencies here (e.g. development
# dependencies). Users will be able to install these using the "extras"
# syntax, for example:
Expand Down

0 comments on commit feaf239

Please sign in to comment.