Install Python and R runtimes

Runtimes for the various backends are expected to be made available from their
own ecosystem. However, for convenience and to help with development
settings (where the runtime might change), as part of installing catala they are
put, in source form, into `<prefix>/lib/catala/runtime_LANG`.

When using a dev version of Catala, and using Python, one would then just have
to do `pip install <prefix>/lib/catala/runtime_python` within their venv to be
able to run their python programs.

Makefile

@@ -37,14 +37,14 @@ PY_VENV_ACTIVATE = . $(PY_VENV_DIR)/bin/activate;
 $(PY_VENV_DIR): $(PY_VENV_DIR)/stamp
 
 $(PY_VENV_DIR)/stamp: \
-    runtimes/python/catala/pyproject.toml \
+    runtimes/python/pyproject.toml \
     syntax_highlighting/en/pygments/pyproject.toml \
     syntax_highlighting/fr/pygments/pyproject.toml \
     syntax_highlighting/pl/pygments/pyproject.toml
 	test -d $(PY_VENV_DIR) || python3 -m venv $(PY_VENV_DIR)
 	$(PY_VENV_ACTIVATE) python3 -m pip install -U pip
 	$(PY_VENV_ACTIVATE) python3 -m pip install -U \
-	  -e runtimes/python/catala \
+	  -e runtimes/python \
 	  -e syntax_highlighting/en/pygments \
 	  -e syntax_highlighting/fr/pygments \
 	  -e syntax_highlighting/pl/pygments
@@ -52,10 +52,18 @@ $(PY_VENV_DIR)/stamp: \
 
 dependencies-python: $(PY_VENV_DIR)
 
-#> dependencies				: Install the Catala OCaml, JS and Git dependencies
-dependencies: dependencies-ocaml dependencies-js dependencies-python
+build-runtime-python: dependencies-python
+	$(PY_VENV_ACTIVATE) python3 -m pip install -U build
+	$(PY_VENV_ACTIVATE) python -m build runtimes/python -o _build/python-runtime/
 
-dependencies-with-z3: dependencies-ocaml-with-z3 dependencies-js dependencies-python
+publish-runtime-python:
+	$(PY_VENV_ACTIVATE) python3 -m pip install -U twine
+	$(PY_VENV_ACTIVATE) python -m twine upload _build/python-runtime/*
+
+#> dependencies				: Install the Catala OCaml, JS and Git dependencies
+dependencies: dependencies-ocaml dependencies-python
+
+dependencies-with-z3: dependencies-ocaml-with-z3 dependencies-python
 
 ##########################################
 # Catala compiler rules

build_system/dune

@@ -26,8 +26,7 @@
   (:standard
    (:include custom_linking.sexp)))
  (libraries clerk_driver)
- (link_deps
-  (package catala))
+ (link_deps ../compiler/catala.exe)
  ; not a real dependency, but when running clerk in practice you always want the catala binary to be up-to-date (e.g. `dune exec -- ckerk test`)
  (modules clerk)
  (package catala))

dune-project

@@ -6,6 +6,8 @@
 
 (formatting)
 
+(subst disabled)
+
 (source
  (uri git+https://github.com/CatalaLang/catala.git))
 
@@ -27,3 +29,4 @@
 (license Apache-2.0)
 
 (using menhir 2.1)
+(using directory-targets 0.1)

runtimes/dune

@@ -1,4 +1,14 @@
 (documentation
  (package catala))
 
-(dirs jsoo ocaml python)
+(dirs jsoo ocaml python r)
+
+; Installation is done as source under catala lib directory
+; For dev version this makes it easy to install the proper runtime with just
+; `pip install dir` and be sure to get the right version
+
+; Python runtime
+(install
+ (files
+  (glob_files_rec (python/** with_prefix runtime_python)))
+ (section lib))

runtimes/python/README.md

@@ -0,0 +1 @@
+This is the Catala runtime, that is required by programs compiled to Python by Catala.

runtimes/python/catala/.gitignore

@@ -1,160 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/#use-with-ide
-.pdm.toml
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/

runtimes/python/catala/pyproject.toml

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4"]
-build-backend = "setuptools.build_meta"

runtimes/python/catala/setup.cfg

@@ -1,18 +0,0 @@
-[metadata]
-name = catala-runtime
-platforms = any
-
-[options]
-install_requires =
-    gmpy2
-    typing
-    mypy
-    python-dateutil
-    types-python-dateutil
-    autopep8
-    termcolor
-    types-termcolor
-[options.extras_require]
-test =
-    pytest
-    pytest-cov

runtimes/python/catala/setup.py

@@ -1,5 +0,0 @@
-from setuptools import setup  # type: ignore
-
-setup(package_data={
-    'catala-runtime': ['py.typed'],
-},)

runtimes/python/pyproject.toml

@@ -0,0 +1,33 @@
+[project]
+name = "catala-runtime"
+description = "Runtime libraries needed to execute Catala programs compiled to Python"
+version = "0.9.0"
+dependencies = [
+  "gmpy2",
+  "typing",
+  "mypy",
+  "python-dateutil",
+  "types-python-dateutil",
+  "autopep8",
+  "termcolor",
+  "types-termcolor",
+  "typer[all]",
+  "typing-extensions"
+]
+
+[project.optional-dependencies]
+test = [
+  "pytest",
+  "pytest-cov",
+]
+
+[project.urls]
+"Homepage" = "https://github.com/CatalaLang/catala/"
+"Bug Tracker" = "https://github.com/CatalaLang/catala/issues"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/catala"]

runtimes/r/R/dune

@@ -0,0 +1,4 @@
+(install
+ (section lib)
+ (files
+  (runtime.R as runtime_r/runtime.R)))