Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Python 3.11 #396

Merged
merged 19 commits into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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-20.04
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can this work with 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.8
- name: Install Python dependencies for publish
run: python -m pip install dcicutils==7.5.1
- name: Publish
env:
PYPI_USER: ${{ secrets.PYPI_USER }}
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
make configure
make publish-for-ga
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
Change Log
==========


5.0.0
=====

* Update to Python 3.11.


4.0.0
=====

Expand Down
14 changes: 14 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ clean:
lint:
flake8 tibanna

build:
poetry install
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add make configure here. You'll need to make a target.

And install looks redundant with build. Rather than eliminate it, to stay compatible, I suggest it should identify itself a synonym and then be implemented by make build.


install:
poetry install

Expand All @@ -17,6 +20,17 @@ retest: # runs only failed tests from the last test run.
update: # updates dependencies
poetry update

publish:
# New Python based publish script (2023-09-20).
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

publish-pypi:
scripts/publish-pypi

Expand Down
46 changes: 18 additions & 28 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "tibanna"
version = "4.0.0"
version = "4.0.0.1b1" # TODO: To become 5.0.0
description = "Tibanna runs portable pipelines (in CWL/WDL) on the AWS Cloud."
authors = ["4DN-DCIC Team <[email protected]>"]
license = "MIT"
Expand Down Expand Up @@ -28,10 +28,10 @@ classifiers = [
]

[tool.poetry.dependencies]
python = ">=3.8,<3.11"
python = ">=3.8,<3.12"
python-lambda-4dn = "0.12.3"
boto3 = "^1.9.0"
botocore = "^1.12.1"
boto3 = "^1.28.51"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add boto3-stubs and botocore-stubs in dev-dependencies.

botocore = "^1.31.51"
Benchmark-4dn = "^0.5.23"
tomlkit = "^0.11.0"

Expand All @@ -55,6 +55,7 @@ sphinx-rtd-theme = "0.5.0" # Do we have a good reason to pin this? -kmp 9-Nov-2
[tool.poetry.scripts]
tibanna = "tibanna.__main__:main"
awsf3 = "awsf3.__main__:main"
publish-to-pypi = "dcicutils.scripts.publish_to_pypi:main"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down
Loading