Commit 7b90b7e0 authored by Gibbs, Ian's avatar Gibbs, Ian
Browse files

Merge branch 'i0x-main-patch-3dc8' into 'main' 

refl1d point to refl1d-qa

See merge request !83
parents ff00c410 45201b0c

.gitlab-ci.yml

+9 −9
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ stages: 
job_noop:

  stage: 0_noop

  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  tags: [ mantid06.sns.gov ]

  script:

    - env | sed -n '/^CI_/p'   | sort

    - env | sed -n '/^FF_/p'   | sort
@@ -51,7 +51,7 @@ job_noop: 
job_readybake_lint:

  stage: 1_setup

  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  tags: [ mantid06.sns.gov ]

  script:

    - docker images -a

    - env | grep READYBAKE_ || true
@@ -85,7 +85,7 @@ job_readybake_lint: 
job_readybake_rpmbuild:

  stage: 1_setup

  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  tags: [ mantid06.sns.gov ]

  script:

    - docker images -a

    - env | grep READYBAKE_ || true
@@ -117,7 +117,7 @@ job_readybake_rpmbuild: 
job_lint_precommit:

  stage: 2_lint

  allow_failure: true

  tags: [ acme-conda-stage.sns.gov ]

  tags: [ mantid06.sns.gov ]

  script:

    - docker images -a

    - |
@@ -137,7 +137,7 @@ job_lint_precommit: 
job_lint_rpmspec:

  stage: 2_lint

  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  tags: [ mantid06.sns.gov ]

  script:

    - docker images -a

    - |
@@ -157,7 +157,7 @@ job_lint_rpmspec: 
job_rpmbuild:

  stage: 3_build

  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  tags: [ mantid06.sns.gov ]

  script:

    - docker images -a

    - |
@@ -195,7 +195,7 @@ job_rpmbuild: 
job_tag_validate:

  stage: 4_validate

  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  tags: [ mantid06.sns.gov ]

  script:

    - docker images -a

    - pwd
@@ -263,7 +263,7 @@ job_tag_validate: 
job_tag_release:

  stage: 5_release

  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  tags: [ mantid06.sns.gov ]

  script:

    - docker images -a

    - pwd
@@ -365,7 +365,7 @@ job_tag_release: 
.job_docker_cleanup: &job_docker_cleanup

  stage: 6_cleanup

  allow_failure: false

  tags: [ acme-conda-stage.sns.gov ]

  tags: [ mantid06.sns.gov ]

  script:

    - docker images -a

    - docker rmi --force readybake_lint:latest

rpm/nsd-app-wrap.spec

+4 −1
Original line number Diff line number Diff line 
Name:           nsd-app-wrap

Version:        1.88

Version:        1.89

Release:        1%{?dist}

Summary:        Wrapper scripts to launch python applications installed via anaconda

Vendor:         Peter F. Peterson
@@ -110,6 +110,9 @@ install -m 644 desktop/ibeatles.desktop %{buildroot}%{_datadir}/a 


%changelog



* Tue May 13 2025 Ian Gibbs

- refl1d points to refl1d-qa



* Fri Apr 11 2025 John Hetrick

- Removed refred-v4 support

- Update refl1d command parameters

src/refl1d

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ unset SESSION_MANAGER 
COMMAND="refl1d" # --port XXXX



# select the environment to use

CONDA_ENVIRON=refl1d

CONDA_ENVIRON=refl1d-qa

if [ -n "$1" ]; then

  if [ "$1" == "--dev" ]; then

    CONDA_ENVIRON=refl1d-dev