Unverified Commit 3a18da85 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #14040 from nsoranzo/modernise_package_build 

Modernise build of packages
parents 00333722 9528dc63

doc/source/conf.versioning.py

+7 −6
Original line number Diff line number Diff line
@@ -3,9 +3,10 @@ 
# This file is appended to conf.py by the Build docs github workflow.

#

import re

from distutils.version import LooseVersion

from subprocess import check_output



from packaging.version import Version



# This is set in the Jenkins matrix config

TARGET_GIT_BRANCH = os.environ.get("TARGET_BRANCH", "dev")  # noqa: F821
@@ -17,7 +18,7 @@ BANNER_APPEND = """ You can alternatively <a href="%(stable_path)s">view this pa 
exists</a> or <a href="%(stable_root)s">view the top of the latest release's documentation</a>."""



# Minimum version for linking to docs

MIN_DOC_VERSION = LooseVersion("17.05")

MIN_DOC_VERSION = Version("17.05")



# Enable simpleversioning

extensions += ["sphinxcontrib.simpleversioning"]  # noqa: F821
@@ -43,16 +44,16 @@ for _tag in reversed(tags): 
        _ver = _tag[1:]

        if not _stable:

            _stable = _ver

        if LooseVersion(_ver) >= MIN_DOC_VERSION:

            simpleversioning_versions.append({"id": "release_%s" % _ver, "name": _ver})

        if Version(_ver) >= MIN_DOC_VERSION:

            simpleversioning_versions.append({"id": f"release_{_ver}", "name": _ver})



if re.fullmatch(r"release_\d{2}\.\d{2}", TARGET_GIT_BRANCH):

    if _stable:

        # The current stable release will go here but fail the next conditional, avoiding either banner.

        if TARGET_GIT_BRANCH != "release_%s" % _stable:

        if TARGET_GIT_BRANCH != f"release_{_stable}":

            simpleversioning_show_banner = True

            _target_ver = TARGET_GIT_BRANCH[len("release_") :]

            if LooseVersion(_target_ver) > LooseVersion(_stable):

            if Version(_target_ver) > Version(_stable):

                # Pre-release

                # Insert it between master and _stable

                simpleversioning_versions.insert(2, {"id": TARGET_GIT_BRANCH, "name": _target_ver})

lib/galaxy/selenium/context.py

+1 −1
Original line number Diff line number Diff line 
import os

from abc import abstractmethod

from typing import Optional

from urllib.parse import urljoin



import yaml

from six.moves.urllib.parse import urljoin



from .driver_factory import ConfiguredDriver

from .navigates_galaxy import NavigatesGalaxy

mypy.ini

+0 −2
Original line number Diff line number Diff line
@@ -164,8 +164,6 @@ check_untyped_defs = False 
check_untyped_defs = False

[mypy-galaxy.tools.bundled.filters.join]

check_untyped_defs = False

[mypy-galaxy.tools.bundled.data_source.hbvar_filter]

check_untyped_defs = False

[mypy-galaxy.tool_util.provided_metadata]

check_untyped_defs = False

[mypy-galaxy.tool_util.output_checker]

packages/app/HISTORY.rst

+0 −2
Original line number Diff line number Diff line 
.. :changelog:



History

-------

packages/app/MANIFEST.in

+9 −0
Original line number Diff line number Diff line 
include *.rst *.txt LICENSE

include galaxy/dependencies/*.txt

include galaxy/dependencies/*.sh

include galaxy/jobs/runners/util/job_script/*.sh

include galaxy/managers/licenses.json

include galaxy/managers/markdown_export_base.css

recursive-include galaxy/tools/ *.xml

recursive-include galaxy/tools/bundled/ *.pl *.py *.R *.sh

include galaxy/tools/bundled/interactive/default_notebook.ipynb

include galaxy/tools/expressions/*.js

include galaxy/workflow/resources/*.sample