Commit 5e9692fd authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch 'dev' into 'main' 

Merge dev 24.1.dev1+ornl to main

See merge request !85
parents 425b4ab6 869e5654

.ci/flake8_ignorelist.txt

+1 −2
Original line number Diff line number Diff line 
.git

.tox

.venv

.venv3

.venv*

packages/*/.venv

packages/*/build

packages/*/dist

.ci/ignore-spelling.txt

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

implementors

purgable

.ci/validate_test_tools.sh

+3 −1
Original line number Diff line number Diff line
@@ -7,5 +7,7 @@ xsd_path="lib/galaxy/tools/xsd/galaxy.xsd" 
xmllint --noout "$xsd_path"



test_tools_path='test/functional/tools'

tool_files_list=$(ls "$test_tools_path"/*.xml | grep -v '_conf.xml$')

# test all test tools except upload.xml which uses a non-standard conditional

# (without param) which does not survive xsd validation

tool_files_list=$(ls "$test_tools_path"/*.xml | grep -v '_conf.xml$' | grep -v upload.xml)

sh scripts/validate_tools.sh $tool_files_list

.circleci/config.yml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ variables: 
jobs:

  get_code:

    docker:

      - image: cimg/python:3.7

      - image: cimg/python:3.8

    <<: *set_workdir

    steps:

      # Replace standard code checkout with shallow clone to speed things up.
@@ -73,7 +73,7 @@ jobs: 
            - ~/repo

  validate_test_tools:

    docker:

      - image: cimg/python:3.7

      - image: cimg/python:3.8

    <<: *set_workdir

    steps:

      - *restore_repo_cache

.flake8

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ 
# E203 is whitespace before ':'; we follow black's formatting here. See https://black.readthedocs.io/en/stable/faq.html#why-are-flake8-s-e203-and-w503-violated

# E402 module level import not at top of file # TODO, we would like to improve this.

# E501 is line length (delegated to black)

# E701,E704 are multiple statements on one line; we follow black's formatting here. See https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#configuration

# 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

ignore = B008,E203,E402,E501,E701,E704,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