Skip to content

Commit

Permalink
Release v0.10.11 (#136 from chrisjsewell/develop)
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisjsewell authored Jul 21, 2020
2 parents d252697 + d320655 commit d5595fb
Show file tree
Hide file tree
Showing 27 changed files with 406 additions and 345 deletions.
133 changes: 133 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
name: continuous-integration

on: [push, pull_request]

jobs:
pre-commit:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install python dependencies
run: |
python -m pip install --upgrade pip
pip install -e .[code_style]
- name: Run pre-commit
run: |
pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )
tests:

strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.6, 3.8]

runs-on: ${{ matrix.os }}

steps:

- uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}

- name: Install python dependencies
run: |
python -m pip install --upgrade pip
pip install -e .[tests]
- name: install pandoc
uses: r-lib/actions/setup-pandoc@v1
with:
pandoc-version: '2.6'

- name: Install latex dependencies
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get -qq update
sudo apt-get install -y \
texlive \
texlive-xetex \
texlive-latex-extra \
texlive-lang-portuguese \
latexmk
- name: Run pytest with latexmk
if: matrix.os == 'ubuntu-latest'
run: |
pytest --cov=ipypublish --cov-report=xml --cov-report=term-missing
coverage xml
- name: Run pytest without latexmk
if: matrix.os != 'ubuntu-latest'
run: pytest --cov=ipypublish --cov-report=term-missing -k 'not requires_latexmk'

- name: Upload to Codecov
if: matrix.python-version == 3.8 && matrix.os == 'ubuntu-latest' && github.repository == 'chrisjsewell/ipypublish'
uses: codecov/codecov-action@v1
with:
name: ipypublish-pytests-py3.8
flags: pytests
file: ./coverage.xml
fail_ci_if_error: true

nbpublish:
needs: [tests]
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install python dependencies
run: |
python -m pip install --upgrade pip
pip install -e .[tests]
- name: install pandoc
uses: r-lib/actions/setup-pandoc@v1
with:
pandoc-version: '2.6'
- name: Install latex dependencies
run: |
sudo apt-get -qq update
sudo apt-get install -y \
texlive \
texlive-xetex \
texlive-latex-extra \
texlive-lang-portuguese \
latexmk
- name: run nbpublish
run: nbpublish -pdf --pdf-debug -log debug example/notebooks/Example.ipynb

pypi:

name: Publish to PyPi
needs: [pre-commit, tests, nbpublish]
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Build package
run: |
pip install wheel
python setup.py sdist bdist_wheel
- name: Publish
uses: pypa/gh-action-pypi-publish@v1.1.0
with:
user: __token__
password: ${{ secrets.PYPI_KEY }}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ ENV/
# mypy
.mypy_cache/

# masOS
.DS_Store

# docs build
docs/source/_build

Expand Down
11 changes: 4 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ repos:
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace

- repo: https://gitlab.com/pycqa/flake8
rev: "3.7.9"
hooks:
- id: flake8

- repo: https://github.com/psf/black
Expand All @@ -40,10 +44,3 @@ repos:
language: system
exclude: docs/build/*
types: [rst]

# - id: travis-linter
# name: Travis Lint
# entry: travis lint
# files: .travis.yml
# language: ruby
# additional_dependencies: ['travis']
10 changes: 4 additions & 6 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ conda:
environment: docs/environment.yaml

python:
version: 3.6
version: 3.7
install:
- method: pip
path: .
extra_requirements:
- rtd

# default
# sphinx:
# builder: html
# configuration: conf.py
# fail_on_warning: true
sphinx:
builder: html
fail_on_warning: true
150 changes: 0 additions & 150 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"editor.rulers": [
80,
88,
120
],
"files.exclude": {
Expand All @@ -12,7 +12,7 @@
"**/*.pyc": true,
"**/__pycache__": true
},
"python.pythonPath": "/anaconda/envs/ipypublish_dev/bin/python",
"python.pythonPath": "/Users/chrisjsewell/opt/miniconda3/envs/ipypublish/bin/python",
"restructuredtext.confPath": "${workspaceFolder}/docs/source",
"restructuredtext.builtDocumentationPath": "${workspaceFolder}/docs/build/html",
"restructuredtext.preview.scrollEditorWithPreview": false,
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ from one or more Jupyter Notebooks.

**Documentation**: [ipypublish.readthedocs.io](http://ipypublish.readthedocs.io)

[![CI Build](https://travis-ci.org/chrisjsewell/ipypublish.svg?branch=master)](https://travis-ci.org/chrisjsewell/ipypublish)
[![Coverage](https://coveralls.io/repos/github/chrisjsewell/ipypublish/badge.svg?branch=master)](https://coveralls.io/github/chrisjsewell/ipypublish?branch=master)
[![CI Status](https://github.com/chrisjsewell/ipypublish/workflows/continuous-integration/badge.svg)](https://github.com/chrisjsewell/ipypublish/actions)
[![Coverage Status](https://codecov.io/gh/chrisjsewell/ipypublish/branch/develop/graph/badge.svg)](https://codecov.io/gh/chrisjsewell/ipypublish)
[![PyPI](https://img.shields.io/pypi/v/ipypublish.svg)](https://pypi.python.org/pypi/ipypublish/)
[![DOI](https://zenodo.org/badge/96322423.svg)](https://zenodo.org/badge/latestdoi/96322423)
[![Conda](https://anaconda.org/conda-forge/ipypublish/badges/version.svg)](https://anaconda.org/conda-forge/ipypublish)
Expand Down
2 changes: 1 addition & 1 deletion conda_dev_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies:
- tornado
- traitlets
# testing
- pytest >=3.6
- pytest >=4.4
- pytest-regressions
- nbsphinx
- pillow
Expand Down
3 changes: 3 additions & 0 deletions doc8.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[doc8]

ignore-path-errors=docs/source/metadata_tags.rst;D001
2 changes: 1 addition & 1 deletion docs/source/acknowledgements.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ I also took strong influence from:
- [Julius Schulz](http://blog.juliusschulz.de/blog/ultimate-ipython-notebook)
- [Dan Mackinlay](https://livingthing.danmackinlay.name/jupyter.html)
- Notebook concatenation was adapted from [nbconvert issue#253](https://github.com/jupyter/nbconvert/issues/253)
- [nbshinx](https://nbsphinx.readthedocs.io)
- [nbsphinx](https://nbsphinx.readthedocs.io)
- [panflute](http://scorreia.com/software/panflute/)
- [pandoc-xnos](https://github.com/tomduck/pandoc-xnos)
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ def process_citations(app, doctree, docname):
"bibtexparser": ("https://bibtexparser.readthedocs.io/en/master/", None),
# 'docutils': ("https://docutils.readthedocs.io/en/sphinx-docs", None),
# # TODO docutils intersphinx
"sphinx": ("http://www.sphinx-doc.org/en/latest/", None),
"sphinx": ("https://www.sphinx-doc.org/en/2.0/", None),
}

intersphinx_aliases = {
Expand Down
Loading

0 comments on commit d5595fb

Please sign in to comment.