diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 000000000..7f317dbbc --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,24 @@ +{ + "image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04", + "features": { + "ghcr.io/devcontainers/features/docker-in-docker:1": { + "version": "latest", + "moby": true + }, + "ghcr.io/devcontainers/features/node:1": {}, + "ghcr.io/devcontainers/features/java:1": { + "version": "17" + }, + "ghcr.io/devcontainers/features/python:1": { + "version": "3.10.12" + } + }, + "postCreateCommand": ". ${NVM_DIR}/nvm.sh && nvm install", + "customizations": { + "vscode": { + "extensions": [ + "redhat.java" + ] + } + } +} diff --git a/.nvmrc b/.nvmrc index e048c8ca1..5e0828ad1 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v18.15.0 +v18.16.1 diff --git a/.python-version b/.python-version new file mode 100644 index 000000000..56d91d353 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.10.12 diff --git a/src/examples/python/.python-version b/src/examples/python/.python-version index 1635d0f5a..8d7f852b5 100644 --- a/src/examples/python/.python-version +++ b/src/examples/python/.python-version @@ -1 +1 @@ -3.9.6 +3.10.4 diff --git a/src/examples/python/Dockerfile b/src/examples/python/Dockerfile index bee337559..d003ad8e2 100644 --- a/src/examples/python/Dockerfile +++ b/src/examples/python/Dockerfile @@ -4,7 +4,7 @@ # repository at /code (eg, via docker-compose.yml). # -FROM ubuntu:focal as saxonica-build +FROM ubuntu:jammy as saxonica-build # Download and build the Saxon-HE c-library # See here for platform-specific packages: https://www.saxonica.com/download/c.xml diff --git a/src/examples/python/docker-compose.yml b/src/examples/python/docker-compose.yml index 34fc13461..21fdd43b2 100644 --- a/src/examples/python/docker-compose.yml +++ b/src/examples/python/docker-compose.yml @@ -5,6 +5,7 @@ version: "3.9" services: example: build: . + platform: linux/amd64 volumes: - ../../..:/code working_dir: /code/src/examples/python diff --git a/src/examples/python/requirements.txt b/src/examples/python/requirements.txt index e45eca46a..c0564656e 100644 --- a/src/examples/python/requirements.txt +++ b/src/examples/python/requirements.txt @@ -1,56 +1,53 @@ # -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # # pip-compile --output-file=requirements.txt requirements.in # -appdirs==1.4.4 - # via black -attrs==21.2.0 - # via pytest -black==21.7b0 +black==23.3.0 # via -r requirements.in -click==8.0.1 +build==0.10.0 + # via pip-tools +click==8.1.3 # via # black # pip-tools -iniconfig==1.1.1 +exceptiongroup==1.1.1 + # via pytest +iniconfig==2.0.0 # via pytest -mypy==0.910 +mypy==1.4.1 # via -r requirements.in -mypy-extensions==0.4.3 +mypy-extensions==1.0.0 # via # black # mypy -packaging==21.0 - # via pytest -pathspec==0.9.0 +packaging==23.1 + # via + # black + # build + # pytest +pathspec==0.11.1 # via black -pep517==0.11.0 - # via pip-tools -pip-tools==6.2.0 +pip-tools==6.13.0 # via -r requirements.in -pluggy==0.13.1 - # via pytest -py==1.10.0 +platformdirs==3.8.0 + # via black +pluggy==1.2.0 # via pytest -pyparsing==2.4.7 - # via packaging -pytest==6.2.4 +pyproject-hooks==1.0.0 + # via build +pytest==7.4.0 # via -r requirements.in -regex==2021.7.6 - # via black -toml==0.10.2 +tomli==2.0.1 # via + # black + # build # mypy # pytest -tomli==1.1.0 - # via - # black - # pep517 -typing-extensions==3.10.0.0 +typing-extensions==4.7.0 # via mypy -wheel==0.38.0 +wheel==0.40.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: