Skip to content

Commit 2327ffe

Browse files
Revert "Manually transferred yaml linting improvements from rhfogh_xml_yaml"
This reverts commit d361ad7.
1 parent aff4942 commit 2327ffe

File tree

9 files changed

+8
-18
lines changed

9 files changed

+8
-18
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
# %YAML 1.2
21
---
32

43
name: Python build and test
54

6-
on:
5+
on: # yamllint disable-line rule:truthy
76
pull_request:
87
push:
98

.github/workflows/bump_version_and_tag.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
# %YAML 1.2
21
---
32

43
# yamllint disable rule:line-length
54

65
name: Create/Update Tag
76

8-
on:
7+
on: # yamllint disable-line rule:truthy
98
push:
109
branches:
1110
- develop

.github/workflows/pages.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# %YAML 1.2
21
---
32

43

@@ -7,7 +6,7 @@ name: "Pages"
76
concurrency:
87
group: "pages"
98

10-
on:
9+
on: # yamllint disable-line rule:truthy
1110
pull_request:
1211
push:
1312

.github/workflows/ui.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
# %YAML 1.2
21
---
32

43
# yamllint disable rule:line-length
54

65
name: UI
76

8-
on:
7+
on: # yamllint disable-line rule:truthy
98
pull_request:
109
push:
1110

conda-environment.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
%YAML 1.2
21
---
32

43
name: mxcubeweb

test/HardwareObjectsMockup.xml/beamline_config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# %YAML 1.2
21
---
32

43
# The class to initialise, and init parameters

test/HardwareObjectsMockup.xml/gphl/gphl-setup.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# %YAML 1.2
21
---
32

43
_initialise_class:

test/HardwareObjectsMockup.xml/gphl/gphl-workflow.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# %YAML 1.2
21
---
32

43
_initialise_class:
@@ -49,7 +48,7 @@ settings:
4948
# NB to get sensible results you should use the default values for resolution and
5049
# wavelength, and the default Eiger 16M detector
5150
# Otherwise the UI may still work, but the indexing solutions will be weird
52-
# use_preset_spotdir: true
51+
# use_preset_spotdir: True
5352

5453

5554
defaults:
@@ -100,8 +99,7 @@ settings:
10099
# Multiple acquisitions in order - characterisation then main
101100
# passed to set_pre_strategy_params and set_pre_acquisition_params
102101
# NB as long as we only acquire either characterisation+main or diffractcal
103-
# the code will use list[0] for the first acquisition
104-
# and list[-1] for the main one
102+
# the code will use list[0] for the first acquisition and list[-1] for the main one
105103
auto_acq_parameters:
106104
# For characterisation acquisition
107105
- exposure_time: 0.02
@@ -140,7 +138,7 @@ settings:
140138
# File name prefix for workflow log files
141139
co.gphl.wf.persistName: wf
142140

143-
# Switch to pass log to stdout. Defaults to true
141+
# Switch to pass log to stdout. Defaults to True
144142
# co.gphl.wf.logStdout: false
145143

146144
# Properties applied after the java command - syntax as above-->
@@ -158,7 +156,7 @@ settings:
158156
# co.gphl.wf.procRootCheck: false
159157

160158
# Parameters to individual applications
161-
# Switch devMod to true to activate development parameters
159+
# Switch devMod to True to activate development parameters
162160
# NB needed as of 20231116 no longer in active use
163161
# co.gphl.wf.devMode: true
164162
# For stratcal configuration switches edit run_stratcal_wrap.py script instead

test/HardwareObjectsMockup.xml/xray_centring2.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# %YAML 1.2
21
---
32

43
_initialise_class:

0 commit comments

Comments
 (0)