Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
362 commits
Select commit Hold shift + click to select a range
d60cc8c
Setup debug launch task
garryod Oct 27, 2022
ad5aeb1
Add pip to dev container
garryod Oct 27, 2022
2196322
Format with autopep8
garryod Oct 27, 2022
fc491a4
Add github workflow to check linting
garryod Oct 27, 2022
e0be65e
Use defaultInterpreterPath
garryod Oct 27, 2022
fbda573
Enable VSCode linting with flake8
garryod Oct 27, 2022
95cfd2b
Update syntax with python 2to3
garryod Oct 27, 2022
c5bd571
Reformat with black
garryod Oct 27, 2022
007a7ae
Use black for autoformatting
garryod Oct 27, 2022
7847ade
Add black to CI
garryod Oct 27, 2022
bb66eb0
Configure flake8
garryod Oct 27, 2022
e1b0ac7
Install CI libraries with pip3
garryod Oct 27, 2022
d088256
Use python2 flake8 in dev container
garryod Oct 27, 2022
edbdcf0
Restructure as python package
garryod Oct 27, 2022
2f28759
Set dev container python path
garryod Oct 27, 2022
e35129d
Remove PuckDB
garryod Oct 27, 2022
0c20f0b
Use python2 flake8 for CI linting
garryod Oct 27, 2022
e8f2214
Update dockerfile entrypoint
garryod Oct 27, 2022
07ed3b5
Clean up XChemExplorer
garryod Nov 8, 2022
6ca38ec
Clean up XChemUtils
garryod Nov 8, 2022
f624fca
Clean up update_pandda_status_flag
garryod Nov 8, 2022
046cec1
Clean up update_data_source_for_new_dimple_twin_pdb
garryod Nov 8, 2022
82fe1f0
Clean up update_data_source_for_new_dimple_pdb
garryod Nov 8, 2022
56dd8fb
Clean up update_data_source_after_refinement
garryod Nov 8, 2022
14576d8
Clean up select_ground_state_dataset
garryod Nov 8, 2022
0e13773
Clean up resort_ligand_atoms
garryod Nov 8, 2022
0abb612
Clean up reset_occupancy_protein_to_one
garryod Nov 8, 2022
99ae3fb
Clean up reset_interesting_datasets
garryod Nov 8, 2022
c65cd1b
Remove unused helpers
garryod Nov 8, 2022
59243fe
Clean up pandda_tab
garryod Nov 8, 2022
8ba78c2
Clean up layout
garryod Nov 8, 2022
46509a6
Clean up settings_tab
garryod Nov 8, 2022
d4734b8
Clean up settings_preferences
garryod Nov 8, 2022
3fb5b12
Cleanup stylesheet
garryod Nov 8, 2022
a081eb1
Clean up refinement_tab
garryod Nov 8, 2022
0e6bd36
Clean up overview_tab
garryod Nov 8, 2022
991404f
Clean up maps_tab
garryod Nov 8, 2022
1075d01
Clean up deposition_tab
garryod Nov 8, 2022
6d95925
Clean up datasets_tab
garryod Nov 8, 2022
cf48511
Clean up XChemThread
garryod Nov 8, 2022
cd3aeb6
Clean up XChemProcess
garryod Nov 8, 2022
0851f43
Clean up XChemPANDDA
garryod Nov 8, 2022
a4c6ace
Fix icons dir
garryod Nov 8, 2022
3f6f6dc
Clean up XChemMain
garryod Nov 8, 2022
91b1762
Fix changelog line seperators
garryod Nov 8, 2022
1b27f65
Launch with xce module
garryod Nov 8, 2022
d3b0617
Remove unused functions
garryod Nov 8, 2022
cde76b7
Remove unused import in XChemPANDDA
garryod Nov 9, 2022
6f60e84
Move html to independent source files
garryod Nov 9, 2022
a286080
Remove unused import in XChemExplorer
garryod Nov 9, 2022
4b1f6a4
Clean up XChemLog
garryod Nov 9, 2022
614de17
Clean up XChemDeposit
garryod Nov 9, 2022
0850c7c
Clean up XChemDB
garryod Nov 9, 2022
8371e89
Clean up XChemCootTwin
garryod Nov 9, 2022
a794ebb
Fix $XChemExplorer_DIR prefixed paths
garryod Nov 9, 2022
ca55479
Setup dls run script
garryod Nov 9, 2022
e53876e
Update git & docker ignore files
garryod Nov 10, 2022
f981b15
Use distutils to check external software
garryod Nov 10, 2022
0ba6b76
Add setup option to dls run script
garryod Nov 10, 2022
128617c
Clean up XChemCootReference
garryod Nov 10, 2022
29c241e
Clean up XChemCootNew
garryod Nov 10, 2022
d57c8f7
Clean up XChemCootBuster
garryod Nov 10, 2022
f551d94
Clean up XChemCoot
garryod Nov 10, 2022
6d68626
Clean up XChemCootOld
garryod Nov 10, 2022
583ee86
Clean up coot_utils_XChem
garryod Nov 10, 2022
b75bd11
Clean up XChemToolTips
garryod Nov 10, 2022
a11ca62
Clean up XChemRefine
garryod Nov 10, 2022
cc0e87f
Clean up process_sqlite
garryod Nov 10, 2022
518d472
Clean up XChemWeb
garryod Nov 10, 2022
7a0a735
Remove unused coot utils
garryod Nov 10, 2022
f8bc22c
Remove unused classes & methods
garryod Nov 10, 2022
5e9cca3
Remove unused variables
garryod Nov 18, 2022
cb86e49
Update dev container
garryod Nov 21, 2022
723f0e9
Install module on container creation
garryod Nov 23, 2022
209b885
Fix dev container XChemExplorer_DIR env variable
garryod Nov 23, 2022
d9c2888
Remove reprocessing tab
garryod Nov 22, 2022
e701e72
Remove unused code
garryod Nov 22, 2022
b1415cf
Remove unused UI elements
garryod Nov 22, 2022
54c375c
Check Agamenmon box by default
garryod Nov 21, 2022
fb0b105
Add phenix to dev container
garryod Nov 21, 2022
b45045e
Remove default restraints program in preferences popout
garryod Nov 21, 2022
bddc865
Select only one restraints program at startup
garryod Nov 21, 2022
3b02283
Fix setup for permissionless DLS users
garryod Nov 28, 2022
3eafe5e
Fix "cluster datasets" PANDDAs task
garryod Nov 23, 2022
eecdce4
Fix Coot spider plot pictures
garryod Nov 23, 2022
61c5faf
Fix coot menubar additions
garryod Nov 23, 2022
d5a7901
Fix various incorrect coot calls
garryod Nov 23, 2022
4457719
Fix incorrect coot utils call
garryod Nov 23, 2022
339e71a
Add xtal argument to XChemDeposit add_data_increment_to_apo_mmcif
garryod Nov 23, 2022
284a016
Remove unused attributes & methods
garryod Nov 29, 2022
70ee89d
Remove noop method
garryod Nov 29, 2022
401ba1f
Use residues_in_chain from coot_utils
garryod Nov 29, 2022
e3f6303
Add Serial arg to XChemRefine run_script
garryod Nov 29, 2022
bf92922
Remove excess newline in setup.py
garryod Nov 29, 2022
272bbdb
Replace bare exceptions with except Exception and re-raise
garryod Nov 29, 2022
5aee2a8
Remove redundant misc utils class
garryod Nov 29, 2022
00babfd
Revert erroneous removal
garryod Nov 29, 2022
883e8e7
Fix possible null assignment
garryod Nov 29, 2022
1380999
Fix dictionary instantiation in autoprocessing widgets
garryod Nov 29, 2022
f4d1237
Sort imports
garryod Nov 29, 2022
d50157d
Reformat with black
garryod Nov 29, 2022
b7424d1
Fix unreasonably small dialog box for autoprocessing selection
garryod Nov 29, 2022
3e9942c
Fix imports
garryod Dec 8, 2022
11532d9
Fix circular import
garryod Dec 8, 2022
b2e55d9
Fix image directory
garryod Dec 8, 2022
7bf8461
Re-add setup-scripts
garryod Dec 13, 2022
67fff4d
Use ccp4 7.1.018 for XChemPANDDA
garryod Dec 13, 2022
dc1c4b9
Use phenix 1.20
garryod Dec 13, 2022
37c912b
Use buster 20211020
garryod Dec 13, 2022
24a5f17
Remove non-existant module
garryod Dec 13, 2022
b7f6c01
Remove pymol module dependency
garryod Feb 28, 2023
c6b9a86
Remove mx module dependency
garryod Feb 28, 2023
e0996dd
Remove xce.setup-csh
garryod Feb 28, 2023
3904083
Remove xce.setup-sh
garryod Feb 28, 2023
962cf73
Remove pandda.setup-sh
garryod Mar 1, 2023
354f4e1
Refactor with black
garryod Mar 1, 2023
aa5c7a3
Rationalise use of pdb-extract
garryod Mar 1, 2023
77d7a3f
Load pymol when running pandda.analyze
garryod Jul 3, 2023
5549552
Source pandda ccp4 when running pandda.inspect
garryod Jul 3, 2023
556e3db
Fix arguments in grade cluster submission
garryod Jul 3, 2023
cc1c56e
Include in container
garryod Jul 24, 2023
c8246c1
Include pandda inspect dependencies in dev container
garryod Jul 24, 2023
952a5f2
Refactor dev container configuration
garryod Jul 24, 2023
f9d5c29
Create SGE cluster submission function
garryod Jul 24, 2023
6311cc6
Use cluster submission function for pandda
garryod Jul 24, 2023
7e22f53
Use cluster submission function for pandda2
garryod Jul 24, 2023
b6defe3
Use cluster submission function for dimple
garryod Jul 24, 2023
387db35
Use cluster submission function for fit ligands
garryod Jul 24, 2023
a4a856a
Use cluster submission function for compound png & cif creation
garryod Jul 24, 2023
731a3d4
Rename logfile arg to outfile for sge job submission
garryod Jul 24, 2023
2fc0757
Remove remote qsub
garryod Jul 24, 2023
fccd564
Use cluster submission function for refinement
garryod Jul 24, 2023
f962a97
Use cluster submission function for refmac
garryod Jul 24, 2023
62afa46
Use cluster submission function for quick refine
garryod Jul 24, 2023
b418db8
Correctly format long source string
garryod Jul 25, 2023
d1af2b7
Update XChemMain.py with new export options
CTomlinson-dls Jul 25, 2023
d3cd523
Move cluster submission logging to submission function
garryod Jul 25, 2023
3e984c4
Remove PBS shebang from SGE jobs
garryod Jul 25, 2023
17fc62c
Simplify get_shebang arguments
garryod Jul 25, 2023
b72bce0
Remove disambiguation of qsub and qsub_array
garryod Jul 25, 2023
d454c90
Fix new taxonomies
garryod Jul 25, 2023
efdb524
Remove log directory environment variable query
garryod Jul 25, 2023
dc3303b
Create SGE job query function and use for status
garryod Jul 25, 2023
bd78b07
Split resource string into exclusive & memory
garryod Jul 26, 2023
a8871d9
Add slurm job submission function
garryod Jul 26, 2023
47030ee
Add slurm job query function
garryod Jul 26, 2023
3666a57
Use blank token if SLURM_JWT unset
garryod Jul 26, 2023
288090b
Use slurm to query running jobs if available
garryod Jul 26, 2023
ef2cfed
Add array argument to slurm submission
garryod Jul 26, 2023
fbd7ecc
Use slurm for creation of compound png and cif
garryod Jul 26, 2023
1414e8d
Use slurm for ligand fitting
garryod Jul 26, 2023
0486bd9
Use slurm for dimple
garryod Jul 26, 2023
a02c12d
Use slurm for refinement
garryod Jul 26, 2023
30c9589
Unconditionally run job in RunRefmac
garryod Jul 26, 2023
c9c282a
Use slurm for refmac
garryod Jul 26, 2023
7d708ef
Use slurm for pandda quick refine
garryod Jul 26, 2023
f021721
Log to XCE logfile when querying slurm jobs
garryod Jul 26, 2023
d90d5b9
Add memory & exclusivity options to slurm submission
garryod Jul 26, 2023
179e634
Use slurm for pandda analyse
garryod Jul 26, 2023
329536c
Add tasks argument to slurm submission
garryod Jul 26, 2023
f12919d
Use slurm for pandda2
garryod Jul 26, 2023
5180db5
Fix typo in pandda job submission
garryod Jul 27, 2023
651afef
Module load ccp4 at beginning of refinement jobs
garryod Jul 28, 2023
d734237
Submit correct number of array jobs for refinement
garryod Jul 28, 2023
04c57e1
Fix slurm restraints job array job script name
garryod Jul 28, 2023
8e08abb
Explicitly run job script for refinement submissions
garryod Jul 28, 2023
1b42d81
Remove headers from slurm submission logs
garryod Jul 28, 2023
26bfd4c
Set SSL certificate file for Slurm API call
garryod Jul 28, 2023
57e94b6
Don't verify SSL when connecting to Slurm REST API
garryod Jul 28, 2023
8f68466
Run linting CI in python 2.7 container
garryod Sep 4, 2023
f5821cd
Fix XChemExplorer formatting
garryod Sep 4, 2023
3537730
Fix for pandda 2 running at diamond
ConorFWild Sep 4, 2023
1fc7638
Fix to prevent exporting non-confident models and pandda 2 log file n…
ConorFWild Nov 13, 2023
d4269cd
Fix to prevent exporting non-confident models and pandda 2 log file n…
ConorFWild Nov 27, 2023
726a349
Remove pip install from setup
garryod Dec 5, 2023
1ddf626
Simplify DLS launch process
garryod Dec 5, 2023
6fd1cb2
Change file modes to 755
garryod Dec 5, 2023
14ccc70
Fix flake8 errors
garryod Jan 15, 2024
2d2047e
Fix black errors
garryod Jan 15, 2024
795fcf6
Using ligand placed instead of ligand confidence and update_event_map…
ConorFWild Feb 5, 2024
8bfda59
Update XChemExplorer_dls
Daren-fearon Feb 19, 2024
ab3681b
Update XChemUtils.py
Daren-fearon Feb 19, 2024
a59675f
Update XChemRefine.py
Daren-fearon Feb 19, 2024
aaf19d3
Adds Coxsackievirus A16 to list of taxonomys
CTomlinson-dls Mar 22, 2024
8ebe1b5
Update XChemDeposit.py
Daren-fearon Mar 23, 2024
f9f2dc4
Fix for correctly exporting fitted events
ConorFWild Mar 18, 2024
d812dc5
Update xce/lib/XChemPANDDA.py
ConorFWild Apr 9, 2024
f76f04f
Fix for correctly exporting fitted events: 2.7 compatible
ConorFWild Apr 12, 2024
01d7282
Update XChemThread.py
Daren-fearon Apr 23, 2024
4bee44c
Update XChemPANDDA.py
Daren-fearon Apr 23, 2024
b096927
A quick fix for when these parameters are empty
ConorFWild May 4, 2024
930bbef
A quick fix for when these parameters are empty - actually working fo…
ConorFWild May 24, 2024
975539a
Retrieve user token before using slurm REST API
garryod May 31, 2024
9f51830
Remove SGE support & make slurm default
garryod May 31, 2024
d5f8490
Remove abolsute paths from XChemExplorer launch
garryod May 31, 2024
5937b7b
Move slurm token retrieval into GUI thread
garryod Jun 12, 2024
9135cf0
Strip token response
garryod Jun 12, 2024
9722bd5
Fix slurm submission account
garryod Jun 12, 2024
6d8954c
Hide password field
garryod Jun 12, 2024
8c75f80
Fix shebangs on slurm jobs
garryod Jun 13, 2024
7f0dc03
Set directory at beginning of slurm jobs
garryod Jun 13, 2024
fb29658
Source modules at beginning of cluster jobs
garryod Jun 13, 2024
91da5e7
Pass USER environment variable to jobs
garryod Jun 13, 2024
6b6acdf
Load xce egg when running helper scripts
garryod Jun 13, 2024
e10041a
Format with black
garryod Jun 14, 2024
b6e1815
Pass token when getting job status
garryod Jun 14, 2024
0f12d45
Re-add pandda resource option
garryod Jun 14, 2024
f2247bb
Initialise slurm payload memory_per_node dict
garryod Jun 14, 2024
2357d3c
Fix typo in slurm pandda job submission
garryod Jun 14, 2024
596cbbc
Initialise slurm payload tasks_per_node dict
garryod Jun 14, 2024
a947623
Upgrade to v0.0.40 slurm API
garryod Jun 14, 2024
ee64bd5
Set current working directory via slurm REST API
garryod Jun 14, 2024
43e927f
Pass SLURM environment variables as list of strings
garryod Jun 14, 2024
91108fe
Specify slurm job memory in megabytes
garryod Jun 14, 2024
3aff566
Source module command in pandda jobs
garryod Jun 17, 2024
6bb5ad4
Increase memory allocation of pandda2 job
garryod Jun 17, 2024
2a97213
Add libfreetype to LD_PRELOAD when launching at DLS
garryod Jun 18, 2024
f46ee77
Rename dls_launch script to launch
garryod Jun 18, 2024
faffd5f
Move Coot scripts to separate directory
garryod Jun 18, 2024
96c95cb
Load xce egg when launching coot scripts
garryod Jun 18, 2024
840cf2d
Fix coot script path
garryod Jun 18, 2024
b03fb0f
Load xce modules after egg
garryod Jun 18, 2024
fe40b4b
Format with black
garryod Jun 18, 2024
a2489ec
Fetch password with gtk popup for coot
garryod Jun 18, 2024
db3f816
Pass token fetching method to recursive get token calls
garryod Jun 18, 2024
0299a18
Use password entry for gtk popup
garryod Jun 18, 2024
e74a2ba
Return password from qt password fetch method
garryod Jun 25, 2024
474e353
Fix password entry for gtk popup
garryod Jun 28, 2024
d8e1ffb
Fix buster module system sourcing
garryod Jun 28, 2024
058ee84
Read last line from wilson stdout
garryod Jul 1, 2024
a84128e
Fix Buster arguments
garryod Jul 2, 2024
b706ead
Replace time.clock with time.time for slurm token expirary
garryod Jul 15, 2024
0c150b9
Request nproc tasks when running pandda on slurm
garryod Oct 4, 2024
ff328ba
Update setup.py
Daren-fearon Aug 1, 2024
c644ca9
Update XChemRefine.py
Daren-fearon Aug 1, 2024
67fe24c
Update settings_preferences.py
Daren-fearon Aug 1, 2024
12c2dfa
Update XChemLog.py
Daren-fearon Oct 15, 2024
5d44678
Use pymol/1.8.2.0-py2.7 module at DLS
garryod Nov 18, 2024
14bc596
Use most recent egg in launch script
garryod Nov 18, 2024
1c1ab9d
Use most recent egg in coot and helper scripts
garryod Nov 19, 2024
0fbf3a0
Fix for jobs stopped by removed dependency
ConorFWild Nov 21, 2024
f669d1c
Update settings_preferences.py
Daren-fearon Dec 4, 2024
fca4ed5
set buster refmac tasks
rowanwalker96 Dec 11, 2024
00c48a5
update mogul path to csds 2024
rowanwalker96 Dec 11, 2024
6587f17
Lint
rowanwalker96 Jan 6, 2025
28f040a
Lint
rowanwalker96 Jan 6, 2025
6294bbb
Merge pull request #430 from xchem/ccdc-csds
rowanwalker96 Jan 6, 2025
1149cfc
Merge pull request #429 from xchem/set-buster-refmac-tasks
rowanwalker96 Jan 6, 2025
e924cc6
Merge pull request #428 from Daren-fearon/Daren-fearon-patch-2024-12-04
rowanwalker96 Jan 6, 2025
fbfc13a
Load missing graphviz libraries for buster-report
rowanwalker96 Jan 14, 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
24 changes: 24 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
FROM gcr.io/diamond-privreg/xchem/ccp4:7.1 as ccp4
FROM gcr.io/diamond-privreg/xchem/phenix:1.20 as phenix

