| 1 |
jlec 10/04/22 19:25:30 |
| 2 |
|
| 3 |
Added: 0.3.1.6-fix-syntax.patch |
| 4 |
Log: |
| 5 |
Version Bump #316579, fixes for new PYTHON ABI things |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-chemistry/xia2/files/0.3.1.6-fix-syntax.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/xia2/files/0.3.1.6-fix-syntax.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/xia2/files/0.3.1.6-fix-syntax.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 0.3.1.6-fix-syntax.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/xia2-0.3.1.6/Applications/xia2find.py b/xia2-0.3.1.6/Applications/xia2find.py |
| 17 |
index 1a3b0e2..e0b8a1e 100755 |
| 18 |
--- a/xia2-0.3.1.6/Applications/xia2find.py |
| 19 |
+++ b/xia2-0.3.1.6/Applications/xia2find.py |
| 20 |
@@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory |
| 21 |
from Experts.FindImages import image2template_directory |
| 22 |
|
| 23 |
known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450', |
| 24 |
- 'osc', 'cbf', 'mar2000']] |
| 25 |
+ 'osc', 'cbf', 'mar2000'] |
| 26 |
known_sweeps = { } |
| 27 |
|
| 28 |
def is_image_name(file): |
| 29 |
diff --git a/xia2-0.3.1.6/Experts/DRStrategyExpert.py b/xia2-0.3.1.6/Experts/DRStrategyExpert.py |
| 30 |
index 28b1dc3..dba3ef7 100644 |
| 31 |
--- a/xia2-0.3.1.6/Experts/DRStrategyExpert.py |
| 32 |
+++ b/xia2-0.3.1.6/Experts/DRStrategyExpert.py |
| 33 |
@@ -48,24 +48,24 @@ strategy_dict = { |
| 34 |
'default':{ |
| 35 |
'score':1, |
| 36 |
'pipeline':{ |
| 37 |
- 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'} |
| 38 |
+ 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}, |
| 39 |
'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat', |
| 40 |
'pointless-1.1.0.4']}, |
| 41 |
'default':{ |
| 42 |
'score':2, |
| 43 |
'pipeline':{ |
| 44 |
- 'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'} |
| 45 |
+ 'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'}, |
| 46 |
'depends-on':['labelit.screen', 'mosflm', 'scala', 'reindex', |
| 47 |
'pointless-1.1.0.4']}, |
| 48 |
'mosaic':{ |
| 49 |
'score':1, |
| 50 |
'pipeline':{ |
| 51 |
- 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'} |
| 52 |
+ 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}, |
| 53 |
'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat', |
| 54 |
'pointless-1.1.0.4']}, |
| 55 |
'mosaic':{ |
| 56 |
'score':2, |
| 57 |
'pipeline':{ |
| 58 |
- 'indexer':'xds', 'integrater':'xds', 'scaler':'xds'} |
| 59 |
+ 'indexer':'xds', 'integrater':'xds', 'scaler':'xds'}, |
| 60 |
'depends-on':['xds', 'xscale']} |
| 61 |
} |
| 62 |
diff --git a/xia2core-0.3.1.6/Python/Examples/CCP4/Cad.py b/xia2core-0.3.1.6/Python/Examples/CCP4/Cad.py |
| 63 |
index 88f9218..5fb6f2a 100644 |
| 64 |
--- a/xia2core-0.3.1.6/Python/Examples/CCP4/Cad.py |
| 65 |
+++ b/xia2core-0.3.1.6/Python/Examples/CCP4/Cad.py |
| 66 |
@@ -49,8 +49,8 @@ def Cad(DriverType = None): |
| 67 |
self.add_command_line(hklin) |
| 68 |
|
| 69 |
self.set_task('Rewriting reflections %s => %s' % |
| 70 |
- ` (os.path.split(hklin)[-1], |
| 71 |
- ` os.path.split(self.getHklout())[-1])) |
| 72 |
+ (os.path.split(hklin)[-1], |
| 73 |
+ os.path.split(self.getHklout())[-1])) |
| 74 |
|
| 75 |
self.start() |
Archives