Skip to content

Commit

Permalink
Merge branch '2.0' into bs5
Browse files Browse the repository at this point in the history
  • Loading branch information
lenadax committed Oct 28, 2024
2 parents 4087b96 + 71631ad commit 92b0755
Show file tree
Hide file tree
Showing 27 changed files with 740 additions and 294 deletions.
34 changes: 10 additions & 24 deletions .github/workflows/test_js.yaml
Original file line number Diff line number Diff line change
@@ -1,34 +1,20 @@
name: JS Test chosen
name: JS tests

on:
push:
paths:
- '**.js'
on: [push]

jobs:
test:
name: TEST CHOSEN
name: Test

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Install
run: |
npm --save-dev install \
qunit \
karma \
karma-qunit \
karma-coverage \
karma-chrome-launcher \
karma-module-resolver-preprocessor
npm --no-save install https://github.com/jquery/jquery#main
- name: Install
run: |
corepack enable
make nodejs
- name: Run tests
run: |
node_modules/karma/bin/karma start js/karma.conf.js
- name: Run coverage
run: |
npm run karma-test:coverage
- name: Run tests
run: make wtr
60 changes: 29 additions & 31 deletions .github/workflows/test_py.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: PY Test chosen
name: Python tests

on:
push:
paths:
- '**.py'
on: [push]

jobs:
test:
Expand All @@ -19,34 +16,35 @@ jobs:
- macos-latest

python:
- "2.7"
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
- "3.13"

steps:
- uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}

- name: Install
run: |
pip install wheel
pip install coverage
pip install lxml
pip install zope.testrunner
pip install https://github.com/conestack/webresource/archive/master.zip
pip install https://github.com/conestack/yafowil/archive/master.zip
pip install -e .[test]
- name: Run tests
run: |
python --version
python -m yafowil.widget.chosen.tests
- name: Run coverage
run: |
coverage run --source=src/yafowil/widget/chosen --omit=src/yafowil/widget/chosen/example.py -m yafowil.widget.chosen.tests
coverage report --fail-under=99
- uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}

- name: Install
run: |
pip install wheel
pip install coverage
pip install https://github.com/conestack/webresource/archive/master.zip
pip install https://github.com/conestack/yafowil/archive/master.zip
pip install -e .[test]
- name: Run tests
run: |
python --version
python -m pytest src/yafowil/widget/chosen/tests
- name: Run coverage
run: |
coverage run --source=src/yafowil/widget/chosen --omit=src/yafowil/widget/chosen/example.py -m pytest src/yafowil/widget/chosen/tests
coverage report --fail-under=99
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@
*.pyc
*.pyo
/.coverage
/.mxmake/
/coverage/
/dist/
/htmlcov/
/js/karma/
/node_modules/
/package-lock.json
/pnpm-lock.yaml
/py2/
/py3/
/pypy3/
/requirements-mxdev.txt
/venv/
2 changes: 1 addition & 1 deletion LICENSE.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ License
=======

Copyright (c) 2012-2021, BlueDynamics Alliance, Austria, Germany, Switzerland
Copyright (c) 2021-2022, Yafowil Contributors
Copyright (c) 2021-2024, Yafowil Contributors
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
Loading

0 comments on commit 92b0755

Please sign in to comment.