FROM buildpack-deps:bullseye-curl as devel

COPY --from=ccp4 /ccp4-7.1 /ccp4-7.1
COPY --from=phenix /phenix-1.20 /phenix-1.20

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y \
libxrender1 libfontconfig libxext6 \
libglib2.0-0 libsm6 libxi6 libxrandr2 libxfixes3 libxcursor1 libxinerama1 \
libgomp1 libxdamage1 libxcb-shm0 libxcb-render0 \
python3-pip \
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* \
&& echo . /ccp4-7.1/bin/ccp4.setup-sh | tee ~/.bashrc ~/.zshrc \
&& curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o /tmp/get-pip.py \
&& /ccp4-7.1/bin/ccp4-python /tmp/get-pip.py \
&& /ccp4-7.1/bin/ccp4-python -m pip install flake8 \
&& pip3 install black[python2]

ENV QT_X11_NO_MITSHM=1 \
PATH=$PATH:/ccp4-7.1/bin:/phenix-1.20/build/bin
9 changes: 9 additions & 0 deletions .devcontainer/devcontainer-lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {
"version": "2.4.3",
"resolved": "ghcr.io/devcontainers/features/common-utils@sha256:e9e1d402031416ed5fc500f242c27ffa1043a27b5ba612e6596ea62503c8ae70",
"integrity": "sha256:e9e1d402031416ed5fc500f242c27ffa1043a27b5ba612e6596ea62503c8ae70"
}
}
}
40 changes: 40 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"name": "XChemExplorer",
"build": {
"dockerfile": "Dockerfile",
"target": "devel"
},
"remoteEnv": {
"XChemExplorer_DIR": "${localWorkspaceFolder}",
"SLURM_USER": "${localEnv:USER",
"DISPLAY": "${localEnv:DISPLAY}"
},
"customizations": {
"vscode": {
"settings": {
"python.defaultInterpreterPath": "/ccp4-7.1/bin/ccp4-python"
},
"extensions": [
"[email protected]"
]
}
},
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {}
},
"initializeCommand": "bash -c 'for i in $HOME/.inputrc; do [ -f $i ] || touch $i; done'",
"runArgs": [
"--net=host",
"--security-opt=label=type:container_runtime_t"
],
"mounts": [
"source=${localEnv:HOME}/.ssh,target=/root/.ssh,type=bind",
"source=${localEnv:HOME}/.inputrc,target=/root/.inputrc,type=bind",
"source=/dls/labxchem/data/,target=/dls/labxchem/data/,type=bind"
],
"remoteUser": "root",
"containerUser": "root",
"workspaceMount": "source=${localWorkspaceFolder},target=${localWorkspaceFolder},type=bind",
"workspaceFolder": "${localWorkspaceFolder}",
"postCreateCommand": "pip install -e ."
}
15 changes: 15 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
*.pyc
*.egg-info
/build
/dist

