Skip to content

Commit 0053494

Browse files
authored
Merge pull request #47 from inpefess/maintenance
CI with different python versions
2 parents d6315f2 + 40fba18 commit 0053494

File tree

10 files changed

+116
-132
lines changed

10 files changed

+116
-132
lines changed

.circleci/config.yml

+16-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@ version: 2.1
22

33
jobs:
44
build-and-test:
5+
parameters:
6+
python_version:
7+
description: "Python version to test against"
8+
default: "3.10.4"
9+
type: string
510
docker:
6-
- image: cimg/python:3.10.0
11+
- image: cimg/python:<< parameters.python_version >>
712
working_directory: ~/repo
813
steps:
914
- checkout
1015
- restore_cache:
1116
keys:
12-
- v2-dependencies-{{ checksum "poetry.lock" }}
17+
- v1-dependencies-<< parameters.python_version >>-{{ checksum "poetry.lock" }}
1318
- run:
1419
name: install dependencies
1520
command: |
@@ -49,6 +54,13 @@ jobs:
4954
path: test-results
5055

5156
workflows:
52-
main:
57+
workflow:
5358
jobs:
54-
- build-and-test
59+
- build-and-test:
60+
python_version: "3.7.13"
61+
- build-and-test:
62+
python_version: "3.8.13"
63+
- build-and-test:
64+
python_version: "3.9.12"
65+
- build-and-test:
66+
python_version: "3.10.4"

.dockerignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ doc/
77
./**/*.gif
88
examples/video_example/
99
examples/output/
10-
examples/document/
1110
./**/*.log
11+
./**/*.pdf
1212
./**/*.*~
1313
./**/*~
1414
local-build.sh

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ doc/build/
1717
.ipynb_checkpoints/
1818
flycheck_*.*
1919
.dir-locals.el
20+
examples/output/

Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
FROM makarius/isabelle:Isabelle2021-1
2-
ENV HOME=/home/isabelle
3-
ENV PATH=${HOME}/.local/bin:${HOME}/Isabelle/bin:${PATH}
2+
ENV HOME=/home/isabelle/
3+
ENV PATH=${HOME}/.local/bin/:${HOME}/Isabelle/bin/:${PATH}
44
USER root
55
RUN apt-get update
66
RUN apt-get install -y python3-pip
7-
COPY examples ${HOME}/isabelle-client-examples
8-
RUN chown -R isabelle ${HOME}/isabelle-client-examples
7+
COPY examples/ ${HOME}/isabelle-client-examples/
8+
RUN chown -R isabelle ${HOME}/isabelle-client-examples/
99
USER isabelle
1010
RUN pip install -U pip jupyterlab
11-
COPY isabelle_client ${HOME}/isabelle_client
11+
COPY isabelle_client/ ${HOME}/isabelle_client/
1212
COPY pyproject.toml ${HOME}
1313
COPY poetry.lock ${HOME}
1414
COPY README.rst ${HOME}

README.rst

+5-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ More documentation can be found
8282
Video example
8383
=============
8484

85-
|video tutorial|.
85+
.. image:: ../../examples/tty.gif
86+
:alt:
87+
88+
(if not displayed correctly on this page, please watch `here <https://isabelle-client.readthedocs.io/en/latest/#video-example>`__).
8689

8790
How to cite
8891
===========
@@ -103,4 +106,4 @@ DOI <https://doi.org/10.1007/978-3-030-81097-9_20>`__.
103106
:target: https://codecov.io/gh/inpefess/isabelle-client
104107
.. |Binder| image:: https://mybinder.org/badge_logo.svg
105108
:target: https://mybinder.org/v2/gh/inpefess/isabelle-client/HEAD?labpath=isabelle-client-examples/example.ipynb
106-
.. |video tutorial| image:: ../../examples/tty.gif
109+

doc/source/conf.py

+1-30
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,14 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
# pylint: disable-all
16-
# -- Path setup --------------------------------------------------------------
17-
18-
# If extensions (or modules to document with autodoc) are in another directory,
19-
# add these directories to sys.path here. If the directory is relative to the
20-
# documentation root, use os.path.abspath to make it absolute, like shown here.
21-
#
2216
import os
2317
import sys
2418

2519
sys.path.insert(0, os.path.abspath("../.."))
26-
27-
28-
# -- Project information -----------------------------------------------------
29-
3020
project = "isabelle-client"
31-
copyright = "2021, Boris Shminke"
21+
copyright = "2021-2022, Boris Shminke"
3222
author = "Boris Shminke"
33-
34-
# -- General configuration ---------------------------------------------------
35-
36-
# Add any Sphinx extension module names here, as strings. They can be
37-
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
38-
# ones.
3923
extensions = ["sphinx.ext.autodoc", "sphinx.ext.coverage"]
40-
41-
# Add any paths that contain templates here, relative to this directory.
4224
templates_path = ["_templates"]
43-
44-
# List of patterns, relative to source directory, that match files and
45-
# directories to ignore when looking for source files.
46-
# This pattern also affects html_static_path and html_extra_path.
4725
exclude_patterns = []
48-
49-
50-
# -- Options for HTML output -------------------------------------------------
51-
52-
# The theme to use for HTML and HTML Help pages. See the documentation for
53-
# a list of builtin themes.
54-
#
5526
html_theme = "sphinx_rtd_theme"

examples/example.ipynb

+46-49
Large diffs are not rendered by default.

isabelle_client/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
from isabelle_client.socket_communication import IsabelleResponse
1818
from isabelle_client.utils import get_isabelle_client, start_isabelle_server
1919

20-
__version__ = "0.3.4"
20+
__version__ = "0.3.5"

poetry.lock

+39-39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "isabelle-client"
3-
version = "0.3.4"
3+
version = "0.3.5"
44
description = "A client to Isabelle proof assistant server"
55
authors = ["Boris Shminke <boris@shminke.ml>"]
66
license = "Apache-2.0"

0 commit comments

Comments
 (0)