diff --git a/.python-version b/.python-version index bd28b9c5..c8cfe395 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.9 +3.10 diff --git a/Makefile b/Makefile index e0bb0964..229f8437 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,7 @@ clean: @jupyter-book clean docs @rm -rf .coverage @rm -rf dist + @find . -type d -name '.pytype' -exec rm -rf {} + @find . -type d -name '.mypy_cache' -exec rm -rf {} + @find . -type d -name '__pycache__' -exec rm -rf {} + @find . -type d -name '*pytest_cache*' -exec rm -rf {} + diff --git a/docs/intro.md b/docs/intro.md index 69599563..0e5ab3fc 100644 --- a/docs/intro.md +++ b/docs/intro.md @@ -12,4 +12,4 @@ The code for Draco is [available as open source on GitHub](https://github.com/cm ## Installation -TODO: set up and describe installation with conda. +You can install the Draco package from Pypi via `pip install draco --pre`. Note that the new version of Draco is current a prerelease. diff --git a/poetry.lock b/poetry.lock index a4d8837e..cda56352 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1331,6 +1331,7 @@ numpy = [ {version = ">=1.18.5", markers = "platform_machine != \"aarch64\" and platform_machine != \"arm64\" and python_version < \"3.10\""}, {version = ">=1.19.2", markers = "platform_machine == \"aarch64\" and python_version < \"3.10\""}, {version = ">=1.20.0", markers = "platform_machine == \"arm64\" and python_version < \"3.10\""}, + {version = ">=1.21.0", markers = "python_version >= \"3.10\""}, ] python-dateutil = ">=2.8.1" pytz = ">=2020.1" @@ -2413,8 +2414,8 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest- [metadata] lock-version = "1.1" -python-versions = ">=3.8.0,<3.10" -content-hash = "fbd0f1a80f511f571489051cad621ec61808de7addb5d3e106fab28fcdf46c25" +python-versions = ">=3.8.0,<3.11" +content-hash = "4fca5b6a426abf67f7671d312ab195d9f8229f70290b1d78348d86d89b8fe508" [metadata.files] alabaster = [ diff --git a/pyproject.toml b/pyproject.toml index 9a2802ef..a837f7ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,13 +23,14 @@ classifiers = [ "Operating System :: MacOS :: MacOS X", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ] [tool.poetry.dependencies] clingo = "^5.5.2" matplotlib = "^3.5.2" pandas = "^1.4.2" -python = ">=3.8.0,<3.10" +python = ">=3.8.0,<3.11" scikit-learn = "^1.1.1" [tool.poetry.dev-dependencies] @@ -56,8 +57,5 @@ build-backend = "poetry.core.masonry.api" [tool.pyright] include = ["draco"] -[tool.black] -exclude = "docs/conf.py|docs/_build|.pytype" - [tool.isort] profile = "black"