Skip to content

Commit 58d8e12

Browse files
Merge pull request #4 from dbmi-bgm/upgrade-python-20230920
Upgrade Python 3.11
2 parents 411244c + 30e6608 commit 58d8e12

File tree

6 files changed

+1002
-272
lines changed

6 files changed

+1002
-272
lines changed

.github/workflows/main-publish.yml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# PyPi publish for magma
2+
3+
name: publish
4+
5+
# Controls when the action will run.
6+
on:
7+
8+
# Publish on all tags
9+
push:
10+
tags:
11+
- '*'
12+
13+
# Allows you to run this workflow manually from the Actions tab
14+
workflow_dispatch:
15+
16+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
17+
jobs:
18+
# This workflow contains a single job called "build"
19+
build:
20+
# The type of runner that the job will run on
21+
runs-on: ubuntu-22.04
22+
23+
# Steps represent a sequence of tasks that will be executed as part of the job
24+
steps:
25+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
26+
- uses: actions/checkout@v2
27+
- uses: actions/setup-python@v2
28+
with:
29+
python-version: 3.11
30+
- name: Install Python dependencies for publish
31+
run: python -m pip install dcicutils
32+
- name: Publish
33+
env:
34+
PYPI_USER: ${{ secrets.PYPI_USER }}
35+
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
36+
run: |
37+
make configure
38+
make publish-for-ga

.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
name: Test portal-pipeline-utils with Python ${{ matrix.python_version }}
2121

2222
# The type of runner that the job will run on
23-
runs-on: ubuntu-20.04
23+
runs-on: ubuntu-22.04
2424
strategy:
2525
matrix:
26-
python_version: [3.7, 3.8]
26+
python_version: [3.7, 3.8, 3.11]
2727

2828
# Steps represent a sequence of tasks that will be executed as part of the job
2929
steps:

CHANGELOG.rst

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
==========
3+
Change Log
4+
==========
5+
6+
7+
3.0.0
8+
=====
9+
* 2023-10-10
10+
* Added this CHANGELOG.rst file.
11+
* Upgrade to Python 3.11.

Makefile

+11
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ update:
88
poetry update
99

1010
build:
11+
make configure
1112
poetry install
1213

1314
test:
@@ -19,6 +20,16 @@ help:
1920
clean:
2021
rm -rf *.egg-info
2122

23+
publish:
24+
poetry run publish-to-pypi
25+
26+
publish-for-ga:
27+
# Need this poetry install first for some reason in GitHub Actions, otherwise getting this:
28+
# Warning: 'publish-to-pypi' is an entry point defined in pyproject.toml, but it's not installed as a script. You may get improper `sys.argv[0]`.
29+
# Only a warning, but then it does not find dcicutils for some reason.
30+
poetry install
31+
poetry run publish-to-pypi --noconfirm
32+
2233
info:
2334
@: $(info Here are some 'make' options:)
2435
$(info - Use 'make configure' to configure the repo by installing poetry.)

poetry.lock

+932-264
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "portal-pipeline-utils"
3-
version = "2.1.0"
3+
version = "3.0.0"
44
description = "Utilities for deploying pipelines and interfacing with portal infrastructure."
55
authors = [
66
"Michele Berselli <[email protected]>",
@@ -21,20 +21,22 @@ packages = [
2121

2222

2323
[tool.poetry.dependencies]
24-
python = ">=3.7,<3.9"
25-
dcicutils = "^6.3.0"
26-
boto3 = "^1.20.15"
27-
awscli = "^1.22.15"
24+
python = ">=3.8,<3.12"
25+
dcicutils = "^8.0.0"
26+
boto3 = "^1.28.62"
27+
awscli = "^1.29.62"
2828
jsonschema = "^4.7.2"
29-
magma-suite = "^1.0.1"
29+
magma-suite = "^2.0.0"
3030

3131

3232
[tool.poetry.dev-dependencies]
3333
pytest = "*"
34+
boto3-stubs = "^1.28.62"
3435

3536

3637
[tool.poetry.scripts]
3738
pipeline_utils = "pipeline_utils.__main__:main"
39+
publish-to-pypi = "dcicutils.scripts.publish_to_pypi:main"
3840

3941

4042
[build-system]

0 commit comments

Comments
 (0)