Fix --editable install for setuptools>=64, setuptools#3548

OCR-D · Jan 10, 2024 · 944d9e9 · 944d9e9
1 parent 7348770
commit 944d9e9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -30,6 +30,8 @@ jobs:
       - run: sudo make deps-ubuntu 
       - run: make install deps-test
       - run: make test benchmark
+      # smoke test to ensure that --editable install works
+      - run: make install-dev; ocrd --version
 
   test-python38:
     docker:
@@ -41,6 +43,8 @@ jobs:
       - run: sudo make deps-ubuntu
       - run: make install deps-test
       - run: make test benchmark
+      # smoke test to ensure that --editable install works
+      - run: make install-dev; ocrd --version
 
   test-python39:
     docker:
@@ -52,6 +56,8 @@ jobs:
       - run: sudo make deps-ubuntu
       - run: make install deps-test
       - run: make test benchmark
+      # smoke test to ensure that --editable install works
+      - run: make install-dev; ocrd --version
 
   test-python310:
     docker:
@@ -63,6 +69,8 @@ jobs:
       - run: sudo make deps-ubuntu
       - run: make install deps-test
       - run: make test benchmark
+      # smoke test to ensure that --editable install works
+      - run: make install-dev; ocrd --version
 
   test-python311:
     docker:
@@ -74,6 +82,8 @@ jobs:
       - run: sudo make deps-ubuntu
       - run: make install deps-test
       - run: make test benchmark
+      # smoke test to ensure that --editable install works
+      - run: make install-dev; ocrd --version
 
   deploy:
     docker:

diff --git a/Makefile b/Makefile
@@ -49,6 +49,7 @@ help:
 
 # pip install command. Default: $(PIP_INSTALL)
 PIP_INSTALL ?= $(PIP) install
+PIP_INSTALL_CONFIG_OPTION ?=
 
 .PHONY: deps-cuda deps-ubuntu deps-test
 
@@ -125,12 +126,13 @@ build:
 # (Re)install the tool
 install: #build
 #	$(PIP_INSTALL) $(BUILD_ORDER:%=./%/dist/ocrd*`$(PYTHON) -m setuptools_scm 2>/dev/null`*.whl)
-	$(foreach MODULE,$(BUILD_ORDER),$(PIP_INSTALL) ./$(MODULE) &&) echo done
+	$(foreach MODULE,$(BUILD_ORDER),$(PIP_INSTALL) ./$(MODULE) $(PIP_INSTALL_CONFIG_OPTION) &&) echo done
 	@# workaround for shapely#1598
 	$(PIP) config set global.no-binary shapely
 
 # Install with pip install -e
-install-dev: PIP_INSTALL = $(PIP) install -e
+install-dev: PIP_INSTALL = $(PIP) install -e 
+install-dev: PIP_INSTALL_CONFIG_OPTION = --config-settings editable_mode=strict
 install-dev: uninstall
 	$(MAKE) install