Skip to content
This repository has been archived by the owner on Sep 24, 2022. It is now read-only.

Commit

Permalink
Update documents.
Browse files Browse the repository at this point in the history
  • Loading branch information
FSX committed Dec 1, 2018
1 parent 7ff2412 commit 5cc74e1
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 12 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2011-2015 by Frank Smit <frank@61924.nl>
Copyright (C) 2011-2018 by Frank Smit <frank@61924.nl>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Documentation can be found at: http://misaka.61924.nl/
Installation
------------

Misaka has been tested on CPython 2.6, 2.7, 3.2, 3.3, 3.4, 3.5 and PyPy 2.6. It needs
CFFI 1.0 or newer, because of this it will not work on PyPy 2.5 and older.
Misaka has been tested on CPython 2.7, 3.2, 3.4, 3.5, 3.6, 3.7 and PyPy 2.7 and 3.5.
It needs CFFI 1.0 or newer, because of this it will not work on PyPy 2.5 and older.

With pip::

Expand Down
1 change: 1 addition & 0 deletions THANKS
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ People who contributed code and fixed bugs:
- sprin
- graphicore
- samuelcolvin
- mlinhard
13 changes: 13 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ Changelog

Date format is year-month-day.

2.1.1 (2018-12-01)
^^^^^^^^^^^^^^^^^^

- Fixed segfault caused by missing NULL-check (`#67`_).


NOTE: Misaka doesn't work in Python 2.6 anymore, because pycparser,
a dependency of CFFI, doesn't work in Python 2.6 anymore.


.. _#67: https://github.com/FSX/misaka/issues/67


2.1.0 (2017-01-15)
^^^^^^^^^^^^^^^^^^

Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@

# General information about the project.
project = u'Misaka'
copyright = u'2011-2017, Frank Smit'
copyright = u'2011-2018, Frank Smit'
author = u'Frank Smit'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '2.1.0'
version = '2.1.1'
# The full version, including alpha/beta/rc tags.
release = '2.1.0'
release = '2.1.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def run(self):

setup(
name='misaka',
version='2.1.0',
version='2.1.1',
description='A CFFI binding for Hoedown, a markdown parsing library.',
author='Frank Smit',
author_email='frank@61924.nl',
Expand All @@ -58,13 +58,11 @@ def run(self):
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Programming Language :: C',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Text Processing :: Markup',
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
# and then run "tox" from this directory.

[tox]
envlist = py26, py27, py32, py33, py34, py35, pypy
envlist = py27, py32, py33, py34, py35, py36, py37, pypy

[testenv]
commands = {envpython} setup.py test
deps =

0 comments on commit 5cc74e1

Please sign in to comment.