Merge pull request #1 from olliesilvester/test_pre_release

Test pre release workflow

.github/workflows/ci.yml

@@ -52,12 +52,12 @@ jobs:
     if: needs.check.outputs.branch-pr == ''
     uses: ./.github/workflows/_dist.yml
 
-  pypi:
-    if: github.ref_type == 'tag'
-    needs: dist
-    uses: ./.github/workflows/_pypi.yml
-    permissions:
-      id-token: write
+  # pypi:
+  #   if: github.ref_type == 'tag'
+  #   needs: dist
+  #   uses: ./.github/workflows/_pypi.yml
+  #   permissions:
+  #     id-token: write
 
   release:
     if: github.ref_type == 'tag'

hyperion_other/workflows/pre_release_workflow.yml → .github/workflows/pre_release_workflow.yml

@@ -34,8 +34,8 @@ jobs:
           git add setup.cfg
       - name: Commit changes
         run: |
-          git config --global user.name "GitHub Workflow"
-          git config --global user.email "[email protected]"
+          git config --global user.name "${{ github.actor }}"
+          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
           git commit -m ${{steps.pin_versions.outputs.COMMIT_MESSAGE}}
           git tag ${{inputs.tagName}}
           git push origin ${{inputs.tagName}}

hyperion_other/workflows/test_data/setup.cfg

@@ -29,7 +29,7 @@ install_requires =
     opentelemetry-exporter-jaeger
     ophyd
     semver
-    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@0aabdb389f65a30e629cec60a36c3b5298b7647f
+    dls-dodal
     pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774
     scipy
     pyzmq