Skip to content

Commit a73a085

Browse files
Release 0.3.0 (#14)
* Update GHA to run on python 3.10 and 3.11 * Introduce GHA checks for black and isort on PRs * Update badges to show python 3.11 support * Run GHA only on necessary python versions * Combine code style checks in lint.yaml * Update README.md (#15) * Combine updated python badges * Add build in dev dependency group --------- Co-authored-by: Daniel Huppmann <[email protected]>
1 parent 27b3000 commit a73a085

File tree

8 files changed

+67
-84
lines changed

8 files changed

+67
-84
lines changed

.github/workflows/flake8.yaml .github/workflows/lint.yaml

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# copied from https://github.com/marketplace/actions/install-poetry-action
2-
name: flake8
2+
name: lint
33

44
on: pull_request
55

66
jobs:
7-
flake8:
7+
lint:
88
runs-on: ubuntu-latest
99
steps:
1010
#----------------------------------------------
@@ -16,7 +16,7 @@ jobs:
1616
id: setup-python
1717
uses: actions/setup-python@v4
1818
with:
19-
python-version: "3.10"
19+
python-version: "3.11"
2020
#----------------------------------------------
2121
# ----- install & configure poetry -----
2222
#----------------------------------------------
@@ -50,7 +50,19 @@ jobs:
5050
#----------------------------------------------
5151
# run test suite
5252
#----------------------------------------------
53+
- name: Run black
54+
run: |
55+
source .venv/bin/activate
56+
black --check .
57+
- name: Run isort
58+
run: |
59+
source .venv/bin/activate
60+
isort --check-only .
5361
- name: Run flake8
5462
run: |
5563
source .venv/bin/activate
5664
flake8 .
65+
- name: Run mypy
66+
run: |
67+
source .venv/bin/activate
68+
mypy .

.github/workflows/mypy.yaml

-56
This file was deleted.

.github/workflows/publish.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
id: setup-python
2323
uses: actions/setup-python@v4
2424
with:
25-
python-version: "3.10"
25+
python-version: "3.11"
2626
#----------------------------------------------
2727
# ----- install & configure poetry -----
2828
#----------------------------------------------

.github/workflows/pytest.yaml

+7-20
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,14 @@ on: pull_request
55

66
jobs:
77
test:
8+
strategy:
9+
matrix:
10+
python-version:
11+
- "3.10" # Earliest version supported by ixmp4
12+
- "3.11" # Latest version supported by ixmp4
13+
814
runs-on: ubuntu-latest
915
services:
10-
oracle:
11-
image: gvenzl/oracle-xe:latest
12-
env:
13-
ORACLE_RANDOM_PASSWORD: true
14-
APP_USER: ixmp4_test
15-
APP_USER_PASSWORD: ixmp4_test
16-
ports:
17-
- 1521:1521
18-
options: >-
19-
--health-cmd healthcheck.sh
20-
--health-interval 10s
21-
--health-timeout 5s
22-
--health-retries 10
23-
2416
postgres:
2517
image: postgres
2618
env:
@@ -44,7 +36,7 @@ jobs:
4436
id: setup-python
4537
uses: actions/setup-python@v4
4638
with:
47-
python-version: "3.10"
39+
python-version: ${{ matrix.python-version }}
4840
#----------------------------------------------
4941
# ----- install & configure poetry -----
5042
#----------------------------------------------
@@ -71,11 +63,6 @@ jobs:
7163
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
7264
run: poetry install --no-interaction --no-root --with dev,server
7365
#----------------------------------------------
74-
# install oracle client
75-
#----------------------------------------------
76-
- name: Setup Oracledb client
77-
uses: GoodManWEN/oracle-client-action@main
78-
#----------------------------------------------
7966
# install your root project, if required
8067
#----------------------------------------------
8168
- name: Install library

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Copyright (c) 2023 IIASA - Energy, Climate, and Environment Program (ECE)
44

55
[![license: MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/iiasa/ixmp4/blob/main/LICENSE)
6-
[![python](https://img.shields.io/badge/python-3.10-blue?logo=python&logoColor=white)](https://github.com/iiasa/ixmp4)
6+
[![python](https://img.shields.io/badge/python-3.10_|_3.11-blue?logo=python&logoColor=white)](https://github.com/iiasa/ixmp4)
77
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
88

99
## Overview
@@ -29,7 +29,7 @@ For installing the latest version directly from GitHub do the following.
2929

3030
### Requirements
3131

32-
This project requires Python 3.10 and poetry (>= 1.2).
32+
This project requires Python 3.10 (or higher) and poetry (>= 1.2).
3333

3434
### Setup
3535

doc/source/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Copyright © 2023 IIASA - Energy, Climate, and Environment Program (ECE)
1111
.. |black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
1212
:target: https://github.com/psf/black
1313

14-
.. |python| image:: https://img.shields.io/badge/python-3.10-blue?logo=python&logoColor=white
14+
.. |python| image:: https://img.shields.io/badge/python-3.10_|_3.11-blue?logo=python&logoColor=white
1515
:target: https://github.com/iiasa/ixmp4
1616

1717
Overview

poetry.lock

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

pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ pytest-lazy-fixture = "^0.6.3"
6969
snakeviz = "^2.1.1"
7070
types-toml = "^0.10.8.7"
7171
isort = "^5.12.0"
72+
build = "^0.10.0"
7273

7374
[tool.poetry.group.tutorial]
7475
optional = true

0 commit comments

Comments
 (0)