__pycache__/
.pytest_cache/
.mypy_cache/

xce.log

/.devcontainer
/.git

Dockerfile
38 changes: 38 additions & 0 deletions .github/workflows/code.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Code CI

on:
push:
branches:
- master
tags:
- "*"
pull_request:

jobs:
lint:
runs-on: "ubuntu-latest"
container:
image: python:2.7.18-buster
steps:
- name: Checkout Source
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Install pip3
run: |
apt-get update
apt-get install -y python3-pip

- name: Install linters
run: |
pip install flake8
pip3 install black[python2]

- name: Lint with flake8
run: |
flake8 .

- name: Lint with black
run: |
black --check .
12 changes: 9 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
**/*.pyc
*.pyc
XChemExplorer_dmd.sh
.idea
*.egg-info
/build
/dist

__pycache__/
.pytest_cache/
.mypy_cache/

xce.log
4 changes: 0 additions & 4 deletions .travis.yml

This file was deleted.

15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "XCE",
"type": "python",
"request": "launch",
"module": "xce",
"justMyCode": true
}
]
}
9 changes: 9 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"python.pythonPath": "/ccp4-7.1/bin/ccp4-python",
"python.defaultInterpreterPath": "/ccp4-7.1/bin/ccp4-python",
"python.linting.enabled": true,
"python.linting.flake8Enabled": true,
"python.linting.flake8Path": "/ccp4-7.1/bin/flake8",
"python.formatting.provider": "black",
"python.formatting.blackPath": "/usr/local/bin/black",
}
Loading