From b2ac8529ef65cae9dc95c17fa23b7f3af286a363 Mon Sep 17 00:00:00 2001 From: Josh Chorlton Date: Sun, 22 Sep 2024 18:32:38 +0000 Subject: [PATCH 1/3] builds --- OGDF/makeMakefile.py | 6 +++--- install.sh | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 install.sh diff --git a/OGDF/makeMakefile.py b/OGDF/makeMakefile.py index 9c61506..e0141de 100755 --- a/OGDF/makeMakefile.py +++ b/OGDF/makeMakefile.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3 # Make Makefile # # October 2012 @@ -74,7 +74,7 @@ def checkSolver(name, defSolver, extSolvers): print('Loading makeMakefile.config...') try: - config.readfp(open('makeMakefile.config')) + config.readfp(open('makeMakefile.config')) # TODO DeprecationWarning: This method will be removed in Python 3.12. Use 'parser.read_file()' instead. except IOError: bailout('makeMakefile.config not found') @@ -278,7 +278,7 @@ def Walk(curdir): for v in versions: # print target&depend: add full path spec, incl. version & ignore extra line path = v.call() + '/' +fullname[:-len(name)] - makefile.write(path + targetAndDepend[:-1] + '\n') + makefile.write(path + targetAndDepend.decode()[:-1] + '\n') # ensure folder makefile.write('\t$(MKDIR) ' + v.call() + '/' + fullname[:-len(name)-1] + '\n') diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 index cd73156..f18b4d9 --- a/install.sh +++ b/install.sh @@ -1,5 +1,6 @@ #!/bin/bash +set -euo pipefail #install OGDF cd OGDF From 7f56a09997e0306cf446e5d7a909757818520663 Mon Sep 17 00:00:00 2001 From: Josh Chorlton Date: Sun, 22 Sep 2024 18:47:08 +0000 Subject: [PATCH 2/3] adding .gitignore --- .gitignore | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..87da9de --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +# generated files +OGDF/Makefile +OGDF/_release/ +OGDF/include/coin/config.h +OGDF/include/ogdf/internal/config_autogen.h +OGDF/ogdf.pc +OGDF/test/test-release + +# binaries +bundler +libcorrect +orientcontigs +spqr From e2587d4dee471289625fc4f2abf7c62a13971b58 Mon Sep 17 00:00:00 2001 From: Josh Chorlton Date: Sun, 22 Sep 2024 18:59:33 +0000 Subject: [PATCH 3/3] python 3.12 compat --- OGDF/makeMakefile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OGDF/makeMakefile.py b/OGDF/makeMakefile.py index e0141de..9abfc20 100755 --- a/OGDF/makeMakefile.py +++ b/OGDF/makeMakefile.py @@ -74,7 +74,8 @@ def checkSolver(name, defSolver, extSolvers): print('Loading makeMakefile.config...') try: - config.readfp(open('makeMakefile.config')) # TODO DeprecationWarning: This method will be removed in Python 3.12. Use 'parser.read_file()' instead. + with open('makeMakefile.config') as makefile_config_f: + config.read_file(makefile_config_f) except IOError: bailout('makeMakefile.config not found')