Commit 882c168f authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch 'fix-twine' into 'dev' 

Fix twine

See merge request !111
parents 0e967bec d237364f

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ package: 
    - >

      docker run

      $CONTAINER_GALAXY_COMMIT_URL:build-$CI_COMMIT_SHORT_SHA

      bash -c ". .venv/bin/activate . && pip install build twine && cd packages/objectstore &&

      bash -c ". .venv/bin/activate . && pip install build twine pkginfo==1.12.1.2 && cd packages/objectstore &&

      sed -i -e '/version =/ s/= .*/= '$GALAXY_VERSION_PYTHON'/' setup.cfg &&

      make dist && 

      TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python3 -m twine upload --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi dist/*

lib/galaxy/authnz/xsd/oidc_backends_config.xsd

+0 −7
Original line number Diff line number Diff line
@@ -156,13 +156,6 @@ 
                                    </xs:documentation>

                                </xs:annotation>

                            </xs:element>

                            <xs:element name="alias" minOccurs="0" type="xs:string">

                                <xs:annotation>

                                    <xs:documentation>

                                        Specifies alias to be used in web client.

                                    </xs:documentation>

                                </xs:annotation>

                            </xs:element>

                            <xs:element name="required_scope" minOccurs="0" type="xs:string">

                                <xs:annotation>

                                    <xs:documentation>

lib/galaxy/webapps/galaxy/controllers/authnz.py

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ class OIDC(JSAppLauncher): 
            msg = "Login to Galaxy using third-party identities is not enabled on this Galaxy instance."

            log.debug(msg)

            return trans.show_error_message(msg)

        if next == "/null":

            next = None

        if next:

            trans.set_cookie(value=next, name=LOGIN_NEXT_COOKIE_NAME, age=1)

        else: