Unverified Commit 2622b9dc authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #16240 from mvdbeek/galaxy-release-util-ci 

[23.0] Use galaxy-release-util to upload python packages
parents cbc7b910 787b8040

.github/workflows/publish_artifacts.yaml

+2 −2
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ jobs: 
          python-version: ${{ matrix.python-version }}

      - uses: actions/checkout@v3

      - name: Install script dependencies

        run: pip install build click docutils packaging PyGithub requests twine

        run: pip install galaxy-release-util

      - name: Build and publish

        run: |

          python scripts/release.py build-and-upload --no-confirm

          galaxy-release-util build-and-upload --no-confirm

        env:

            TWINE_USERNAME: __token__

            TWINE_PASSWORD: ${{ github.event.release.prerelease && secrets.PYPI_TEST_TOKEN || secrets.PYPI_MAIN_TOKEN }}

doc/source/dev/create_point_release.rst

+4 −4
Original line number Diff line number Diff line 
Creating Galaxy Point Releases

==============================



The process is currently a mix of a script that is run locally and creating a (pre-)release in the GitHub interface (or using the GitHub API).

The script is in scripts/release.py.

The process is currently a mix of the `galaxy-release-util create-release` command that is run locally and creating a (pre-)release in the GitHub interface (or using the GitHub API).

The command is shipped with the `galaxy-release-util <https://pypi.org/project/galaxy-release-util/>`_ python package.



The local script will:

`galaxy-release-util create-release` will:



 - update lib/galaxy/version.py

 - create HISTORY.rst entries for all packages
@@ -28,7 +28,7 @@ Follow these steps: 
    2. Activate your local virtualenv with Galaxy's dev requirements: `. .venv/bin/activate`

    3. Update Galaxy's dev dependencies (if you haven't done this in a while): `pip install -r lib/galaxy/dependencies/dev-requirements.txt`

    4. You need a personal access token from github (only needs public read permissions).

    5. `GITHUB_AUTH=$YOUR_PAT_FROM_STEP_3 python scripts/release.py create-release --new-version 23.0.1 --last-commit v23.0`

    5. `GITHUB_AUTH=$YOUR_PAT_FROM_STEP_3 galaxy-release-util create-release --new-version 23.0.1 --last-commit v23.0`

    6. Follow along the prompts and make sure the proposed changes look correct



When the script is finished you should find a new tag in the GitHub interface, as well as updated release and dev branches.

lib/galaxy/dependencies/dev-requirements.txt

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ fluent-logger==0.10.0 ; python_version >= "3.7" and python_version < "3.12" 
fonttools==4.38.0 ; python_version >= "3.7" and python_version < "3.12"

frozenlist==1.3.3 ; python_version >= "3.7" and python_version < "3.12"

future==0.18.3 ; python_version >= "3.7" and python_version < "3.12"

galaxy-release-util==0.1.1 ; python_version >= "3.7" and python_version < "3.12"

h11==0.14.0 ; python_version >= "3.7" and python_version < "3.12"

httpcore==0.16.3 ; python_version >= "3.7" and python_version < "3.12"

httpx==0.23.3 ; python_version >= "3.7" and python_version < "3.12"

pyproject.toml

+1 −2
Original line number Diff line number Diff line
@@ -117,11 +117,11 @@ zipstream-new = "*" 
[tool.poetry.group.dev.dependencies]

ase = ">=3.18.1"

black = "^22.1.0"

build = "*"

codespell = "*"

cwltest = "*"

darker = "*"

fluent-logger = "*"

galaxy-release-util = "*"

httpx = "*"

isort = "^5.10.1"

lxml = "!=4.2.2"
@@ -150,7 +150,6 @@ statsd = "*" 
testfixtures = "*"

tuspy = "*"

twill = "*"

twine = "*"

watchdog = "*"



[tool.ruff]

scripts/release.py

deleted100644 → 0
+0 −640

File deleted.

Preview size limit exceeded, changes collapsed.