From d615852296e046af0614dea656ba797aa94d3c65 Mon Sep 17 00:00:00 2001 From: Daniel Paley Date: Mon, 24 Mar 2025 13:30:57 -0400 Subject: [PATCH 1/3] use ply main branch instead of release --- Makefile | 9 +++------ Makefile_DIALS | 9 +++------ Makefile_LINUX | 9 +++------ Makefile_MINGW | 9 +++------ Makefile_MSYS2 | 12 +++--------- Makefile_OSX | 9 +++------ m4/Makefile.m4 | 9 +++------ 7 files changed, 21 insertions(+), 45 deletions(-) diff --git a/Makefile b/Makefile index 595955ef..9b415be0 100644 --- a/Makefile +++ b/Makefile @@ -329,7 +329,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) # Definitions to get versions of python3 PyCifRW and PLY # PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21 -PY3PLY = ply-3.11 +PY3PLY = ply PY3CIFRWFLAG = -DCBF_USE_PYCIFRW PY3CIFRW_PREFIX ?= $(HOME)/.local endif @@ -765,7 +765,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz endif ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz -PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz +PY3PLYURL = https://github.com/dabeaz/ply.git endif REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz @@ -1513,10 +1513,7 @@ build_py3ply: $(M4)/Makefile.m4 touch build_py3ply $(PY3PLY): build_py3ply -rm -rf $(PY3PLY) - -rm -rf $(PY3PLY).tar.gz - $(DOWNLOAD) $(PY3PLYURL) - tar -xvf $(PY3PLY).tar.gz - -rm $(PY3PLY).tar.gz + git clone $(PY3PLYURL) (cd $(PY3PLY); \ PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \ mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \ diff --git a/Makefile_DIALS b/Makefile_DIALS index d5e302db..4607a1cd 100644 --- a/Makefile_DIALS +++ b/Makefile_DIALS @@ -327,7 +327,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) # Definitions to get versions of python3 PyCifRW and PLY # PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21 -PY3PLY = ply-3.11 +PY3PLY = ply PY3CIFRWFLAG = -DCBF_USE_PYCIFRW PY3CIFRW_PREFIX ?= $(HOME)/.local endif @@ -694,7 +694,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz endif ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz -PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz +PY3PLYURL = https://github.com/dabeaz/ply.git endif REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz @@ -1379,10 +1379,7 @@ build_py3ply: $(M4)/Makefile.m4 touch build_py3ply $(PY3PLY): build_py3ply -rm -rf $(PY3PLY) - -rm -rf $(PY3PLY).tar.gz - $(DOWNLOAD) $(PY3PLYURL) - tar -xvf $(PY3PLY).tar.gz - -rm $(PY3PLY).tar.gz + git clone $(PY3PLYURL) (cd $(PY3PLY); \ PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \ mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \ diff --git a/Makefile_LINUX b/Makefile_LINUX index dc66bbf0..e01aabd1 100644 --- a/Makefile_LINUX +++ b/Makefile_LINUX @@ -329,7 +329,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) # Definitions to get versions of python3 PyCifRW and PLY # PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21 -PY3PLY = ply-3.11 +PY3PLY = ply PY3CIFRWFLAG = -DCBF_USE_PYCIFRW PY3CIFRW_PREFIX ?= $(HOME)/.local endif @@ -761,7 +761,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz endif ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz -PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz +PY3PLYURL = https://github.com/dabeaz/ply.git endif REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz @@ -1509,10 +1509,7 @@ build_py3ply: $(M4)/Makefile.m4 touch build_py3ply $(PY3PLY): build_py3ply -rm -rf $(PY3PLY) - -rm -rf $(PY3PLY).tar.gz - $(DOWNLOAD) $(PY3PLYURL) - tar -xvf $(PY3PLY).tar.gz - -rm $(PY3PLY).tar.gz + git clone $(PY3PLYURL) (cd $(PY3PLY); \ PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \ mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \ diff --git a/Makefile_MINGW b/Makefile_MINGW index ab81b8c0..7fbd947d 100644 --- a/Makefile_MINGW +++ b/Makefile_MINGW @@ -329,7 +329,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) # Definitions to get versions of python3 PyCifRW and PLY # PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21 -PY3PLY = ply-3.11 +PY3PLY = ply PY3CIFRWFLAG = -DCBF_USE_PYCIFRW PY3CIFRW_PREFIX ?= $(HOME)/.local endif @@ -775,7 +775,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz endif ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz -PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz +PY3PLYURL = https://github.com/dabeaz/ply.git endif REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz @@ -1523,10 +1523,7 @@ build_py3ply: $(M4)/Makefile.m4 touch build_py3ply $(PY3PLY): build_py3ply -rm -rf $(PY3PLY) - -rm -rf $(PY3PLY).tar.gz - $(DOWNLOAD) $(PY3PLYURL) - tar -xvf $(PY3PLY).tar.gz - -rm $(PY3PLY).tar.gz + git clone $(PY3PLYURL) (cd $(PY3PLY); \ PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \ mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \ diff --git a/Makefile_MSYS2 b/Makefile_MSYS2 index 54a71587..3d6c4b63 100644 --- a/Makefile_MSYS2 +++ b/Makefile_MSYS2 @@ -328,7 +328,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) # Definitions to get versions of python3 PyCifRW and PLY # PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21 -PY3PLY = ply-3.11 +PY3PLY = ply PY3CIFRWFLAG = -DCBF_USE_PYCIFRW PY3CIFRW_PREFIX ?= $(HOME)/.local endif @@ -760,7 +760,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz endif ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz -PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz +PY3PLYURL = https://github.com/dabeaz/ply.git endif REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz @@ -1508,13 +1508,7 @@ build_py3ply: $(M4)/Makefile.m4 touch build_py3ply $(PY3PLY): build_py3ply -rm -rf $(PY3PLY) - -rm -rf $(PY3PLY).tar.gz - $(DOWNLOAD) $(PY3PLYURL) - tar -xvf $(PY3PLY).tar.gz - -rm $(PY3PLY).tar.gz - (cd $(PY3PLY); \ - PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \ - mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \ + git clone $(PY3PLY); \ mkdir -p $(PY3CIFRW_PREFIX)/lib64/python/site-packages; \ $(PYTHON3) -m build --config-setting=install -C--prefix= -C--home=$(PY3CIFRW_PREFIX) ) endif diff --git a/Makefile_OSX b/Makefile_OSX index a68bc3e7..f84b5aec 100644 --- a/Makefile_OSX +++ b/Makefile_OSX @@ -329,7 +329,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) # Definitions to get versions of python3 PyCifRW and PLY # PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21 -PY3PLY = ply-3.11 +PY3PLY = ply PY3CIFRWFLAG = -DCBF_USE_PYCIFRW PY3CIFRW_PREFIX ?= $(HOME)/.local endif @@ -759,7 +759,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz endif ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz -PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz +PY3PLYURL = https://github.com/dabeaz/ply.git endif REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz @@ -1507,10 +1507,7 @@ build_py3ply: $(M4)/Makefile.m4 touch build_py3ply $(PY3PLY): build_py3ply -rm -rf $(PY3PLY) - -rm -rf $(PY3PLY).tar.gz - $(DOWNLOAD) $(PY3PLYURL) - tar -xvf $(PY3PLY).tar.gz - -rm $(PY3PLY).tar.gz + git clone $(PY3PLYURL) (cd $(PY3PLY); \ PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \ mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \ diff --git a/m4/Makefile.m4 b/m4/Makefile.m4 index e1ab317a..0f14aa05 100644 --- a/m4/Makefile.m4 +++ b/m4/Makefile.m4 @@ -336,7 +336,7 @@ ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) # Definitions to get versions of python3 PyCifRW and PLY # PY3CIFRW ?= PyCifRW-4.3_rev_19Jun21 -PY3PLY = ply-3.11 +PY3PLY = ply PY3CIFRWFLAG = -DCBF_USE_PYCIFRW PY3CIFRW_PREFIX ?= $(HOME)/.local endif @@ -1134,7 +1134,7 @@ PY2PLYURL = http://www.dabeaz.com/ply/$(PY2PLY).tar.gz endif ifneq ($(CBFLIB_DONT_USE_PY3CIFRW),yes) PY3CIFRWURL = http://downloads.sf.net/cbflib/$(PY3CIFRW).tar.gz -PY3PLYURL = http://downloads.sf.net/cbflib/$(PY3PLY).tar.gz +PY3PLYURL = https://github.com/dabeaz/ply.git endif REGEX_URL ?= http://downloads.sf.net/cbflib/$(REGEX).tar.gz TIFF_URL ?= http://downloads.sf.net/cbflib/$(TIFF).tar.gz @@ -1882,10 +1882,7 @@ build_py3ply: $(M4)/Makefile.m4 touch build_py3ply $(PY3PLY): build_py3ply -rm -rf $(PY3PLY) - -rm -rf $(PY3PLY).tar.gz - $(DOWNLOAD) $(PY3PLYURL) - tar -xvf $(PY3PLY).tar.gz - -rm $(PY3PLY).tar.gz + git clone $(PY3PLYURL) (cd $(PY3PLY); \ PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \ mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \ From fd8486be5e9a65a024b5d0a64157809823cf8cb1 Mon Sep 17 00:00:00 2001 From: Daniel Paley Date: Mon, 24 Mar 2025 16:00:55 -0400 Subject: [PATCH 2/3] fix copy-paste error --- Makefile_MSYS2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile_MSYS2 b/Makefile_MSYS2 index 3d6c4b63..1cb6854e 100644 --- a/Makefile_MSYS2 +++ b/Makefile_MSYS2 @@ -1508,7 +1508,10 @@ build_py3ply: $(M4)/Makefile.m4 touch build_py3ply $(PY3PLY): build_py3ply -rm -rf $(PY3PLY) - git clone $(PY3PLY); \ + git clone $(PY3PLYURL) + (cd $(PY3PLY); \ + PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \ + mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \ mkdir -p $(PY3CIFRW_PREFIX)/lib64/python/site-packages; \ $(PYTHON3) -m build --config-setting=install -C--prefix= -C--home=$(PY3CIFRW_PREFIX) ) endif From 1900d6f100e93e32525aabb2a838a2d53db1bb09 Mon Sep 17 00:00:00 2001 From: "Herbert J. Bernstein" Date: Fri, 5 Sep 2025 22:18:36 -0400 Subject: [PATCH 3/3] Update Makefile.m4 --- m4/Makefile.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/Makefile.m4 b/m4/Makefile.m4 index 0f14aa05..82b1325e 100644 --- a/m4/Makefile.m4 +++ b/m4/Makefile.m4 @@ -1882,7 +1882,7 @@ build_py3ply: $(M4)/Makefile.m4 touch build_py3ply $(PY3PLY): build_py3ply -rm -rf $(PY3PLY) - git clone $(PY3PLYURL) + wget -O - -nv $(PY3PLYURL) | tar -xzf - (cd $(PY3PLY); \ PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \ mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \