From 868a0396be755a4000419a3e89ede04212b97127 Mon Sep 17 00:00:00 2001 From: Marc Culler Date: Mon, 2 Dec 2024 15:07:19 -0600 Subject: [PATCH] fix illegal escape sequences, update macOS_app --- .gitignore | 2 ++ dev/extended_ptolemy/extended.py | 6 +++--- dev/extended_ptolemy/phc_wrapper.py | 20 +++++++++---------- .../{entitlement.plist => entitlements.plist} | 0 macOS_app/setup.py | 4 +++- 5 files changed, 18 insertions(+), 14 deletions(-) rename macOS_app/{entitlement.plist => entitlements.plist} (100%) diff --git a/.gitignore b/.gitignore index 41c0ae7c1..9e4e58c40 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ dist/ build/ +notabot.cfg +Frameworks* old/ __pycache__/ .DS_Store diff --git a/dev/extended_ptolemy/extended.py b/dev/extended_ptolemy/extended.py index c33bc5d9e..95d2e0bbe 100644 --- a/dev/extended_ptolemy/extended.py +++ b/dev/extended_ptolemy/extended.py @@ -153,7 +153,7 @@ def simplify_equation(poly): def extended_ptolemy_equations(manifold, gen_obs_class=None, nonzero_cond=True, return_full_var_dict = False, notation = 'short'): - """ + r""" We assign ptolemy coordinates ['a', 'b', 'c', 'd', 'e', 'f'] to the *directed* edges:: @@ -165,12 +165,12 @@ def extended_ptolemy_equations(manifold, gen_obs_class=None, 1 /|\ - d/ | \e + d / | \ e / | \ / | \ 2----|----3 with back edge from 2 to 3 labelled f. \ | / - b\ |a /c + b \ |a / c \ | / \|/ 0 diff --git a/dev/extended_ptolemy/phc_wrapper.py b/dev/extended_ptolemy/phc_wrapper.py index 104739e13..c2d937154 100644 --- a/dev/extended_ptolemy/phc_wrapper.py +++ b/dev/extended_ptolemy/phc_wrapper.py @@ -41,9 +41,9 @@ def restore_forbidden(var_str): def ideal_to_file(ideal, filename): outfile = open(filename, 'w') polys = ideal.gens() - outfile.write('%d\n' % len(polys)) + outfile.write(r'%d\n' % len(polys)) for p in polys: - outfile.write(' ' + remove_forbidden(repr(p)) + ';\n') + outfile.write(' ' + remove_forbidden(repr(p)) + r';\n') outfile.close() def parse_file(filename, prec=53): @@ -55,14 +55,14 @@ def parse_file(filename, prec=53): data = data.split('THE SOLUTIONS')[-1] data = re.subn('[*]{3,}', '', data)[0] ans = [] - solutions = re.findall('(solution \d+ : \s* start residual .*?) ==', data, re.DOTALL) + solutions = re.findall(r'(solution \d+ : \s* start residual .*?) ==', data, re.DOTALL) for sol in solutions: kind = sol.split('=')[-1].strip() if kind == 'no solution': continue - mult = int(re.search('^m : (\d+)', sol, re.MULTILINE).group(1)) - err = float(re.search('== err :\s+(.*?)\s+= ', sol).group(1)) - coors = re.findall('^ (.*) :\s+(\S*)\s+(\S*)', sol, re.MULTILINE) + mult = int(re.search(r'^m : (\d+)', sol, re.MULTILINE).group(1)) + err = float(re.search(r'== err :\s+(.*?)\s+= ', sol).group(1)) + coors = re.findall(r'^ (.*) :\s+(\S*)\s+(\S*)', sol, re.MULTILINE) if kind.startswith('real'): coors = {restore_forbidden(var):RR(real) for var, real, imag in coors} ans.append({'kind':'real', 'mult':mult, 'err':err, 'coors':coors}) @@ -70,8 +70,8 @@ def parse_file(filename, prec=53): coors = {restore_forbidden(var):CC(RR(real), RR(imag)) for var, real, imag in coors} ans.append({'kind':'complex', 'mult':mult, 'err':err, 'coors':coors}) - num_real = int(re.search('Number of real solutions\s+:\s(.*).', data).group(1)) - num_complex = int(re.search('Number of complex solutions\s+:\s(.*).', data).group(1)) + num_real = int(re.search(r'Number of real solutions\s+:\s(.*).', data).group(1)) + num_complex = int(re.search(r'Number of complex solutions\s+:\s(.*).', data).group(1)) kinds = [sol['kind'] for sol in ans] assert kinds.count('real') == num_real assert kinds.count('complex') == num_complex @@ -185,9 +185,9 @@ def direct_hack(backend, ideal, **kwargs): polys = [repr(eqn) for eqn in ideal.gens()] data = {'backend':backend, 'vars':vars, 'polys':polys, 'kwargs':kwargs} - problem_data = json.dumps(data).encode('base64').replace('\n', '') + problem_data = json.dumps(data).encode('base64').replace(r'\n', '') ans_data = os.popen('sage -python ' + __file__ + ' ' + problem_data).read() - ans_data = re.sub('PHCv.*? released .*? works!\n', '', ans_data) + ans_data = re.sub(r'PHCv.*? released .*? works!\n', '', ans_data) if len(ans_data): ans = json.loads(ans_data) for sol in ans: diff --git a/macOS_app/entitlement.plist b/macOS_app/entitlements.plist similarity index 100% rename from macOS_app/entitlement.plist rename to macOS_app/entitlements.plist diff --git a/macOS_app/setup.py b/macOS_app/setup.py index 2ee881337..3550f91db 100644 --- a/macOS_app/setup.py +++ b/macOS_app/setup.py @@ -54,7 +54,9 @@ def run(self): APP = ['SnapPyApp.py'] DATA_FILES = ['SnapPy.sdef'] OPTIONS = {'argv_emulation': False, - 'excludes': 'scipy,numpy,wx,wxversion,wxPython,matplotlib,sphinx,idlelib,docutils,curses,cython,Cython,pandas,OpenGL', + 'excludes': 'scipy,numpy,wx,wxversion,wxPython,matplotlib,sphinx,' + 'idlelib,docutils,curses,cython,Cython,pandas,OpenGL,' + 'setuptools,test', 'packages': packages, 'includes': 'tkinter,gzip,tarfile,readline,pydoc,fractions', 'iconfile': 'icons/SnapPy.icns',