Skip to content

Commit

Permalink
Revert "Manually transferred yaml linting improvements from rhfogh_xm…
Browse files Browse the repository at this point in the history
…l_yaml"

This reverts commit d361ad7.
  • Loading branch information
marcus-oscarsson committed Jul 8, 2024
1 parent aff4942 commit 2327ffe
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 18 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# %YAML 1.2
---

name: Python build and test

on:
on: # yamllint disable-line rule:truthy
pull_request:
push:

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/bump_version_and_tag.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# %YAML 1.2
---

# yamllint disable rule:line-length

name: Create/Update Tag

on:
on: # yamllint disable-line rule:truthy
push:
branches:
- develop
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pages.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# %YAML 1.2
---


Expand All @@ -7,7 +6,7 @@ name: "Pages"
concurrency:
group: "pages"

on:
on: # yamllint disable-line rule:truthy
pull_request:
push:

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ui.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# %YAML 1.2
---

# yamllint disable rule:line-length

name: UI

on:
on: # yamllint disable-line rule:truthy
pull_request:
push:

Expand Down
1 change: 0 additions & 1 deletion conda-environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
%YAML 1.2
---

name: mxcubeweb
Expand Down
1 change: 0 additions & 1 deletion test/HardwareObjectsMockup.xml/beamline_config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# %YAML 1.2
---

# The class to initialise, and init parameters
Expand Down
1 change: 0 additions & 1 deletion test/HardwareObjectsMockup.xml/gphl/gphl-setup.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# %YAML 1.2
---

_initialise_class:
Expand Down
10 changes: 4 additions & 6 deletions test/HardwareObjectsMockup.xml/gphl/gphl-workflow.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# %YAML 1.2
---

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


defaults:
Expand Down Expand Up @@ -100,8 +99,7 @@ settings:
# Multiple acquisitions in order - characterisation then main
# passed to set_pre_strategy_params and set_pre_acquisition_params
# NB as long as we only acquire either characterisation+main or diffractcal
# the code will use list[0] for the first acquisition
# and list[-1] for the main one
# the code will use list[0] for the first acquisition and list[-1] for the main one
auto_acq_parameters:
# For characterisation acquisition
- exposure_time: 0.02
Expand Down Expand Up @@ -140,7 +138,7 @@ settings:
# File name prefix for workflow log files
co.gphl.wf.persistName: wf

# Switch to pass log to stdout. Defaults to true
# Switch to pass log to stdout. Defaults to True
# co.gphl.wf.logStdout: false

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

# Parameters to individual applications
# Switch devMod to true to activate development parameters
# Switch devMod to True to activate development parameters
# NB needed as of 20231116 no longer in active use
# co.gphl.wf.devMode: true
# For stratcal configuration switches edit run_stratcal_wrap.py script instead
Expand Down
1 change: 0 additions & 1 deletion test/HardwareObjectsMockup.xml/xray_centring2.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# %YAML 1.2
---

_initialise_class:
Expand Down

0 comments on commit 2327ffe

Please sign in to comment.