Commit 425b4ab6 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch 'dev' into 'main' 

merge dev to main for

See merge request !81
parents 8b5b9359 f8748f4d

.ci/flake8_ignorelist.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ database 
doc/build

eggs

lib/galaxy/web/proxy/js/node_modules

lib/tool_shed/test/test_data/repos

static/maps

static/scripts

test/functional/tools/cwl_tools/v1.?/

.ci/ignore-spelling.txt

+1 −0
Original line number Diff line number Diff line 
hda

implementors

.flake8

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ 
# W503 is line breaks before binary operators, which has been reversed in PEP 8.

# D** are docstring linting - which we mostly ignore except D302. (Hopefully we will solve more over time).

ignore = B008,E203,E402,E501,W503,D100,D101,D102,D103,D104,D105,D106,D107,D200,D201,D202,D204,D205,D206,D207,D208,D209,D210,D211,D300,D301,D400,D401,D402,D403,D412,D413

exclude = lib/tool_shed/test/test_data/repos

.github/labeler.yml

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ area/toolshed: 
  - lib/toolshed/**/*

  - templates/webapps/tool_shed/**/*

area/UI-UX:

  - client/src/**/*

  - templates/**/*

  - all: ["client/src/**/*", "!client/src/api/schema/schema.ts"]

    any: ["templates/**/*"]

area/util:

  - lib/galaxy/util/**/*

area/visualizations:

.github/workflows/converter_tests.yaml

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ jobs: 
      - name: Run tests

        run: |

          mapfile -t TOOL_ARRAY < tool_list.txt

          planemo test --galaxy_python_version ${{ matrix.python-version }} --galaxy_root 'galaxy root' "${TOOL_ARRAY[@]}"

          planemo test --biocontainers --galaxy_python_version ${{ matrix.python-version }} --galaxy_root 'galaxy root' "${TOOL_ARRAY[@]}"

      - uses: actions/upload-artifact@v3

        if: failure()

        with: