From d88ffda4f8daa4a88fb84a7d447f58f89fc46871 Mon Sep 17 00:00:00 2001 From: Christophe Demko Date: Mon, 22 Feb 2021 20:38:55 +0100 Subject: [PATCH] Update panflute version --- .travis.yml | 9 +++---- docs/conf.py | 8 +++---- docs/images/pandoc-beamer-block-sample.txt | 2 +- docs/requirements.txt | 4 ++-- pandoc_beamer_block.py | 1 - setup.cfg | 8 +++++++ setup.py | 28 ++++++++++------------ tox.ini | 10 +++----- 8 files changed, 33 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index b189cfc..1146219 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,18 +2,15 @@ language: python python: - "3.6" install: - - wget https://github.com/jgm/pandoc/releases/download/2.7.2/pandoc-2.7.2-1-amd64.deb - - sudo dpkg -i pandoc-2.7.2-1-amd64.deb + - wget https://github.com/jgm/pandoc/releases/download/2.11.4/pandoc-2.11.4-1-amd64.deb + - sudo dpkg -i pandoc-2.11.4-1-amd64.deb - pandoc -v - pip install -e .[test] - - pip install black - - pip install pylint - - pip install coverage - pip install coveralls script: - black --check pandoc_beamer_block.py setup.py tests/test_block.py - pylint pandoc_beamer_block.py setup.py - - coverage run -a --source=pandoc_beamer_block setup.py test + - pytest --cov=pandoc_beamer_block after_success: - coveralls diff --git a/docs/conf.py b/docs/conf.py index 28e4eeb..ff03508 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,6 +18,7 @@ import os import sys +from datetime import date sys.path.insert(0, os.path.abspath("../..")) @@ -26,20 +27,19 @@ # -- Project information ----------------------------------------------------- project = "pandoc-beamer-block" -copyright = "2019, Christophe Demko" +copyright = "2019-%s, Christophe Demko" % date.today().year author = "Christophe Demko" - # The short X.Y version version = "0.1" # The full version, including alpha/beta/rc tags -release = "0.1.1" +release = "0.1.2" # -- General configuration --------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it HERE. # # needs_sphinx = '1.0' -needs_sphinx = "2.0" +needs_sphinx = "3.5" # Add any Sphinx extension module names HERE, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom diff --git a/docs/images/pandoc-beamer-block-sample.txt b/docs/images/pandoc-beamer-block-sample.txt index b38b9ce..606e73d 100644 --- a/docs/images/pandoc-beamer-block-sample.txt +++ b/docs/images/pandoc-beamer-block-sample.txt @@ -29,4 +29,4 @@ In gravida ultricies dictum. Pellentesque nec leo maximus nisl blandit ultrices id ligula. Sed ornare euismod nibh, tempus lobortis leo eleifend vitae. Donec a turpis id elit gravida cursus. Pellentesque tempor erat sed nisl pretium, in accumsan nulla viverra. Pellentesque vitae purus magna. -:::::::::::: \ No newline at end of file +:::::::::::: diff --git a/docs/requirements.txt b/docs/requirements.txt index b24ebe7..e4a9768 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -Sphinx>=2.0.0 -sphinx_rtd_theme>=0.4 +Sphinx>=3.5 +sphinx_rtd_theme>=0.5 diff --git a/pandoc_beamer_block.py b/pandoc_beamer_block.py index fcce867..fdb03a0 100644 --- a/pandoc_beamer_block.py +++ b/pandoc_beamer_block.py @@ -29,7 +29,6 @@ def prepare(doc): for definition in meta: # Verify the definition - # pylint: disable=bad-continuation if ( isinstance(definition, dict) and "classes" in definition diff --git a/setup.cfg b/setup.cfg index ee9c50a..5361986 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,14 @@ universal=1 [metadata] description-file = README.md +version = 0.1.2 +release = 0.1.2 [aliases] test=pytest + +[build_sphinx] +project = pandoc-beamer-block +version = 0.1 +release = 0.1.2 +copyright = 2019-2021, Christophe Demko diff --git a/setup.py b/setup.py index b5382f1..69ef9a1 100644 --- a/setup.py +++ b/setup.py @@ -6,35 +6,27 @@ """ # To use a consistent encoding -from os import path # Always prefer setuptools over distutils from setuptools import setup -HERE = path.abspath(path.dirname(__file__)) - # Get the long description from the README file -try: - import pypandoc - - LONG_DESCRIPTION = pypandoc.convert("README.md", "rst") -except (IOError, ImportError): - with open(path.join(HERE, "README.md"), encoding="utf-8") as f: - LONG_DESCRIPTION = f.read() +with open("README.md", "r") as stream: + LONG_DESCRIPTION = stream.read() setup( name="pandoc-beamer-block", # Versions should comply with PEP440. For a discussion on single-sourcing # the version across setup.py and the project code, see # https://packaging.python.org/en/latest/single_source_version.html - version="0.1.1", # The project's description description="A pandoc filter for adding beamer block on specific div", long_description=LONG_DESCRIPTION, + long_description_content_type="text/markdown", # The project's main homepage. url="https://github.com/chdemko/pandoc-beamer-block", # The project's download page - download_url="https://github.com/chdemko/pandoc-beamer-block/archive/master.zip", + download_url="https://github.com/chdemko/pandoc-beamer-block/archive/develop.zip", # Author details author="Christophe Demko", author_email="chdemko@gmail.com", @@ -62,6 +54,9 @@ # Specify the Python versions you support HERE. In particular, ensure # that you indicate whether you support Python 2, Python 3 or both. "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", # Natural language used "Natural Language :: English", ], @@ -80,16 +75,17 @@ # your project is installed. For an analysis of "install_requires" vs pip's # requirements files see: # https://packaging.python.org/en/latest/requirements.html - install_requires=["panflute>=1.11", "pypandoc>=1.4"], + install_requires=["panflute>=2.0"], # List additional groups of dependencies HERE (e.g. development # dependencies). You can install these using the following syntax, # for example: # $ pip install -e .[dev,test] - extras_require={"dev": ["check-manifest"], "test": ["coverage"]}, + extras_require={ + "dev": ["check-manifest"], + "test": ["pytest-cov", "black", "pylint"], + }, # If there are data files included in your packages that need to be # installed, specify them HERE. If using Python 2.6 or less, then these # have to be included in MANIFEST.in as well. package_data={}, - setup_requires=["pytest-runner"], - tests_require=["pytest", "coverage"], ) diff --git a/tox.ini b/tox.ini index 572bfec..9a291f0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,14 +1,10 @@ [tox] -envlist = py36 +envlist = py36,py37,py38,py39 [testenv] -deps = - coverage - black - pylint - panflute>=1.11 +deps = .[test] commands = black --check pandoc_beamer_block.py setup.py tests/test_block.py docs/conf.py - coverage run -a --source=pandoc_beamer_block setup.py test + pytest --cov=pandoc_beamer_block pylint pandoc_beamer_block.py setup.py