SSRF BL19U1 Beamline

.bumpversion.cfg

@@ -1,21 +1,21 @@
-[bumpversion]
-commit = True
-message = Bump version {current_version} to {new_version}
-tag = True
-tag_name = {new_version}
-current_version = 0.0.0
-parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
-serialize = 
-	{major}.{minor}.{patch}.{release}{dev}
-	{major}.{minor}.{patch}
-
-[bumpversion:part:release]
-optional_value = gamma
-values = 
-	dev
-	rc
-	gamma
-
-[bumpversion:part:dev]
-
-[bumpversion:file:setup.py]
+[bumpversion]
+commit = True
+message = Bump version {current_version} to {new_version}
+tag = True
+tag_name = {new_version}
+current_version = 0.0.0
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
+serialize = 
+	{major}.{minor}.{patch}.{release}{dev}
+	{major}.{minor}.{patch}
+
+[bumpversion:part:release]
+optional_value = gamma
+values = 
+	dev
+	rc
+	gamma
+
+[bumpversion:part:dev]
+
+[bumpversion:file:setup.py]

.coveragerc

@@ -1,11 +1,11 @@
-[run]
-omit =
-    setup.py
-    test/*
-    mxcubecore/HardwareObjects/ALBA/*
-    mxcubecore/HardwareObjects/DESY/*
-    mxcubecore/HardwareObjects/EMBL/*
-    mxcubecore/HardwareObjects/ESRF/*
-    mxcubecore/HardwareObjects/LNLS/*
-    mxcubecore/HardwareObjects/MAXIV/*
-    mxcubecore/HardwareObjects/SOLEIL/*
+[run]
+omit =
+    setup.py
+    test/*
+    mxcubecore/HardwareObjects/ALBA/*
+    mxcubecore/HardwareObjects/DESY/*
+    mxcubecore/HardwareObjects/EMBL/*
+    mxcubecore/HardwareObjects/ESRF/*
+    mxcubecore/HardwareObjects/LNLS/*
+    mxcubecore/HardwareObjects/MAXIV/*
+    mxcubecore/HardwareObjects/SOLEIL/*

.flake8

@@ -1,19 +1,19 @@
-[flake8]
-ignore =
-    # Whitespace before ':' [https://www.flake8rules.com/rules/E203.html]
-    E203,
-    # Too many leading '#' for block comment [https://www.flake8rules.com/rules/E266.html]
-    E266,
-    # Line too long (82 > 79 characters) [https://www.flake8rules.com/rules/E501.html]
-    E501,
-    # Line break occurred before a binary operator [https://www.flake8rules.com/rules/W503.html]
-    W503,
-    # 'from module import *' used; unable to detect undefined names [https://www.flake8rules.com/rules/F403.html]
-    F403,
-    # Module imported but unused [https://www.flake8rules.com/rules/F401.html]
-    F401,
-    # Line too long (99 > 88) [https://github.com/PyCQA/flake8-bugbear/blob/main/README.rst#list-of-warnings]
-    B950
-max-line-length = 88
-max-complexity = 18
-select = B,C,E,F,W,T4,B9
+[flake8]
+ignore =
+    # Whitespace before ':' [https://www.flake8rules.com/rules/E203.html]
+    E203,
+    # Too many leading '#' for block comment [https://www.flake8rules.com/rules/E266.html]
+    E266,
+    # Line too long (82 > 79 characters) [https://www.flake8rules.com/rules/E501.html]
+    E501,
+    # Line break occurred before a binary operator [https://www.flake8rules.com/rules/W503.html]
+    W503,
+    # 'from module import *' used; unable to detect undefined names [https://www.flake8rules.com/rules/F403.html]
+    F403,
+    # Module imported but unused [https://www.flake8rules.com/rules/F401.html]
+    F401,
+    # Line too long (99 > 88) [https://github.com/PyCQA/flake8-bugbear/blob/main/README.rst#list-of-warnings]
+    B950
+max-line-length = 88
+max-complexity = 18
+select = B,C,E,F,W,T4,B9

.github/workflows/coverage_report.yml

@@ -1,49 +1,49 @@
-name: Coverage Report
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    paths:
-      - '**.py'
-jobs:
-  pytest-coverage:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10"
-
-    - name: Install dependencies
-      run: |
-        sudo apt-get install -y libsasl2-dev libldap2-dev libssl-dev
-        python -m pip install --upgrade pip
-        python -m pip install poetry --user
-        python -m poetry install
-
-    - name: Run and write pytest
-      run: |
-        set -o pipefail
-        poetry run pytest --cov=mxcubecore --junitxml=pytest.xml --cov-report=term-missing:skip-covered | tee pytest-coverage.txt
-
-    - name: Pytest coverage comment
-      id: coverage-comment
-      uses: MishaKav/pytest-coverage-comment@v1.1.40
-      with:
-        repo-token: ${{ secrets.CI_TOKEN }}
-        pytest-coverage-path: ./pytest-coverage.txt
-        junitxml-path: ./pytest.xml
-        report-only-changed-files: true
-
-    - name: Check the output coverage
-      run: |
-        echo "Coverage Percantage - ${{ steps.coverage-comment.outputs.coverage }}"
-        echo "Coverage Warnings - ${{ steps.coverage-comment.outputs.warnings }}"
-        echo "Coverage Errors - ${{ steps.coverage-comment.outputs.errors }}"
-        echo "Coverage Failures - ${{ steps.coverage-comment.outputs.failures }}"
-        echo "Coverage Skipped - ${{ steps.coverage-comment.outputs.skipped }}"
-        echo "Coverage Tests - ${{ steps.coverage-comment.outputs.tests }}"
-        echo "Coverage Time - ${{ steps.coverage-comment.outputs.time }}"
+name: Coverage Report
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    paths:
+      - '**.py'
+jobs:
+  pytest-coverage:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.10"
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get install -y libsasl2-dev libldap2-dev libssl-dev
+        python -m pip install --upgrade pip
+        python -m pip install poetry --user
+        python -m poetry install
+
+    - name: Run and write pytest
+      run: |
+        set -o pipefail
+        poetry run pytest --cov=mxcubecore --junitxml=pytest.xml --cov-report=term-missing:skip-covered | tee pytest-coverage.txt
+
+    - name: Pytest coverage comment
+      id: coverage-comment
+      uses: MishaKav/pytest-coverage-comment@v1.1.40
+      with:
+        repo-token: ${{ secrets.CI_TOKEN }}
+        pytest-coverage-path: ./pytest-coverage.txt
+        junitxml-path: ./pytest.xml
+        report-only-changed-files: true
+
+    - name: Check the output coverage
+      run: |
+        echo "Coverage Percantage - ${{ steps.coverage-comment.outputs.coverage }}"
+        echo "Coverage Warnings - ${{ steps.coverage-comment.outputs.warnings }}"
+        echo "Coverage Errors - ${{ steps.coverage-comment.outputs.errors }}"
+        echo "Coverage Failures - ${{ steps.coverage-comment.outputs.failures }}"
+        echo "Coverage Skipped - ${{ steps.coverage-comment.outputs.skipped }}"
+        echo "Coverage Tests - ${{ steps.coverage-comment.outputs.tests }}"
+        echo "Coverage Time - ${{ steps.coverage-comment.outputs.time }}"

.github/workflows/create-tag.yml

@@ -1,78 +1,78 @@
-name: Create/Update Tag
-on:
-  push:
-    branches:
-      - develop
-jobs:
-  create-version-tag:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10"
-
-    - name: Read package version
-      id: set-tag
-      run: |
-        pip install --upgrade pip
-        pip install toml
-        echo ::set-output name=tag_name::v$(python -c 'import toml; print(toml.load("./pyproject.toml")["tool"]["poetry"]["version"])')
-
-    - name: Check tag exists
-      id: check-tag-exists
-      uses: actions/github-script@v6
-      env:
-        TAG: ${{ steps.set-tag.outputs.tag_name }}
-      with:
-        github-token: ${{ github.token }}
-        script: |
-          // https://github.com/mukunku/tag-exists-action
-          var exists = 'false';
-          try {
-              const getRefResponse = await github.rest.git.getRef({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  ref: "refs/tags/${{ steps.set-tag.outputs.tag_name }}"
-              });
-
-              if (getRefResponse.status === 200) {
-                  console.log("Tag was found");
-                  exists = 'true';
-              }
-          } catch(error) {
-              console.log("Tag was not found");
-          }
-          core.setOutput('exists', exists);
-
-    - name: Update tag
-      uses: actions/github-script@v6
-      if: steps.check-tag-exists.outputs.exists == 'true'
-      env:
-        TAG: ${{ steps.set-tag.outputs.tag_name }}
-      with:
-        github-token: ${{ github.token }}
-        script: |
-          github.rest.git.updateRef({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            ref: "refs/tags/${{ steps.set-tag.outputs.tag_name }}",
-            sha: context.sha
-          })
-
-    - name: Create tag
-      uses: actions/github-script@v6
-      if: steps.check-tag-exists.outputs.exists != 'true'
-      env:
-        TAG: ${{ steps.set-tag.outputs.tag_name }}
-      with:
-        github-token: ${{ github.token }}
-        script: |
-          github.rest.git.createRef({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            ref: "refs/tags/${{ steps.set-tag.outputs.tag_name }}",
-            sha: context.sha
-          })
+name: Create/Update Tag
+on:
+  push:
+    branches:
+      - develop
+jobs:
+  create-version-tag:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.10"
+
+    - name: Read package version
+      id: set-tag
+      run: |
+        pip install --upgrade pip
+        pip install toml
+        echo ::set-output name=tag_name::v$(python -c 'import toml; print(toml.load("./pyproject.toml")["tool"]["poetry"]["version"])')
+
+    - name: Check tag exists
+      id: check-tag-exists
+      uses: actions/github-script@v6
+      env:
+        TAG: ${{ steps.set-tag.outputs.tag_name }}
+      with:
+        github-token: ${{ github.token }}
+        script: |
+          // https://github.com/mukunku/tag-exists-action
+          var exists = 'false';
+          try {
+              const getRefResponse = await github.rest.git.getRef({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  ref: "refs/tags/${{ steps.set-tag.outputs.tag_name }}"
+              });
+
+              if (getRefResponse.status === 200) {
+                  console.log("Tag was found");
+                  exists = 'true';
+              }
+          } catch(error) {
+              console.log("Tag was not found");
+          }
+          core.setOutput('exists', exists);
+
+    - name: Update tag
+      uses: actions/github-script@v6
+      if: steps.check-tag-exists.outputs.exists == 'true'
+      env:
+        TAG: ${{ steps.set-tag.outputs.tag_name }}
+      with:
+        github-token: ${{ github.token }}
+        script: |
+          github.rest.git.updateRef({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            ref: "refs/tags/${{ steps.set-tag.outputs.tag_name }}",
+            sha: context.sha
+          })
+
+    - name: Create tag
+      uses: actions/github-script@v6
+      if: steps.check-tag-exists.outputs.exists != 'true'
+      env:
+        TAG: ${{ steps.set-tag.outputs.tag_name }}
+      with:
+        github-token: ${{ github.token }}
+        script: |
+          github.rest.git.createRef({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            ref: "refs/tags/${{ steps.set-tag.outputs.tag_name }}",
+            sha: context.sha
+          })