Skip to content

Commit

Permalink
Use galaxy-release-util to upload python packages
Browse files Browse the repository at this point in the history
  • Loading branch information
mvdbeek committed Jun 13, 2023
1 parent 84d2ba8 commit 787b804
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 648 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish_artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions doc/source/dev/create_point_release.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
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
Expand All @@ -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.
Expand Down
1 change: 1 addition & 0 deletions lib/galaxy/dependencies/dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -150,7 +150,6 @@ statsd = "*"
testfixtures = "*"
tuspy = "*"
twill = "*"
twine = "*"
watchdog = "*"

[tool.ruff]
Expand Down
Loading

0 comments on commit 787b804

Please sign in to comment.