Skip to content

Commit

Permalink
Merge pull request #4 from dbmi-bgm/upgrade-python-20230920
Browse files Browse the repository at this point in the history
Upgrade Python 3.11
  • Loading branch information
dmichaels-harvard authored Oct 10, 2023
2 parents 411244c + 30e6608 commit 58d8e12
Show file tree
Hide file tree
Showing 6 changed files with 1,002 additions and 272 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/main-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# PyPi publish for magma

name: publish

# Controls when the action will run.
on:

# Publish on all tags
push:
tags:
- '*'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-22.04

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: 3.11
- name: Install Python dependencies for publish
run: python -m pip install dcicutils
- name: Publish
env:
PYPI_USER: ${{ secrets.PYPI_USER }}
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
make configure
make publish-for-ga
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
name: Test portal-pipeline-utils with Python ${{ matrix.python_version }}

# The type of runner that the job will run on
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
python_version: [3.7, 3.8]
python_version: [3.7, 3.8, 3.11]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

==========
Change Log
==========


3.0.0
=====
* 2023-10-10
* Added this CHANGELOG.rst file.
* Upgrade to Python 3.11.
11 changes: 11 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ update:
poetry update

build:
make configure
poetry install

test:
Expand All @@ -19,6 +20,16 @@ help:
clean:
rm -rf *.egg-info

publish:
poetry run publish-to-pypi

publish-for-ga:
# Need this poetry install first for some reason in GitHub Actions, otherwise getting this:
# 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]`.
# Only a warning, but then it does not find dcicutils for some reason.
poetry install
poetry run publish-to-pypi --noconfirm

info:
@: $(info Here are some 'make' options:)
$(info - Use 'make configure' to configure the repo by installing poetry.)
Expand Down
1,196 changes: 932 additions & 264 deletions poetry.lock

Large diffs are not rendered by default.

14 changes: 8 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "portal-pipeline-utils"
version = "2.1.0"
version = "3.0.0"
description = "Utilities for deploying pipelines and interfacing with portal infrastructure."
authors = [
"Michele Berselli <berselli.michele@gmail.com>",
Expand All @@ -21,20 +21,22 @@ packages = [


[tool.poetry.dependencies]
python = ">=3.7,<3.9"
dcicutils = "^6.3.0"
boto3 = "^1.20.15"
awscli = "^1.22.15"
python = ">=3.8,<3.12"
dcicutils = "^8.0.0"
boto3 = "^1.28.62"
awscli = "^1.29.62"
jsonschema = "^4.7.2"
magma-suite = "^1.0.1"
magma-suite = "^2.0.0"


[tool.poetry.dev-dependencies]
pytest = "*"
boto3-stubs = "^1.28.62"


[tool.poetry.scripts]
pipeline_utils = "pipeline_utils.__main__:main"
publish-to-pypi = "dcicutils.scripts.publish_to_pypi:main"


[build-system]
Expand Down

0 comments on commit 58d8e12

Please sign in to comment.