Skip to content

Commit

Permalink
Merge pull request #13 from facelessuser/bugfix/tests
Browse files Browse the repository at this point in the history
  • Loading branch information
facelessuser authored Jul 7, 2020
2 parents d253703 + 11c6744 commit 8e530fe
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 115 deletions.
38 changes: 27 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ on:
push:
branches:
- 'master'
tags:
- '**'
pull_request:
branches:
- '**'

jobs:
tests:
Expand All @@ -12,16 +17,21 @@ jobs:
max-parallel: 4
matrix:
platform: [ubuntu-latest, windows-latest]
tox-env: [py35, py36, py37, py38]
python-version: [3.5, 3.6, 3.7, 3.8, 3.9-dev]
include:
- tox-env: py35
python-version: 3.5
- tox-env: py36
python-version: 3.6
- tox-env: py37
python-version: 3.7
- tox-env: py38
python-version: 3.8
- python-version: 3.5
tox-env: py35
- python-version: 3.6
tox-env: py36
- python-version: 3.7
tox-env: py37
- python-version: 3.8
tox-env: py38
- python-version: 3.9-dev
tox-env: py39
exclude:
- platform: windows-latest
python-version: 3.9-dev

env:
TOXENV: ${{ matrix.tox-env }}
Expand All @@ -31,9 +41,15 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
if: "!endsWith(matrix.python-version, '-dev')"
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Set up development Python ${{ matrix.python-version }}
if: endsWith(matrix.python-version, '-dev')
uses: deadsnakes/[email protected]
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools tox coverage codecov
Expand All @@ -53,7 +69,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.7]
python-version: [3.8]

env:
TOXENV: lint
Expand All @@ -77,7 +93,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.7]
python-version: [3.8]

env:
TOXENV: documents
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: 3.7
python-version: 3.8
- name: Package
run: |
pip install --upgrade setuptools wheel
Expand Down
98 changes: 0 additions & 98 deletions .github/workflows/pullrequest.yml

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ name with existing emoji and Material icons.

[donate-image]: https://img.shields.io/badge/Donate-PayPal-3fabd1?logo=paypal
[donate-link]: https://www.paypal.me/facelessuser
[github-ci-image]: https://github.com/facelessuser/mkdocs-material-extensions/workflows/build/badge.svg
[github-ci-link]: https://github.com/facelessuser/mkdocs-material-extensions/actions?workflow=build
[github-ci-image]: https://github.com/facelessuser/mkdocs-material-extensions/workflows/build/badge.svg?branch=master&event=push
[github-ci-link]: https://github.com/facelessuser/mkdocs-material-extensions/actions?query=workflow%3Abuild+branch%3Amaster
[discord-image]: https://img.shields.io/discord/678289859768745989?logo=discord&logoColor=aaaaaa&color=mediumpurple&labelColor=333333
[discord-link]: https://discord.gg/fqQ7ypS
[discord-link]: https://discord.gg/TWs8Tgr
[codecov-image]: https://img.shields.io/codecov/c/github/facelessuser/mkdocs-material-extensions/master.svg?logo=codecov&logoColor=aaaaaa&labelColor=333333
[codecov-link]: https://codecov.io/github/facelessuser/mkdocs-material-extensions
[pypi-image]: https://img.shields.io/pypi/v/mkdocs-material-extensions.svg?logo=pypi&logoColor=aaaaaa&labelColor=333333
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ def get_description():
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: Text Processing :: Filters',
Expand Down
2 changes: 1 addition & 1 deletion tests/extensions/test_emoji.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def test_material_svg_injection(self):
We can also use Fontawesome Icons :fontawesome-solid-ambulance:.
That's not all, we can also use Octicons :octicons-octoface:.
That's not all, we can also use Octicons :octicons-octoface-16:.
''',
r'''
<p>We can use Material Icons <span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M21 16v-2l-8-5V3.5A1.5 1.5 0 0011.5 2 1.5 1.5 0 0010 3.5V9l-8 5v2l8-2.5V19l-2 1.5V22l3.5-1 3.5 1v-1.5L13 19v-5.5l8 2.5z"/></svg></span>.</p>
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
{py27,py35,py36,py37}, lint, documents
{py35,py36,py37,py38,py39}, lint, documents

[testenv]
passenv = LANG
Expand Down

0 comments on commit 8e530fe

Please sign in to comment.