Skip to content

Commit

Permalink
depend on markupsafe (#31)
Browse files Browse the repository at this point in the history
Also: Python 2.7 is no longer available on GitHub Actions
  • Loading branch information
singingwolfboy authored Dec 5, 2023
1 parent d960e51 commit f804c05
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["2.x", "3.x"]
python-version: ["3.x"]
name: "pytest: Python ${{ matrix.python-version }}"

steps:
Expand All @@ -21,6 +21,9 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Install setuptools
run: pip install setuptools

- name: Install dependencies
run: >-
pip install
Expand Down
1 change: 1 addition & 0 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Flask>=0.7
coverage
mock; python_version < '3.3'
4 changes: 2 additions & 2 deletions flask_misaka.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from __future__ import absolute_import, unicode_literals

__version__ = '1.0.0'
__version__ = '1.0.1'

import misaka
from flask import Markup
from markupsafe import Markup
from copy import copy

# import constants for compatibility
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Flask>=0.7
markupsafe
misaka>=2.0,<3.0
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import re
from setuptools import setup, find_packages

tests_require = []
tests_require = ['Flask']
if sys.version_info[0] < 3:
tests_require = ['mock']
tests_require.append('mock')

version = ''
with open('flask_misaka.py', 'r') as fd:
Expand All @@ -26,7 +26,7 @@
packages=find_packages(),
py_modules=['flask_misaka'],
install_requires=[
'Flask>=0.7',
'markupsafe',
'misaka>=2.0,<3.0',
],
test_suite='tests',
Expand Down
3 changes: 2 additions & 1 deletion tests.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import unicode_literals
from flask import Flask, render_template_string, Markup
from flask import Flask, render_template_string
from markupsafe import Markup
from unittest import TestCase
from textwrap import dedent
try:
Expand Down

0 comments on commit f804c05

Please sign in to comment.