Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
106ee68
Moved into subfolder
paulsbond Mar 3, 2025
b195edf
Added license
paulsbond Mar 3, 2025
d8c28f8
Added pyproject.toml
paulsbond Mar 3, 2025
fe0061f
Remove old code
paulsbond Mar 3, 2025
9b03430
Added __init__.py
paulsbond Mar 3, 2025
487dd69
Remove VERSION file
paulsbond Mar 3, 2025
e665281
Remove pyi2.bat
paulsbond Mar 3, 2025
ae2ecd0
Remove ccp4i2.bat
paulsbond Mar 3, 2025
c942a61
Added README.md
paulsbond Mar 3, 2025
526b74f
Updated .gitignore
paulsbond Mar 4, 2025
e1451c8
Fix for package data in subfolders
paulsbond Mar 4, 2025
a29d1ec
Updated version and changelog
paulsbond Mar 4, 2025
d1f5143
Remove version.params.xml
paulsbond Mar 4, 2025
071128f
Added __init__.py files
paulsbond Mar 4, 2025
3a05230
Update browser.py
paulsbond Mar 4, 2025
887bc6e
Added __main__.py
paulsbond Mar 4, 2025
6aa36e9
Added ccp4i2 script
paulsbond Mar 4, 2025
50abaa5
Updated CCP4I2Runner
paulsbond Mar 4, 2025
62b8e98
Added i2run script
paulsbond Mar 4, 2025
386f053
Remove cmake lines that copy to site-packages
paulsbond Mar 4, 2025
3b9d73e
Merge main into pkg
paulsbond Mar 11, 2025
5bc0f30
Moved to build folder
paulsbond Mar 11, 2025
62daee8
Removed unused webbuttons
paulsbond Mar 11, 2025
2f5d4ad
Moved CCP4SelectionTree
paulsbond Mar 11, 2025
d28183f
Removed unused tasks folder
paulsbond Mar 11, 2025
770032b
Replacing bash script (in progress)
paulsbond Mar 11, 2025
f896ef6
Non-relative imports
paulsbond Mar 12, 2025
4dfb77d
__main__ updates
paulsbond Mar 12, 2025
29ae72a
Update browser.py
paulsbond Mar 12, 2025
c75a138
Remove old bash scripts
paulsbond Mar 12, 2025
72ea2bc
Hiding files that are in .gitignore
paulsbond Mar 12, 2025
86ef970
Updates to startup.py
paulsbond Mar 12, 2025
e371482
Reverting version change
paulsbond Mar 12, 2025
d635893
Archive exe update
paulsbond Mar 12, 2025
cb113fc
Archive updates
paulsbond Mar 12, 2025
25cf02e
Expanded setupEnvironment
paulsbond Mar 12, 2025
b8275dd
Updates to bin scripts from imports
paulsbond Mar 12, 2025
736aa9a
Annotation updates
paulsbond Mar 12, 2025
5494ef2
Removing files removed in imports branch
paulsbond Mar 12, 2025
3452bdb
Error handling updates
paulsbond Mar 12, 2025
3a74647
Utils updates
paulsbond Mar 12, 2025
86f7bed
Core changes in progress
paulsbond Mar 12, 2025
4f007a7
Core changes
paulsbond Mar 17, 2025
2f2d306
Added unittests
paulsbond Mar 17, 2025
fe64c8d
File permissions set to 644
paulsbond Mar 18, 2025
2e42721
Auto line-ending format
paulsbond Mar 18, 2025
f6d8f59
Normalsing line endings
paulsbond Mar 18, 2025
0e3ae8a
More updates from imports branch
paulsbond Mar 18, 2025
fe6552e
More core changes
paulsbond Mar 18, 2025
a8498a6
Updates to core
paulsbond Apr 2, 2025
d428d78
Lots of changes from imports branch
paulsbond Apr 3, 2025
46e7c6f
More qtgui changes from imports
paulsbond Apr 3, 2025
3be5845
ModelWidgets and PreferencesGui
paulsbond Apr 4, 2025
e6c2ab5
ProjectManagerGui
paulsbond Apr 5, 2025
883139b
ProjectViewer
paulsbond Apr 5, 2025
85d2bc9
Re-added modules module
paulsbond Apr 5, 2025
ededc34
Using the re-added modules module
paulsbond Apr 5, 2025
8e007aa
qtgui updates
paulsbond Apr 6, 2025
16cb668
Report updates
paulsbond Apr 6, 2025
98077f7
smartie updates
paulsbond Apr 6, 2025
f297af1
utils updates
paulsbond Apr 6, 2025
7a4dbe0
Wrapper updates
paulsbond Apr 7, 2025
d524e52
Last updates from imports branch
paulsbond Apr 8, 2025
86a161c
Merge branch 'main' into pkg
paulsbond Apr 9, 2025
5f6a131
Fix to QApp arguments
paulsbond Apr 9, 2025
a23cc26
Remove I2 environment variables
paulsbond Apr 9, 2025
a2cfd9d
Missing def line
paulsbond Apr 9, 2025
32522c7
Fix super init
paulsbond Apr 9, 2025
8984b5c
Default max severity
paulsbond Apr 9, 2025
a4a3d18
Severity __ge__
paulsbond Apr 9, 2025
05b776e
Importing modules by name
paulsbond Apr 9, 2025
019b736
CCP4mg imports
paulsbond Apr 9, 2025
9e8071b
Removed build folder
paulsbond Apr 9, 2025
00f8768
Fix to createIcon
paulsbond Apr 10, 2025
1fdf6ff
Error handling and code tidying
paulsbond Apr 10, 2025
6280df4
Ignoring W503
paulsbond Apr 10, 2025
b135196
Removed PRINTHANDLER from modules module
paulsbond Apr 10, 2025
4dfdf44
Redirecting server logs
paulsbond Apr 10, 2025
0569096
Not printing tokens
paulsbond Apr 10, 2025
34c66b0
Run task updates
paulsbond Apr 11, 2025
196fc3a
Missing clipper import
paulsbond Apr 11, 2025
c0dd144
ifSave is NotImplemented
paulsbond Apr 13, 2025
e15737a
Small changes to runTask
paulsbond Apr 14, 2025
0b80afe
Remove wait check
paulsbond Apr 14, 2025
e88fad3
ccp4i2-runTask script
paulsbond Apr 14, 2025
d619eec
Merge branch 'main' into pkg
paulsbond Apr 22, 2025
8bb9c24
Merge branch 'main' into pkg
paulsbond Apr 25, 2025
75f93f8
Added missing imports
paulsbond Apr 25, 2025
f860a6e
Fix to default icon path
paulsbond Apr 25, 2025
f1dd1e5
Merge branch 'main' into pkg
paulsbond May 16, 2025
a5be385
Merge branch 'main' into pkg
paulsbond May 21, 2025
1c77a98
Moved coot1 wrapper
paulsbond May 21, 2025
c578a08
Merge branch 'main' into pkg
paulsbond May 21, 2025
0169edd
Merge branch 'main' into pkg
paulsbond May 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
__pycache__
*.egg-info
*.pyc
/build
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
// W293: blank line contains whitespace
{
"cmake.configureOnOpen": false,
"explorer.excludeGitIgnore": true,
"flake8.args": [
"--ignore=E1,E2,E302,E501,E701,E722,W293"
"--ignore=E1,E2,E302,E501,E701,E722,W293,W503"
],
"pylint.args": [
"--disable=bad-indentation",
Expand Down
99 changes: 0 additions & 99 deletions CMakeLists.txt

This file was deleted.

17 changes: 17 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Copyright (C) 2001-2008 University of York, CCLRC
Copyright (C) 2009-2010 University of York
Copyright (C) 2011-2018 Science & Technology Facilities Council

This library is free software: you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public License
version 3, modified in accordance with the provisions of the
license to address the requirements of UK law.

You should have received a copy of the modified GNU Lesser General
Public License along with this library. If not, copies may be
downloaded from http://www.ccp4.ac.uk/ccp4license.php

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# ccp4i2
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

10 changes: 0 additions & 10 deletions bin/buildCaches

This file was deleted.

10 changes: 0 additions & 10 deletions bin/buildCaches.py

This file was deleted.

75 changes: 0 additions & 75 deletions bin/ccp4

This file was deleted.

81 changes: 0 additions & 81 deletions bin/ccp4i2

This file was deleted.

3 changes: 0 additions & 3 deletions bin/ccp4i2-update

This file was deleted.

2 changes: 0 additions & 2 deletions bin/ccp4i2-update.bat

This file was deleted.

17 changes: 0 additions & 17 deletions bin/ccp4i2.bat

This file was deleted.

43 changes: 0 additions & 43 deletions bin/ccp4i2.pythonrc

This file was deleted.

1 change: 0 additions & 1 deletion bin/ccp4mg.bat

This file was deleted.

5 changes: 0 additions & 5 deletions bin/cleanup

This file was deleted.

Loading