Skip to content

Commit

Permalink
Merge pull request #162 from greyli/update-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
greyli committed Oct 17, 2023
2 parents 6ff2d5d + 41969a5 commit 9fd814c
Show file tree
Hide file tree
Showing 8 changed files with 103 additions and 12 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: build

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
tests:
name: tests
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}
- run: python -m pip install --upgrade pip wheel
- run: pip install tox tox-gh-actions
- run: tox
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@
/build/
/dist/
/src/Flask_Assets.egg-info/
venv
tests/static
.eggs/

7 changes: 7 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2.1.0
- Drop Python 2.x and Python 3.6 support.
- Migrate from nose to pytest.
- Migrate from Travis to GitHub Actions.
- Test against Python 3.7 - 3.12.
- Fix compatibility with Flask 2.0 and 3.0.

2.0 (2019-12-20)
- Compatibility with webassets 2.0.

Expand Down
5 changes: 0 additions & 5 deletions requirements-dev.pip

This file was deleted.

5 changes: 5 additions & 0 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pytest
Flask-Script
webassets
PyYAML
pyScss
44 changes: 44 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile
#
blinker==1.6.3
# via flask
click==8.1.7
# via flask
exceptiongroup==1.1.3
# via pytest
flask==3.0.0
# via flask-script
flask-script==2.0.6
# via -r requirements.in
iniconfig==2.0.0
# via pytest
itsdangerous==2.1.2
# via flask
jinja2==3.1.2
# via flask
markupsafe==2.1.3
# via
# jinja2
# werkzeug
packaging==23.2
# via pytest
pluggy==1.3.0
# via pytest
pyscss==1.4.0
# via -r requirements.in
pytest==7.4.2
# via -r requirements.in
pyyaml==6.0.1
# via -r requirements.in
six==1.16.0
# via pyscss
tomli==2.0.1
# via pytest
webassets==0.11.1
# via -r requirements.in
werkzeug==3.0.0
# via flask
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,12 @@ def parse_version(asignee):
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
'Topic :: Software Development :: Libraries :: Python Modules'
],
test_suite='nose.collector',
tests_require=[
'nose',
'pytest',
'flask-script'
],
)
19 changes: 15 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
[tox]
envlist = py26, py27, py33, pypy
envlist = py37, py38, py39, py310, py311, py312
skip_missing_interpreters = true

[gh-actions]
python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310
3.11: py311
3.12: py312

[testenv]
commands = nosetests tests
deps =
-r{toxinidir}/requirements-dev.pip
deps =
-r requirements.txt
commands =
pytest

0 comments on commit 9fd814c

Please sign in to comment.