Skip to content

use ply main branch instead of release #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dwpaley wants to merge 4 commits into
base: main
Choose a base branch
from
Open

use ply main branch instead of release #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d615852
use ply main branch instead of release
dwpaley Mar 24, 2025
11d9057
Merge branch 'main' into fix_ply
dwpaley Mar 24, 2025
fd8486b
fix copy-paste error
dwpaley Mar 24, 2025
1900d6f
Update Makefile.m4
yayahjb Sep 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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; \
Expand Down
9 changes: 3 additions & 6 deletions Makefile_DIALS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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; \
Expand Down
9 changes: 3 additions & 6 deletions Makefile_LINUX
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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; \
Expand Down
9 changes: 3 additions & 6 deletions Makefile_MINGW
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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; \
Expand Down
9 changes: 3 additions & 6 deletions Makefile_MSYS2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1508,10 +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
git clone $(PY3PLYURL)
(cd $(PY3PLY); \
PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \
Expand Down
9 changes: 3 additions & 6 deletions Makefile_OSX
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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; \
Expand Down
9 changes: 3 additions & 6 deletions m4/Makefile.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
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; \
Expand Down
Loading