Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
IngoMeyer441 committed Aug 30, 2021
2 parents d6dacdc + 395618f commit c7b4c18
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 3 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/check-python-compatibility.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: pre-commit checks
on: [push, pull_request]
jobs:
pre-commit:
runs-on: ubuntu-latest
container: sciapp/python-testing:latest-ubuntu-20.04
steps:
- name: Check out repository code
uses: actions/checkout@v2
- name: Setup simple-term-menu on Python 3.5
run: python3.5 -m pip install .
- name: Run a simple-term-menu check on Python 3.5
run: python3.5 -m simple_term_menu --version
7 changes: 7 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ pre-commit:
exit 1;
}

check-python-compatibility:py35:
stage: check
image: sciapp/python-testing:latest-ubuntu-20.04
script:
- python3.5 -m pip install .
- python3.5 -m simple_term_menu --version

build-linux-executable:
stage: build
image: centos:7
Expand Down
5 changes: 4 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ repos:
rev: 21.6b0
hooks:
- id: black
args: ['--line-length=120']
args: [
'--line-length=120',
'--target-version=py35',
]
- repo: https://github.com/PyCQA/isort
rev: 5.9.2
hooks:
Expand Down
4 changes: 2 additions & 2 deletions simple_term_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
__email__ = "i.meyer@fz-juelich.de"
__copyright__ = "Copyright © 2021 Forschungszentrum Jülich GmbH. All rights reserved."
__license__ = "MIT"
__version_info__ = (1, 4, 0)
__version_info__ = (1, 4, 1)
__version__ = ".".join(map(str, __version_info__))


Expand Down Expand Up @@ -562,7 +562,7 @@ def __init__(
status_bar: Optional[Union[str, Iterable[str], Callable[[str], str]]] = None,
status_bar_below_preview: bool = DEFAULT_STATUS_BAR_BELOW_PREVIEW,
status_bar_style: Optional[Iterable[str]] = DEFAULT_STATUS_BAR_STYLE,
title: Optional[Union[str, Iterable[str]]] = None,
title: Optional[Union[str, Iterable[str]]] = None
):
def extract_shortcuts_menu_entries_and_preview_arguments(
entries: Iterable[str],
Expand Down

0 comments on commit c7b4c18

Please sign in to comment.