Skip to content

Commit

Permalink
Merge pull request #109 from 4dn-dcic/upd_py3_11
Browse files Browse the repository at this point in the history
Updates to use python versions 3.8 - 3.11
  • Loading branch information
aschroed authored Oct 12, 2023
2 parents 303a11c + a6c49d8 commit 6cd881b
Show file tree
Hide file tree
Showing 6 changed files with 910 additions and 668 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ 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
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/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.11
- name: Install Python dependencies for publish
run: python -m pip install dcicutils==7.5.1
run: python -m pip install dcicutils==8.0.0
- name: Publish
env:
PYPI_USER: ${{ secrets.PYPI_USER }}
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,30 @@ on:
jobs:
# This workflow contains a single job called "build"
build:
name: Test dcicwrangling 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.8', '3.9', '3.10', '3.11']

# 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/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python_version }}

- name: Install Deps
run: |
pip install poetry coveralls codacy-coverage
make build
pip install coveralls codacy-coverage
- name: QA
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
poetry install
poetry run coverage run --source=dcicwrangling -m pytest -vv tests
poetry run coveralls --service=github
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ clear-poetry-cache: # clear poetry/pypi cache. for user to do explicitly, never
poetry cache clear pypi --all

configure: # does any pre-requisite installs
pip install poetry==1.3.2
pip install poetry==1.4.2

lint:
flake8 dcicwrangling
Expand Down
2 changes: 1 addition & 1 deletion notebooks/useful_notebooks/12_geo_submission.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand Down
Loading

0 comments on commit 6cd881b

Please sign in to comment.