From 282b6617b5055c4ac41a1c544c979840c33f1de3 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Tue, 7 May 2024 18:29:37 +0100 Subject: [PATCH 001/109] initial commit --- .devcontainer/Dockerfile | 14 ++ .devcontainer/devcontainer.json | 27 ++++ .gitattributes | 43 ++++++ .github/dependabot.yml | 28 ++++ .github/workflows/ci.yml | 50 +++++++ .github/workflows/publish.yml | 19 +++ .gitignore | 166 ++++++++++++++++++++++ .pre-commit-config-unused.yaml | 18 +++ .vscode/extensions.json | 16 +++ .vscode/settings.json | 14 ++ .vscode/tasks.json | 200 +++++++++++++++++++++++++++ CHANGELOG.md | 7 + LICENSE | 21 +++ README.md | 27 ++++ deps.yaml | 14 ++ docs/Makefile | 20 +++ docs/conf.py | 38 +++++ docs/index.rst | 20 +++ docs/intro.rst | 29 ++++ docs/make.bat | 35 +++++ docs/requirements.txt | 3 + pyproject.toml | 77 +++++++++++ python_template/__init__.py | 0 python_template/basic_class.py | 6 + scripts/first_time_setup.sh | 22 +++ scripts/launch_vscode.sh | 27 ++++ scripts/rename_project.sh | 5 + scripts/setup_host.sh | 54 ++++++++ scripts/update_from_template.sh | 10 ++ scripts/update_from_template_ours.sh | 10 ++ test/test_basic.py | 9 ++ 31 files changed, 1029 insertions(+) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.json create mode 100644 .gitattributes create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/publish.yml create mode 100644 .gitignore create mode 100644 .pre-commit-config-unused.yaml create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json create mode 100644 .vscode/tasks.json create mode 100644 CHANGELOG.md create mode 100644 LICENSE create mode 100644 README.md create mode 100644 deps.yaml create mode 100644 docs/Makefile create mode 100644 docs/conf.py create mode 100644 docs/index.rst create mode 100644 docs/intro.rst create mode 100644 docs/make.bat create mode 100644 docs/requirements.txt create mode 100644 pyproject.toml create mode 100644 python_template/__init__.py create mode 100644 python_template/basic_class.py create mode 100755 scripts/first_time_setup.sh create mode 100755 scripts/launch_vscode.sh create mode 100755 scripts/rename_project.sh create mode 100755 scripts/setup_host.sh create mode 100755 scripts/update_from_template.sh create mode 100755 scripts/update_from_template_ours.sh create mode 100644 test/test_basic.py diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000..36f3069 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,14 @@ +FROM mcr.microsoft.com/devcontainers/python:0-3.10 + +RUN apt-get update && apt install git-lfs + +RUN python -m pip install --upgrade pip \ + && python -m pip install 'flit>=3.8.0' + +ENV FLIT_ROOT_INSTALL=1 + +COPY pyproject.toml . +RUN touch README.md \ + && mkdir -p src/python_template \ + && python -m flit install --only-deps --deps develop \ + && rm -r pyproject.toml README.md src diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..c0e4e7f --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,27 @@ +{ + "name": "python_template", + "build": { + "dockerfile": "Dockerfile", + "context": ".." + }, + // "onCreateCommand": "pre-commit install --hook-type commit-msg", + "postCreateCommand": "flit install --symlink;", + "customizations": { + "vscode": { + "extensions": [ + "ms-python.python", + "ms-python.vscode-pylance", + "ms-python.pylint", + "ms-python.black-formatter", + "njpwerner.autodocstring", + "charliermarsh.ruff", + "mhutchie.git-graph", + "eamodio.gitlens", + "tamasfe.even-better-toml", + "Codium.codium", + "ms-azuretools.vscode-docker", + "ryanluker.vscode-coverage-gutters" + ] + } + }, +} \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..b2fbab1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,43 @@ +################# +# Git LFS rules # +################# +# Image files +*.png filter=lfs diff=lfs merge=lfs -text +*.gif filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.jpg filter=lfs diff=lfs merge=lfs -text +*.jpeg filter=lfs diff=lfs merge=lfs -text +*.ppm filter=lfs diff=lfs merge=lfs -text +*.svg filter=lfs diff=lfs merge=lfs -text +*.pgm filter=lfs diff=lfs merge=lfs -text +# Documents +*.pdf filter=lfs diff=lfs merge=lfs -text +# Video files +*.avi filter=lfs diff=lfs merge=lfs -text +*.mp4 filter=lfs diff=lfs merge=lfs -text +# Mesh files +*.stl filter=lfs diff=lfs merge=lfs -text +*.dae filter=lfs diff=lfs merge=lfs -text +*.obj filter=lfs diff=lfs merge=lfs -text +*.ply filter=lfs diff=lfs merge=lfs -text + +# Compiled libraries +*.a filter=lfs diff=lfs merge=lfs -text +*.so filter=lfs diff=lfs merge=lfs -text +*.so.* filter=lfs diff=lfs merge=lfs -text +*.exe filter=lfs diff=lfs merge=lfs -text +*.dylib filter=lfs diff=lfs merge=lfs -text +*.dll filter=lfs diff=lfs merge=lfs -text +*.lib filter=lfs diff=lfs merge=lfs -text +# Archives +*.7z filter=lfs diff=lfs merge=lfs -text +*.br filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.tar filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +# PyTorch model files +*.pt filter=lfs diff=lfs merge=lfs -text +*.pth filter=lfs diff=lfs merge=lfs -text +*.pkl filter=lfs diff=lfs merge=lfs -text +# numpy file format +*.npy filter=lfs diff=lfs merge=lfs -text diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..5c0c219 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,28 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "pip" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "monthly" + groups: + dev-dependencies: + #try to group all development dependencies updates into a single pr + patterns: + - "black" + - "check-manifest" + - "pre-commit" + - "pylint" + - "pytest" + - "pytest-cov" + - "hypothesis" + - "ruff" + - "coverage" + lib-dependencies: + #try to group all third party library updates into a single pr + patterns: + - "*" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..b0d794d --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,50 @@ +# This workflow will install Python dependencies, run tests and lint with a single version of Python +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python + +name: CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +permissions: + contents: read + +jobs: + + black: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: psf/black@stable + ruff: + runs-on: ubuntu-latest + needs: [black] + steps: + - uses: actions/checkout@v3 + - uses: chartboost/ruff-action@v1 + build: + runs-on: ubuntu-latest + needs: [ruff] + steps: + - uses: actions/checkout@v3 + - name: Set up Python 3.10 + uses: actions/setup-python@v3 + with: + python-version: "3.10" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install flit + flit install --extras test + - run: | + pylint $(git ls-files '*.py') + - name: Test with pytest + run: | + coverage run -m pytest + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v3 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..81e246d --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,19 @@ +name: Auto-publish + +on: [push, workflow_dispatch] + +jobs: + # Auto-publish when version is increased + publish-job: + # Only publish on `main` branch + if: github.ref == 'refs/heads/main' + runs-on: ubuntu-latest + permissions: # Don't forget permissions + contents: write + + steps: + - uses: etils-actions/pypi-auto-publish@v1 + with: + pypi-token: ${{ secrets.PYPI_API_TOKEN }} + gh-token: ${{ secrets.GITHUB_TOKEN }} + parse-changelog: true \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a647165 --- /dev/null +++ b/.gitignore @@ -0,0 +1,166 @@ +# 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/ + +.vscode/active_file.cfg + +#COLCON +install/** +log/** diff --git a/.pre-commit-config-unused.yaml b/.pre-commit-config-unused.yaml new file mode 100644 index 0000000..7fb6d12 --- /dev/null +++ b/.pre-commit-config-unused.yaml @@ -0,0 +1,18 @@ +repos: + # - repo: ... + + - repo: https://github.com/compilerla/conventional-pre-commit + rev: v3.0.0 + hooks: + - id: conventional-pre-commit + stages: [commit-msg] + args: [] + - repo: https://github.com/psf/black + rev: 23.3.0 + hooks: + - id: black + # It is recommended to specify the latest version of Python + # supported by your project here, or alternatively use + # pre-commit's default_language_version, see + # https://pre-commit.com/#top_level-default_language_version + language_version: python3.10 \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..75ab85e --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,16 @@ +{ + "recommendations": [ + "ms-python.python", + "ms-python.vscode-pylance", + "ms-python.pylint", + "ms-python.black-formatter", + "njpwerner.autodocstring", + "charliermarsh.ruff", + "mhutchie.git-graph", + "eamodio.gitlens", + "tamasfe.even-better-toml", + "Codium.codium", + "ms-azuretools.vscode-docker", + "ryanluker.vscode-coverage-gutters" + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..b1772fe --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,14 @@ +{ + "python.testing.pytestArgs": [], + "python.testing.unittestEnabled": false, + "python.testing.pytestEnabled": true, + "[python]": { + "editor.defaultFormatter": "ms-python.black-formatter", + "editor.formatOnSave": true, + }, + "files.exclude": { + "**/__pycache__/**": true, + "/home/vscode/.local/lib/python3.10/site-packages/python_template/**": true + }, + "python.analysis.autoImportCompletions": false //vscode gets it wrong more than right and mostly gets in the way +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..2c2d167 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,200 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "set from active file; sa", + "type": "shell", + "command": "echo ${file} > ${workspaceFolder}/.vscode/active_file.cfg; echo Setting the current file: ${file} as the active file.", + "problemMatcher": [], + "group": { + "kind": "test", + "isDefault": "True" + } + }, + { + "label": "run ", + "type": "shell", + "command": "RUNFILE=$(cat ${workspaceFolder}/.vscode/active_file.cfg); echo Running file: $RUNFILE; python3 $RUNFILE", + "problemMatcher": [], + "group": { + "kind": "build", + "isDefault": "True" + } + }, + { + "label": "autoformat", + "detail": "Use ruff and black to automatically fix and format the code", + "type": "shell", + "command": "ruff check . --fix && black ." + }, + { + "label": "autoformat, commit and push", + "detail": "Use ruff and black to automatically fix and format the code and commit changes", + "type": "shell", + "dependsOn": [ + "autoformat" + ], + "command": "git commit -a -m 'fix: autoformatted and ruff --fix all code' || true && git push" + }, + { + "label": "pylint", + "detail": "Run pylint on files tracked by git", + "type": "shell", + "command": "pylint $(git ls-files '*.py') " + }, + { + "label": "code coverage", + "detail": "Run code coverage and print a coverage report, also update coverage.xml for in the in-editor coverage gutter", + "type": "shell", + "command": "coverage run -m pytest; coverage xml -o coverage.xml" + }, + { + "label": "code coverage report", + "detail": "Display the code coverage report. This assumes you have already have a coverage report generated. If not run the code ocverage task", + "type": "shell", + "dependsOn": [ + "code coverage" + ], + "command": "coverage report -m" + }, + { + "label": "pytest duration", + "detail": "Run pytest and track the duration of each test", + "type": "shell", + "command": "pytest --durations=0" + }, + { + "label": "check CI", + "detail": "Runs the basic formatting and linting checks performed by CI", + "type": "shell", + "dependsOn": [ + "autoformat", + "pylint", + "code coverage report" + ], + "dependsOrder": "sequence", + }, + { + "label": "check CI, commit and push", + "detail": "Pull,s from main, runs the basic formatting and linting checks performed by CI and pushes changes", + "type": "shell", + "dependsOn": [ + "git pull origin main", + "check CI", + "autoformat, commit and push", + ], + "dependsOrder": "sequence", + }, + { + "label": "git pull origin main", + "detail": "merge changes from master into the current branch and push", + "type": "shell", + "command": "git pull --commit --no-edit ; git pull origin main --commit --no-edit && git push" + }, + { + "label": "git push", + "detail": "merge changes from master into the current branch and push", + "type": "shell", + "command": "git push" + }, + { + "label": "git pull origin main and push", + "detail": "merge changes from master into the current branch and push", + "type": "shell", + "dependsOn": [ + "git pull origin main", + "git push" + ], + "dependsOrder": "sequence", + }, + { + "label": "update from template repo", + "detail": "Pull any changes from the template repo into this repo by adding it as a remote. The remote is removed at the end of the command. You may need to resolve merge conflicts", + "type": "shell", + "command": "scripts/update_from_template.sh" + }, + { + "label": "update from template repo keep ours", + "detail": "Pull any changes from the template repo into this repo by adding it as a remote. The remote is removed at the end of the command. You may need to resolve merge conflicts", + "type": "shell", + "command": "scripts/update_from_template_ours.sh" + }, + { + "label": "rename template project name and commit", + "detail": "Replaces all instances of the template project name with a new name. ", + "type": "shell", + "command": "scripts/rename_project.sh ${input:new_project_name}; git commit -a -m 'rename project'" + }, + { + "label": "first time setup of project", + "detail": "Pulls updates from the template repo and replaces all instances of the template project name with a new name.", + "type": "shell", + "dependsOn": [ + "update from template repo", + "rename template project name and commit", + "update from template repo keep ours" + ], + "dependsOrder": "sequence", + }, + { + "label": "flit install", + "type": "shell", + "command": "flit install --symlink" + }, + { + "label": "flit publish", + "type": "shell", + "command": "flit publish" + }, + { + "label": "setup: host", + "detail": "Sets up docker, nvidia docker git-lfs and rocker which are used to clone and setup docker containers", + "type": "shell", + "command": "./scripts/setup_host.sh", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "launch container", + "detail": "Uses rocker to launch a container and spawns a new vscode window attached to the container", + "type": "shell", + "command": "scripts/launch_vscode.sh" + }, + { + "label": "Install All Recommended Extensions", + "type": "shell", + "linux": { + "command": "cat .vscode/extensions.json | jq .recommendations[] | xargs -n 1 code . --install-extension" + }, + "runOptions": { + "runOn": "folderOpen" + }, + "presentation": { + "reveal": "always" + }, + }, + { + "label": "set git config recurse submodules", + "type": "shell", + "linux": { + "command": [" git config submodule.recurse true"], + }, + "runOptions": { + "runOn": "folderOpen" + }, + "presentation": { + "reveal": "silent" + }, + }, + ], + "inputs": [ + { + "type": "promptString", + "id": "new_project_name", + "description": "The new name of the project", + "default": "python_template" + } + ] +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..31039eb --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,7 @@ +# Changelog + +## python_tempate + +## [0.0.0] + + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4e9f6f5 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 Austin Gregg-Smith + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..baee9d2 --- /dev/null +++ b/README.md @@ -0,0 +1,27 @@ +# python_template +A template repo for python projects + +This has basic setup for + +* pylint +* ruff +* black +* pytest +* codecov +* git-lfs +* basic github actions ci +* pulling updates from this template + + +## Continuous Integration Status + +[![Ci](https://github.com/blooop/python_template/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/blooop/python_template/actions/workflows/ci.yml?query=branch%3Amain) +[![Codecov](https://codecov.io/gh/blooop/python_template/branch/main/graph/badge.svg?token=Y212GW1PG6)](https://codecov.io/gh/blooop/python_template) +[![GitHub issues](https://img.shields.io/github/issues/blooop/python_template.svg)](https://GitHub.com/blooop/python_template/issues/) +[![GitHub pull-requests merged](https://badgen.net/github/merged-prs/blooop/python_template)](https://github.com/blooop/python_template/pulls?q=is%3Amerged) +[![GitHub release](https://img.shields.io/github/release/blooop/python_template.svg)](https://GitHub.com/blooop/python_template/releases/) +[![License](https://img.shields.io/pypi/l/bencher)](https://opensource.org/license/mit/) +[![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11-blue)](https://www.python.org/downloads/release/python-310/) + + +To set up your project run the vscode task "pull updates from template repo" and then task "rename project template name" diff --git a/deps.yaml b/deps.yaml new file mode 100644 index 0000000..7fe50d6 --- /dev/null +++ b/deps.yaml @@ -0,0 +1,14 @@ +apt_tools: + - git + - git-lfs + - python3-pip + - apt-utils + - jq + + +pip_tools: + - flit + - pip #updates to latest pip + +pip: + - pip \ No newline at end of file diff --git a/docs/Makefile b/docs/Makefile new file mode 100644 index 0000000..d4bb2cb --- /dev/null +++ b/docs/Makefile @@ -0,0 +1,20 @@ +# Minimal makefile for Sphinx documentation +# + +# You can set these variables from the command line, and also +# from the environment for the first two. +SPHINXOPTS ?= +SPHINXBUILD ?= sphinx-build +SOURCEDIR = . +BUILDDIR = _build + +# Put it first so that "make" without argument is like "make help". +help: + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + +.PHONY: help Makefile + +# Catch-all target: route all unknown targets to Sphinx using the new +# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). +%: Makefile + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 0000000..0a2071b --- /dev/null +++ b/docs/conf.py @@ -0,0 +1,38 @@ +# Configuration file for the Sphinx documentation builder. +# +# For the full list of built-in configuration values, see the documentation: +# https://www.sphinx-doc.org/en/master/usage/configuration.html + +# -- Project information ----------------------------------------------------- +# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information + +from importlib import metadata + +copyright = "2023, Austin Gregg-Smith" # pylint:disable=redefined-builtin +author = "Austin Gregg-Smith" +release = metadata.version("python_template") +project = f"python_template {release}" + + +# -- General configuration --------------------------------------------------- +# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration + +extensions = ["sphinx_rtd_theme", "sphinx.ext.napoleon", "autoapi.extension"] + +templates_path = ["_templates"] +exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"] + + +# -- Options for HTML output ------------------------------------------------- +# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output + +html_theme = "sphinx_rtd_theme" +# html_static_path = ["_static"] + +autoapi_dirs = ["../python_template"] +autoapi_ignore = ["*example_*", "*example*", "*experimental*"] + + +numpydoc_show_class_members = False + +autosummary_generate = True diff --git a/docs/index.rst b/docs/index.rst new file mode 100644 index 0000000..a4d9ef9 --- /dev/null +++ b/docs/index.rst @@ -0,0 +1,20 @@ +.. python_template documentation master file, created by + sphinx-quickstart on Mon Nov 27 15:01:32 2023. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +Welcome to python_template's documentation! +=========================================== + +.. toctree:: + :maxdepth: 3 + + intro.rst + + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` diff --git a/docs/intro.rst b/docs/intro.rst new file mode 100644 index 0000000..6be63c5 --- /dev/null +++ b/docs/intro.rst @@ -0,0 +1,29 @@ +Intro +===== + +A template repo for python projects + +This has basic setup for + +* pylint +* ruff +* black +* pytest +* codecov +* git-lfs +* basic github actions ci +* pulling updates from this template + + +## Continuous Integration Status + +[![Ci](https://github.com/blooop/python_template/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/blooop/python_template/actions/workflows/ci.yml?query=branch%3Amain) +[![Codecov](https://codecov.io/gh/blooop/python_template/branch/main/graph/badge.svg?token=Y212GW1PG6)](https://codecov.io/gh/blooop/python_template) +[![GitHub issues](https://img.shields.io/github/issues/blooop/python_template.svg)](https://GitHub.com/blooop/python_template/issues/) +[![GitHub pull-requests merged](https://badgen.net/github/merged-prs/blooop/python_template)](https://github.com/blooop/python_template/pulls?q=is%3Amerged) +[![GitHub release](https://img.shields.io/github/release/blooop/python_template.svg)](https://GitHub.com/blooop/python_template/releases/) +[![License](https://img.shields.io/pypi/l/bencher)](https://opensource.org/license/mit/) +[![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11-blue)](https://www.python.org/downloads/release/python-310/) + + +To set up your project run the vscode task "pull updates from template repo" and then task "rename project template name" diff --git a/docs/make.bat b/docs/make.bat new file mode 100644 index 0000000..32bb245 --- /dev/null +++ b/docs/make.bat @@ -0,0 +1,35 @@ +@ECHO OFF + +pushd %~dp0 + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=sphinx-build +) +set SOURCEDIR=. +set BUILDDIR=_build + +%SPHINXBUILD% >NUL 2>NUL +if errorlevel 9009 ( + echo. + echo.The 'sphinx-build' command was not found. Make sure you have Sphinx + echo.installed, then set the SPHINXBUILD environment variable to point + echo.to the full path of the 'sphinx-build' executable. Alternatively you + echo.may add the Sphinx directory to PATH. + echo. + echo.If you don't have Sphinx installed, grab it from + echo.https://www.sphinx-doc.org/ + exit /b 1 +) + +if "%1" == "" goto help + +%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% +goto end + +:help +%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% + +:end +popd diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 0000000..d43dc9d --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,3 @@ +sphinxcontrib-napoleon +sphinx-rtd-theme +sphinx-autoapi \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..7203bb6 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,77 @@ +[project] +name = "python_template" +version = "0.2.0" + +authors = [{ name = "Austin Gregg-Smith", email = "blooop@gmail.com" }] +description = "A python package template" +readme = "README.md" + +requires-python = ">=3.10" + +dependencies = ["numpy>=1.2,<=1.26.3"] + +[project.optional-dependencies] +test = [ + "black>=23,<=24.3.0", + "pylint>=2.16,<=3.1.0", + "pytest-cov>=4.1,<=4.1", + "pytest>=7.4,<=8.1.1", + "hypothesis>=6.82,<=6.100.0", + "ruff>=0.0.280,<=0.3.5", + "coverage>=7.2.7,<=7.4.4", +] + +[project.urls] +Source = "https://github.com/blooop/python_template" +Home = "https://github.com/blooop/python_template" + + +[tool.flit.module] +name = "python_template" + +[build-system] +requires = ["flit_core >=3.2,<4"] +build-backend = "flit_core.buildapi" + + +[tool.pylint] +extension-pkg-whitelist = ["numpy"] +jobs = 16 #detect number of cores + +[tool.pylint.'MESSAGES CONTROL'] +disable = "C,logging-fstring-interpolation,line-too-long,fixme,broad-exception-caught,missing-module-docstring,too-many-instance-attributes,too-few-public-methods,too-many-arguments,too-many-locals,too-many-branches,too-many-statements,use-dict-literal,cyclic-import,duplicate-code,too-many-public-methods" +enable = "no-else-return,consider-using-in" + +[tool.black] +line-length = 100 + +[tool.ruff] +# Never enforce `E501` (line length violations). +#"F841" will auto remove unused variables which is annoying during development, pylint catches this anyway +lint.ignore = ["E501", "E902", "F841"] + +# Same as Black. +line-length = 100 + +target-version = "py310" + +# Allow unused variables when underscore-prefixed. +lint.dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" + +# Ignore `E402` (import violations) in all `__init__.py` files, and in `path/to/file.py`. +[tool.ruff.lint.per-file-ignores] +"__init__.py" = ["E402", "F401"] + + +[tool.coverage.run] +omit = ["*/test/*", "__init__.py"] + +[tool.coverage.report] +exclude_also = [ + "def __repr__", + "if False:", + "if 0:", + "raise AssertionError", + "raise NotImplementedError", + "if __name__ == .__main__.:", +] diff --git a/python_template/__init__.py b/python_template/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/python_template/basic_class.py b/python_template/basic_class.py new file mode 100644 index 0000000..e118a8e --- /dev/null +++ b/python_template/basic_class.py @@ -0,0 +1,6 @@ +from dataclasses import dataclass + + +@dataclass +class BasicClass: + int_var: int = 0 diff --git a/scripts/first_time_setup.sh b/scripts/first_time_setup.sh new file mode 100755 index 0000000..e74b0b4 --- /dev/null +++ b/scripts/first_time_setup.sh @@ -0,0 +1,22 @@ +#! /bin/bash +set -e +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #gets the current directory + +#move to the project root folder +cd "$SCRIPT_DIR"/.. +git submodule update --init --recursive +CONTAINER_NAME=${PWD##*/} + +git config --global pull.rebase false +git remote add template https://github.com/blooop/repo_b.git +git fetch --all +git checkout main && git pull origin main +git merge template/main --allow-unrelated-histories -m 'feat: pull changes from remote template' + +$SCRIPT_DIR/rename_project.sh $CONTAINER_NAME +git commit -a -m 'rename project to $CONTAINER_NAME' + +git merge template/main --strategy-option ours --allow-unrelated-histories -m 'feat: pull changes from remote template' +git remote remove template + +git push \ No newline at end of file diff --git a/scripts/launch_vscode.sh b/scripts/launch_vscode.sh new file mode 100755 index 0000000..7cafa47 --- /dev/null +++ b/scripts/launch_vscode.sh @@ -0,0 +1,27 @@ +#! /bin/bash +set -e + +export COMPOSE_DOCKER_CLI_BUILD=1 +export DOCKER_BUILDKIT=1 + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #gets the current directory + +#move to the project root folder +cd "$SCRIPT_DIR"/.. + +git submodule update --init --recursive + +CONTAINER_NAME=${PWD##*/} + +echo "stopping existing container" "$CONTAINER_NAME" +docker stop "$CONTAINER_NAME" || true + +CONTAINER_HEX=$(printf $CONTAINER_NAME | xxd -p | tr '\n' ' ' | sed 's/\\s//g' | tr -d ' '); + +rocker --nvidia --x11 --user --pull --git --image-name "$CONTAINER_NAME" --name "$CONTAINER_NAME" --volume "${PWD}":/workspaces/"${CONTAINER_NAME}":Z --oyr-run-arg " --detach" --deps-dependencies ubuntu:22.04 + +# docker pull ghcr.io/red5d/docker-autocompose:latest +# docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/red5d/docker-autocompose $CONTAINER_NAME > .devcontainer/docker-compose.yaml + +#this follows the same convention as if it were opened by a vscode devcontainer +code --folder-uri vscode-remote://attached-container+"$CONTAINER_HEX"/workspaces/"${CONTAINER_NAME}" \ No newline at end of file diff --git a/scripts/rename_project.sh b/scripts/rename_project.sh new file mode 100755 index 0000000..d89c353 --- /dev/null +++ b/scripts/rename_project.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +mv python_template $1 + +find . \( -type d -name .git -prune \) -o \( -type f -not -name 'tasks.json' -not -name 'update_from_template.sh' -not -name 'update_from_template_ours.sh' \) -print0 | xargs -0 sed -i "s/python_template/$1/g" diff --git a/scripts/setup_host.sh b/scripts/setup_host.sh new file mode 100755 index 0000000..246fd00 --- /dev/null +++ b/scripts/setup_host.sh @@ -0,0 +1,54 @@ +#! /bin/bash + +#Sets up docker, nvidia docker git-lfs and rocker which are used to clone and setup docker containers + +#COPIED FROM OFFICIAL DOCKER INSTALL INSTRUCTIONS +# https://docs.docker.com/engine/install/ubuntu/ + +#remove incorrect docker +for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do sudo apt-get remove $pkg; done + +# Add Docker's official GPG key: +sudo apt-get update +sudo apt-get install ca-certificates curl +sudo install -m 0755 -d /etc/apt/keyrings +sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc +sudo chmod a+r /etc/apt/keyrings/docker.asc + +# Add the repository to Apt sources: +echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ + $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ + sudo tee /etc/apt/sources.list.d/docker.list > /dev/null +sudo apt-get update + +# Install docker +sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin +#END OFFICIAL DOCKER INSTALL + +sudo groupadd docker +sudo usermod -aG docker $USER +newgrp docker + +#INSTALL NVIDIA DOCKER +#https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html +curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey | sudo gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg \ + && curl -s -L https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list | \ + sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' | \ + sudo tee /etc/apt/sources.list.d/nvidia-container-toolkit.list +sudo apt-get update +sudo apt-get install -y nvidia-container-toolkit +sudo nvidia-ctk runtime configure --runtime=docker +sudo systemctl restart docker + +sudo apt install git-lfs + +#Install rocker and rocker extensions which are used to launch the devcontainer +pip install rocker off-your-rocker git+https://github.com/blooop/deps_rocker + + +echo "testing docker install" + +docker run hello-world + +echo "you may need to restart your machine" \ No newline at end of file diff --git a/scripts/update_from_template.sh b/scripts/update_from_template.sh new file mode 100755 index 0000000..437c551 --- /dev/null +++ b/scripts/update_from_template.sh @@ -0,0 +1,10 @@ +#! /bin/bash + +git config --global pull.rebase false +git remote add template https://github.com/blooop/python_template.git +git fetch --all +git checkout main && git pull origin main +git checkout -B feature/update_from_template; git pull +git merge template/main --allow-unrelated-histories -m 'feat: pull changes from remote template' +git remote remove template +git push --set-upstream origin feature/update_from_template \ No newline at end of file diff --git a/scripts/update_from_template_ours.sh b/scripts/update_from_template_ours.sh new file mode 100755 index 0000000..3cfb1ee --- /dev/null +++ b/scripts/update_from_template_ours.sh @@ -0,0 +1,10 @@ +#! /bin/bash + +git config --global pull.rebase false +git remote add template https://github.com/blooop/python_template.git +git fetch --all +git checkout main && git pull origin main +git checkout -B feature/update_from_template; git pull +git merge template/main --strategy-option ours --allow-unrelated-histories -m 'feat: pull changes from remote template' +git remote remove template +git push origin feature/update_from_template \ No newline at end of file diff --git a/test/test_basic.py b/test/test_basic.py new file mode 100644 index 0000000..91fa700 --- /dev/null +++ b/test/test_basic.py @@ -0,0 +1,9 @@ +from unittest import TestCase +from python_template.basic_class import BasicClass + + +class TestBasicClass(TestCase): + def test_init(self): + instance = BasicClass() + + self.assertEqual(instance.int_var, 0) From b5a78f0f04c964e1f10994cbbdd20d801fb828b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 17:38:48 +0000 Subject: [PATCH 002/109] Bump the dev-dependencies group with 6 updates Updates the requirements on [black](https://github.com/psf/black), [pytest-cov](https://github.com/pytest-dev/pytest-cov), [pytest](https://github.com/pytest-dev/pytest), [hypothesis](https://github.com/HypothesisWorks/hypothesis), [ruff](https://github.com/astral-sh/ruff) and [coverage](https://github.com/nedbat/coveragepy) to permit the latest version. Updates `black` to 24.4.2 - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/23.1a1...24.4.2) Updates `pytest-cov` to 5.0.0 - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-cov/compare/v4.1.0...v5.0.0) Updates `pytest` to 8.2.0 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.4.0...8.2.0) Updates `hypothesis` to 6.100.5 - [Release notes](https://github.com/HypothesisWorks/hypothesis/releases) - [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.82.0...hypothesis-python-6.100.5) Updates `ruff` to 0.4.3 - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.0.280...v0.4.3) Updates `coverage` to 7.5.1 - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.2.7...7.5.1) --- updated-dependencies: - dependency-name: black dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: pytest-cov dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: pytest dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: hypothesis dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: ruff dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: coverage dependency-type: direct:production dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] --- pyproject.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7203bb6..d373553 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,13 +12,13 @@ dependencies = ["numpy>=1.2,<=1.26.3"] [project.optional-dependencies] test = [ - "black>=23,<=24.3.0", + "black>=23,<=24.4.2", "pylint>=2.16,<=3.1.0", - "pytest-cov>=4.1,<=4.1", - "pytest>=7.4,<=8.1.1", - "hypothesis>=6.82,<=6.100.0", - "ruff>=0.0.280,<=0.3.5", - "coverage>=7.2.7,<=7.4.4", + "pytest-cov>=4.1,<=5.0.0", + "pytest>=7.4,<=8.2.0", + "hypothesis>=6.82,<=6.100.5", + "ruff>=0.0.280,<=0.4.3", + "coverage>=7.2.7,<=7.5.1", ] [project.urls] From 1ad3c83f7c4712dd1fa97072cdf49e72a93ff8d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 17:39:12 +0000 Subject: [PATCH 003/109] Update numpy requirement in the lib-dependencies group Updates the requirements on [numpy](https://github.com/numpy/numpy) to permit the latest version. Updates `numpy` to 1.26.4 - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](https://github.com/numpy/numpy/compare/v1.2.0...v1.26.4) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production dependency-group: lib-dependencies ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7203bb6..841e193 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ readme = "README.md" requires-python = ">=3.10" -dependencies = ["numpy>=1.2,<=1.26.3"] +dependencies = ["numpy>=1.2,<=1.26.4"] [project.optional-dependencies] test = [ From 2843a85384bef3119e5e87d536180c8b74ad987b Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Tue, 7 May 2024 19:08:36 +0100 Subject: [PATCH 004/109] remove unused pre-commit --- .pre-commit-config-unused.yaml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .pre-commit-config-unused.yaml diff --git a/.pre-commit-config-unused.yaml b/.pre-commit-config-unused.yaml deleted file mode 100644 index 7fb6d12..0000000 --- a/.pre-commit-config-unused.yaml +++ /dev/null @@ -1,18 +0,0 @@ -repos: - # - repo: ... - - - repo: https://github.com/compilerla/conventional-pre-commit - rev: v3.0.0 - hooks: - - id: conventional-pre-commit - stages: [commit-msg] - args: [] - - repo: https://github.com/psf/black - rev: 23.3.0 - hooks: - - id: black - # It is recommended to specify the latest version of Python - # supported by your project here, or alternatively use - # pre-commit's default_language_version, see - # https://pre-commit.com/#top_level-default_language_version - language_version: python3.10 \ No newline at end of file From 55b91f295e2dcec8c694f26430544b3ec9161633 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Tue, 7 May 2024 19:09:02 +0100 Subject: [PATCH 005/109] [fix] don't auto commit after rename --- .vscode/tasks.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2c2d167..b099596 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -120,10 +120,10 @@ "command": "scripts/update_from_template_ours.sh" }, { - "label": "rename template project name and commit", + "label": "rename template project", "detail": "Replaces all instances of the template project name with a new name. ", "type": "shell", - "command": "scripts/rename_project.sh ${input:new_project_name}; git commit -a -m 'rename project'" + "command": "scripts/rename_project.sh ${input:new_project_name}" }, { "label": "first time setup of project", From 3b869fa0aedead2ae5ebfc46aece3ec127067a70 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Tue, 7 May 2024 19:09:08 +0100 Subject: [PATCH 006/109] remove python 3.11 badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index baee9d2..48bd709 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ This has basic setup for [![GitHub pull-requests merged](https://badgen.net/github/merged-prs/blooop/python_template)](https://github.com/blooop/python_template/pulls?q=is%3Amerged) [![GitHub release](https://img.shields.io/github/release/blooop/python_template.svg)](https://GitHub.com/blooop/python_template/releases/) [![License](https://img.shields.io/pypi/l/bencher)](https://opensource.org/license/mit/) -[![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11-blue)](https://www.python.org/downloads/release/python-310/) +[![Python](https://img.shields.io/badge/python-3.10-blue)](https://www.python.org/downloads/release/python-310/) To set up your project run the vscode task "pull updates from template repo" and then task "rename project template name" From 5ca6bc282d255b5a095c6a2c36b63dc5ae627d71 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Mon, 20 May 2024 19:32:52 +0100 Subject: [PATCH 007/109] update to --deps command --- scripts/launch_vscode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/launch_vscode.sh b/scripts/launch_vscode.sh index 7cafa47..0f65723 100755 --- a/scripts/launch_vscode.sh +++ b/scripts/launch_vscode.sh @@ -18,7 +18,7 @@ docker stop "$CONTAINER_NAME" || true CONTAINER_HEX=$(printf $CONTAINER_NAME | xxd -p | tr '\n' ' ' | sed 's/\\s//g' | tr -d ' '); -rocker --nvidia --x11 --user --pull --git --image-name "$CONTAINER_NAME" --name "$CONTAINER_NAME" --volume "${PWD}":/workspaces/"${CONTAINER_NAME}":Z --oyr-run-arg " --detach" --deps-dependencies ubuntu:22.04 +rocker --nvidia --x11 --user --pull --git --image-name "$CONTAINER_NAME" --name "$CONTAINER_NAME" --volume "${PWD}":/workspaces/"${CONTAINER_NAME}":Z --deps --oyr-run-arg " --detach" ubuntu:22.04 # docker pull ghcr.io/red5d/docker-autocompose:latest # docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/red5d/docker-autocompose $CONTAINER_NAME > .devcontainer/docker-compose.yaml From f7daac35f49d0563543bb17ca30454a5362b9412 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 12:25:34 +0100 Subject: [PATCH 008/109] [feat] use pixi as project manager --- .gitattributes | 3 + .github/dependabot.yml | 4 + .github/workflows/ci.yml | 57 ++-- .gitignore | 4 + pixi.lock | 694 +++++++++++++++++++++++++++++++++++++++ pyproject.toml | 39 ++- 6 files changed, 755 insertions(+), 46 deletions(-) create mode 100644 pixi.lock diff --git a/.gitattributes b/.gitattributes index b2fbab1..344f367 100644 --- a/.gitattributes +++ b/.gitattributes @@ -41,3 +41,6 @@ *.pkl filter=lfs diff=lfs merge=lfs -text # numpy file format *.npy filter=lfs diff=lfs merge=lfs -text +# GitHub syntax highlighting +pixi.lock linguist-language=YAML + diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5c0c219..fee8002 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,3 +26,7 @@ updates: #try to group all third party library updates into a single pr patterns: - "*" + - package-ecosystem: github-actions + directory: / + schedule: + interval: monthly diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0d794d..5191cb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,3 @@ -# This workflow will install Python dependencies, run tests and lint with a single version of Python -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python - name: CI on: @@ -13,38 +10,26 @@ permissions: contents: read jobs: - - black: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: psf/black@stable - ruff: - runs-on: ubuntu-latest - needs: [black] - steps: - - uses: actions/checkout@v3 - - uses: chartboost/ruff-action@v1 - build: + ci: runs-on: ubuntu-latest - needs: [ruff] steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.10 - uses: actions/setup-python@v3 - with: - python-version: "3.10" - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install flit - flit install --extras test - - run: | - pylint $(git ls-files '*.py') - - name: Test with pytest - run: | - coverage run -m pytest - - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v3 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + - name: Checkout + uses: actions/checkout@v4 + - uses: prefix-dev/setup-pixi@v0.8.0 + with: + pixi-version: v0.22.0 + cache: true + - name: Format and lint + run: | + pixi run fmt + pixi run lint + - name: Assert no changes + run: | + git diff --exit-code + - name: Test + run: | + pixi run coverage + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v3 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index a647165..8c26a59 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,7 @@ cython_debug/ #COLCON install/** log/** +# pixi environments +.pixi +*.egg-info + diff --git a/pixi.lock b/pixi.lock new file mode 100644 index 0000000..e348e93 --- /dev/null +++ b/pixi.lock @@ -0,0 +1,694 @@ +version: 5 +environments: + default: + channels: + - url: https://conda.anaconda.org/conda-forge/ + indexes: + - https://pypi.org/simple + packages: + linux-64: + - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.0-h543edf9_3_cpython.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.45.3-h2c6b66d_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 + - pypi: . + test: + channels: + - url: https://conda.anaconda.org/conda-forge/ + indexes: + - https://pypi.org/simple + packages: + linux-64: + - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.0-h543edf9_3_cpython.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.45.3-h2c6b66d_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 + - pypi: https://files.pythonhosted.org/packages/ed/1c/ee18acf9070f77253954b7d71b4c0cf8f5969fb23067d8f1a8793573ba00/astroid-3.1.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e0/7d/7f8df0fdbbbefc4362d3eca6b69b7a8a4249a8a88dabc00a207d31fddcd7/black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/3b/43/3bdab48c6bdd09216c19f4f1d11430869880c387af5c4a759a3eff47dd8f/hypothesis-6.100.5-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/4d/2b/dfcf298607c73c3af47d5a699c3bd84ba580f1b8642a53ba2a53eead7c49/pylint-3.1.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/c4/43/6b1debd95ecdf001bc46789a933f658da3f9738c65f32db3f4e8f2a4ca97/pytest-8.2.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/5a/6b/9c1b94d5a5720390029c810428c60f791ba77cfd3de2c13a51f3beb02916/ruff-0.4.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl + - pypi: . +packages: +- kind: conda + name: _libgcc_mutex + version: '0.1' + build: conda_forge + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 + sha256: fe51de6107f9edc7aa4f786a70f4a883943bc9d39b3bb7307c04c41410990726 + md5: d7c89558ba9fa0495403155b64376d81 + license: None + size: 2562 + timestamp: 1578324546067 +- kind: conda + name: _openmp_mutex + version: '4.5' + build: 2_gnu + build_number: 16 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 + sha256: fbe2c5e56a653bebb982eda4876a9178aedfc2b545f25d0ce9c4c0b508253d22 + md5: 73aaf86a425cc6e73fcf236a5a46396d + depends: + - _libgcc_mutex 0.1 conda_forge + - libgomp >=7.5.0 + constrains: + - openmp_impl 9999 + license: BSD-3-Clause + license_family: BSD + size: 23621 + timestamp: 1650670423406 +- kind: pypi + name: astroid + version: 3.1.0 + url: https://files.pythonhosted.org/packages/ed/1c/ee18acf9070f77253954b7d71b4c0cf8f5969fb23067d8f1a8793573ba00/astroid-3.1.0-py3-none-any.whl + sha256: 951798f922990137ac090c53af473db7ab4e70c770e6d7fae0cec59f74411819 + requires_dist: + - typing-extensions>=4.0.0 ; python_version < '3.11' + requires_python: '>=3.8.0' +- kind: pypi + name: attrs + version: 23.2.0 + url: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl + sha256: 99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1 + requires_dist: + - importlib-metadata ; python_version < '3.8' + - attrs[tests] ; extra == 'cov' + - coverage[toml]>=5.3 ; extra == 'cov' + - attrs[tests] ; extra == 'dev' + - pre-commit ; extra == 'dev' + - furo ; extra == 'docs' + - myst-parser ; extra == 'docs' + - sphinx ; extra == 'docs' + - sphinx-notfound-page ; extra == 'docs' + - sphinxcontrib-towncrier ; extra == 'docs' + - towncrier ; extra == 'docs' + - zope-interface ; extra == 'docs' + - attrs[tests-no-zope] ; extra == 'tests' + - zope-interface ; extra == 'tests' + - mypy>=1.6 ; (platform_python_implementation == 'CPython' and python_version >= '3.8') and extra == 'tests-mypy' + - pytest-mypy-plugins ; (platform_python_implementation == 'CPython' and python_version >= '3.8') and extra == 'tests-mypy' + - attrs[tests-mypy] ; extra == 'tests-no-zope' + - cloudpickle ; platform_python_implementation == 'CPython' and extra == 'tests-no-zope' + - hypothesis ; extra == 'tests-no-zope' + - pympler ; extra == 'tests-no-zope' + - pytest-xdist[psutil] ; extra == 'tests-no-zope' + - pytest>=4.3.0 ; extra == 'tests-no-zope' + requires_python: '>=3.7' +- kind: pypi + name: black + version: 24.4.2 + url: https://files.pythonhosted.org/packages/e0/7d/7f8df0fdbbbefc4362d3eca6b69b7a8a4249a8a88dabc00a207d31fddcd7/black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: eaea3008c281f1038edb473c1aa8ed8143a5535ff18f978a318f10302b254063 + requires_dist: + - click>=8.0.0 + - mypy-extensions>=0.4.3 + - packaging>=22.0 + - pathspec>=0.9.0 + - platformdirs>=2 + - tomli>=1.1.0 ; python_version < '3.11' + - typing-extensions>=4.0.1 ; python_version < '3.11' + - colorama>=0.4.3 ; extra == 'colorama' + - aiohttp!=3.9.0,>=3.7.4 ; (sys_platform == 'win32' and implementation_name == 'pypy') and extra == 'd' + - aiohttp>=3.7.4 ; (sys_platform != 'win32' or implementation_name != 'pypy') and extra == 'd' + - ipython>=7.8.0 ; extra == 'jupyter' + - tokenize-rt>=3.2.0 ; extra == 'jupyter' + - uvloop>=0.15.2 ; extra == 'uvloop' + requires_python: '>=3.8' +- kind: conda + name: bzip2 + version: 1.0.8 + build: hd590300_5 + build_number: 5 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda + sha256: 242c0c324507ee172c0e0dd2045814e746bb303d1eb78870d182ceb0abc726a8 + md5: 69b8b6202a07720f448be700e300ccf4 + depends: + - libgcc-ng >=12 + license: bzip2-1.0.6 + license_family: BSD + size: 254228 + timestamp: 1699279927352 +- kind: conda + name: ca-certificates + version: 2024.2.2 + build: hbcca054_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda + sha256: 91d81bfecdbb142c15066df70cc952590ae8991670198f92c66b62019b251aeb + md5: 2f4327a1cbe7f022401b236e915a5fef + license: ISC + size: 155432 + timestamp: 1706843687645 +- kind: pypi + name: click + version: 8.1.7 + url: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl + sha256: ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 + requires_dist: + - colorama ; platform_system == 'Windows' + - importlib-metadata ; python_version < '3.8' + requires_python: '>=3.7' +- kind: pypi + name: coverage + version: 7.5.1 + url: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 5fd215c0c7d7aab005221608a3c2b46f58c0285a819565887ee0b718c052aa4e + requires_dist: + - tomli ; python_full_version <= '3.11.0a6' and extra == 'toml' + requires_python: '>=3.8' +- kind: pypi + name: dill + version: 0.3.8 + url: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl + sha256: c36ca9ffb54365bdd2f8eb3eff7d2a21237f8452b57ace88b1ac615b7e815bd7 + requires_dist: + - objgraph>=1.7.2 ; extra == 'graph' + - gprof2dot>=2022.7.29 ; extra == 'profile' + requires_python: '>=3.8' +- kind: pypi + name: exceptiongroup + version: 1.2.1 + url: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl + sha256: 5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad + requires_dist: + - pytest>=6 ; extra == 'test' + requires_python: '>=3.7' +- kind: pypi + name: hypothesis + version: 6.100.5 + url: https://files.pythonhosted.org/packages/3b/43/3bdab48c6bdd09216c19f4f1d11430869880c387af5c4a759a3eff47dd8f/hypothesis-6.100.5-py3-none-any.whl + sha256: d2f875a8791abdf68599e85cc9238f7239a73b72362d34be95e532e811766723 + requires_dist: + - attrs>=22.2.0 + - sortedcontainers<3.0.0,>=2.1.0 + - exceptiongroup>=1.0.0 ; python_version < '3.11' + - black>=19.10b0 ; extra == 'all' + - click>=7.0 ; extra == 'all' + - crosshair-tool>=0.0.54 ; extra == 'all' + - django>=3.2 ; extra == 'all' + - dpcontracts>=0.4 ; extra == 'all' + - hypothesis-crosshair>=0.0.2 ; extra == 'all' + - lark>=0.10.1 ; extra == 'all' + - libcst>=0.3.16 ; extra == 'all' + - numpy>=1.17.3 ; extra == 'all' + - pandas>=1.1 ; extra == 'all' + - pytest>=4.6 ; extra == 'all' + - python-dateutil>=1.4 ; extra == 'all' + - pytz>=2014.1 ; extra == 'all' + - redis>=3.0.0 ; extra == 'all' + - rich>=9.0.0 ; extra == 'all' + - backports-zoneinfo>=0.2.1 ; python_version < '3.9' and extra == 'all' + - tzdata>=2024.1 ; (sys_platform == 'win32' or sys_platform == 'emscripten') and extra == 'all' + - click>=7.0 ; extra == 'cli' + - black>=19.10b0 ; extra == 'cli' + - rich>=9.0.0 ; extra == 'cli' + - libcst>=0.3.16 ; extra == 'codemods' + - hypothesis-crosshair>=0.0.2 ; extra == 'crosshair' + - crosshair-tool>=0.0.54 ; extra == 'crosshair' + - python-dateutil>=1.4 ; extra == 'dateutil' + - django>=3.2 ; extra == 'django' + - dpcontracts>=0.4 ; extra == 'dpcontracts' + - black>=19.10b0 ; extra == 'ghostwriter' + - lark>=0.10.1 ; extra == 'lark' + - numpy>=1.17.3 ; extra == 'numpy' + - pandas>=1.1 ; extra == 'pandas' + - pytest>=4.6 ; extra == 'pytest' + - pytz>=2014.1 ; extra == 'pytz' + - redis>=3.0.0 ; extra == 'redis' + - backports-zoneinfo>=0.2.1 ; python_version < '3.9' and extra == 'zoneinfo' + - tzdata>=2024.1 ; (sys_platform == 'win32' or sys_platform == 'emscripten') and extra == 'zoneinfo' + requires_python: '>=3.8' +- kind: pypi + name: iniconfig + version: 2.0.0 + url: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl + sha256: b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374 + requires_python: '>=3.7' +- kind: pypi + name: isort + version: 5.13.2 + url: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl + sha256: 8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6 + requires_dist: + - colorama>=0.4.6 ; extra == 'colors' + requires_python: '>=3.8.0' +- kind: conda + name: ld_impl_linux-64 + version: '2.40' + build: hf3520f5_1 + build_number: 1 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + sha256: cb54a873c1c84c47f7174093889686b626946b8143905ec0f76a56785b26a304 + md5: 33b7851c39c25da14f6a233a8ccbeeca + constrains: + - binutils_impl_linux-64 2.40 + license: GPL-3.0-only + size: 707934 + timestamp: 1716583433869 +- kind: conda + name: libffi + version: 3.4.2 + build: h7f98852_5 + build_number: 5 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 + sha256: ab6e9856c21709b7b517e940ae7028ae0737546122f83c2aa5d692860c3b149e + md5: d645c6d2ac96843a2bfaccd2d62b3ac3 + depends: + - libgcc-ng >=9.4.0 + license: MIT + license_family: MIT + size: 58292 + timestamp: 1636488182923 +- kind: conda + name: libgcc-ng + version: 13.2.0 + build: h77fa898_7 + build_number: 7 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda + sha256: 62af2b89acbe74a21606c8410c276e57309c0a2ab8a9e8639e3c8131c0b60c92 + md5: 72ec1b1b04c4d15d4204ece1ecea5978 + depends: + - _libgcc_mutex 0.1 conda_forge + - _openmp_mutex >=4.5 + constrains: + - libgomp 13.2.0 h77fa898_7 + license: GPL-3.0-only WITH GCC-exception-3.1 + license_family: GPL + size: 775806 + timestamp: 1715016057793 +- kind: conda + name: libgomp + version: 13.2.0 + build: h77fa898_7 + build_number: 7 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + sha256: 781444fa069d3b50e8ed667b750571cacda785761c7fc2a89ece1ac49693d4ad + md5: abf3fec87c2563697defa759dec3d639 + depends: + - _libgcc_mutex 0.1 conda_forge + license: GPL-3.0-only WITH GCC-exception-3.1 + license_family: GPL + size: 422336 + timestamp: 1715015995979 +- kind: conda + name: libnsl + version: 2.0.1 + build: hd590300_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda + sha256: 26d77a3bb4dceeedc2a41bd688564fe71bf2d149fdcf117049970bc02ff1add6 + md5: 30fd6e37fe21f86f4bd26d6ee73eeec7 + depends: + - libgcc-ng >=12 + license: LGPL-2.1-only + license_family: GPL + size: 33408 + timestamp: 1697359010159 +- kind: conda + name: libsqlite + version: 3.45.3 + build: h2797004_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + sha256: e2273d6860eadcf714a759ffb6dc24a69cfd01f2a0ea9d6c20f86049b9334e0c + md5: b3316cbe90249da4f8e84cd66e1cc55b + depends: + - libgcc-ng >=12 + - libzlib >=1.2.13,<1.3.0a0 + license: Unlicense + size: 859858 + timestamp: 1713367435849 +- kind: conda + name: libuuid + version: 2.38.1 + build: h0b41bf4_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda + sha256: 787eb542f055a2b3de553614b25f09eefb0a0931b0c87dbcce6efdfd92f04f18 + md5: 40b61aab5c7ba9ff276c41cfffe6b80b + depends: + - libgcc-ng >=12 + license: BSD-3-Clause + license_family: BSD + size: 33601 + timestamp: 1680112270483 +- kind: conda + name: libzlib + version: 1.2.13 + build: hd590300_5 + build_number: 5 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda + sha256: 370c7c5893b737596fd6ca0d9190c9715d89d888b8c88537ae1ef168c25e82e4 + md5: f36c115f1ee199da648e0597ec2047ad + depends: + - libgcc-ng >=12 + constrains: + - zlib 1.2.13 *_5 + license: Zlib + license_family: Other + size: 61588 + timestamp: 1686575217516 +- kind: pypi + name: mccabe + version: 0.7.0 + url: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl + sha256: 6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e + requires_python: '>=3.6' +- kind: pypi + name: mypy-extensions + version: 1.0.0 + url: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl + sha256: 4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d + requires_python: '>=3.5' +- kind: conda + name: ncurses + version: '6.5' + build: h59595ed_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda + sha256: 4fc3b384f4072b68853a0013ea83bdfd3d66b0126e2238e1d6e1560747aa7586 + md5: fcea371545eda051b6deafb24889fc69 + depends: + - libgcc-ng >=12 + license: X11 AND BSD-3-Clause + size: 887465 + timestamp: 1715194722503 +- kind: conda + name: openssl + version: 3.3.0 + build: h4ab18f5_3 + build_number: 3 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda + sha256: 33dcea0ed3a61b2de6b66661cdd55278640eb99d676cd129fbff3e53641fa125 + md5: 12ea6d0d4ed54530eaed18e4835c1f7c + depends: + - ca-certificates + - libgcc-ng >=12 + constrains: + - pyopenssl >=22.1 + license: Apache-2.0 + license_family: Apache + size: 2891147 + timestamp: 1716468354865 +- kind: pypi + name: packaging + version: '24.0' + url: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl + sha256: 2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 + requires_python: '>=3.7' +- kind: pypi + name: pathspec + version: 0.12.1 + url: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl + sha256: a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08 + requires_python: '>=3.8' +- kind: pypi + name: platformdirs + version: 4.2.2 + url: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl + sha256: 2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee + requires_dist: + - furo>=2023.9.10 ; extra == 'docs' + - proselint>=0.13 ; extra == 'docs' + - sphinx-autodoc-typehints>=1.25.2 ; extra == 'docs' + - sphinx>=7.2.6 ; extra == 'docs' + - appdirs==1.4.4 ; extra == 'test' + - covdefaults>=2.3 ; extra == 'test' + - pytest-cov>=4.1 ; extra == 'test' + - pytest-mock>=3.12 ; extra == 'test' + - pytest>=7.4.3 ; extra == 'test' + - mypy>=1.8 ; extra == 'type' + requires_python: '>=3.8' +- kind: pypi + name: pluggy + version: 1.5.0 + url: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl + sha256: 44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669 + requires_dist: + - pre-commit ; extra == 'dev' + - tox ; extra == 'dev' + - pytest ; extra == 'testing' + - pytest-benchmark ; extra == 'testing' + requires_python: '>=3.8' +- kind: pypi + name: pylint + version: 3.1.0 + url: https://files.pythonhosted.org/packages/4d/2b/dfcf298607c73c3af47d5a699c3bd84ba580f1b8642a53ba2a53eead7c49/pylint-3.1.0-py3-none-any.whl + sha256: 507a5b60953874766d8a366e8e8c7af63e058b26345cfcb5f91f89d987fd6b74 + requires_dist: + - platformdirs>=2.2.0 + - astroid<=3.2.0.dev0,>=3.1.0 + - isort!=5.13.0,<6,>=4.2.5 + - mccabe<0.8,>=0.6 + - tomlkit>=0.10.1 + - typing-extensions>=3.10.0 ; python_version < '3.10' + - dill>=0.2 ; python_version < '3.11' + - tomli>=1.1.0 ; python_version < '3.11' + - dill>=0.3.6 ; python_version >= '3.11' + - dill>=0.3.7 ; python_version >= '3.12' + - colorama>=0.4.5 ; sys_platform == 'win32' + - pyenchant~=3.2 ; extra == 'spelling' + - gitpython>3 ; extra == 'testutils' + requires_python: '>=3.8.0' +- kind: pypi + name: pytest + version: 8.2.0 + url: https://files.pythonhosted.org/packages/c4/43/6b1debd95ecdf001bc46789a933f658da3f9738c65f32db3f4e8f2a4ca97/pytest-8.2.0-py3-none-any.whl + sha256: 1733f0620f6cda4095bbf0d9ff8022486e91892245bb9e7d5542c018f612f233 + requires_dist: + - iniconfig + - packaging + - pluggy<2.0,>=1.5 + - exceptiongroup>=1.0.0rc8 ; python_version < '3.11' + - tomli>=1 ; python_version < '3.11' + - colorama ; sys_platform == 'win32' + - argcomplete ; extra == 'dev' + - attrs>=19.2 ; extra == 'dev' + - hypothesis>=3.56 ; extra == 'dev' + - mock ; extra == 'dev' + - pygments>=2.7.2 ; extra == 'dev' + - requests ; extra == 'dev' + - setuptools ; extra == 'dev' + - xmlschema ; extra == 'dev' + requires_python: '>=3.8' +- kind: pypi + name: pytest-cov + version: 5.0.0 + url: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl + sha256: 4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652 + requires_dist: + - pytest>=4.6 + - coverage[toml]>=5.2.1 + - fields ; extra == 'testing' + - hunter ; extra == 'testing' + - process-tests ; extra == 'testing' + - pytest-xdist ; extra == 'testing' + - virtualenv ; extra == 'testing' + requires_python: '>=3.8' +- kind: conda + name: python + version: 3.10.0 + build: h543edf9_3_cpython + build_number: 3 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.0-h543edf9_3_cpython.tar.bz2 + sha256: 0661f43d7bc446c22bfcf1730ad5c7a2ac695c696ba4609bac896cefff879431 + md5: 67cdff58413ce9f034fb971188060313 + depends: + - bzip2 >=1.0.8,<2.0a0 + - ld_impl_linux-64 >=2.36.1 + - libffi >=3.4.2,<3.5.0a0 + - libgcc-ng >=9.4.0 + - libnsl >=2.0.0,<2.1.0a0 + - libuuid >=2.32.1,<3.0a0 + - libzlib >=1.2.11,<1.3.0a0 + - ncurses >=6.2,<7.0.0a0 + - openssl >=3.0.0,<4.0a0 + - readline >=8.1,<9.0a0 + - sqlite >=3.36.0,<4.0a0 + - tk >=8.6.11,<8.7.0a0 + - tzdata + - xz >=5.2.5,<6.0.0a0 + constrains: + - python_abi 3.10.* *_cp310 + license: Python-2.0 + size: 31281695 + timestamp: 1637376125446 +- kind: pypi + name: python-template + version: 0.2.0 + path: . + sha256: 59c2a996be1b9e8f041ef206670d570aa83961c1d1076748096004898cf688a3 + requires_dist: + - black>=23,<=24.4.2 ; extra == 'test' + - pylint>=2.16,<=3.1.0 ; extra == 'test' + - pytest-cov>=4.1,<=5.0.0 ; extra == 'test' + - pytest>=7.4,<=8.2.0 ; extra == 'test' + - hypothesis>=6.82,<=6.100.5 ; extra == 'test' + - ruff>=0.0.280,<=0.4.3 ; extra == 'test' + - coverage>=7.2.7,<=7.5.1 ; extra == 'test' + requires_python: ==3.10 + editable: true +- kind: conda + name: readline + version: '8.2' + build: h8228510_1 + build_number: 1 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda + sha256: 5435cf39d039387fbdc977b0a762357ea909a7694d9528ab40f005e9208744d7 + md5: 47d31b792659ce70f470b5c82fdfb7a4 + depends: + - libgcc-ng >=12 + - ncurses >=6.3,<7.0a0 + license: GPL-3.0-only + license_family: GPL + size: 281456 + timestamp: 1679532220005 +- kind: pypi + name: ruff + version: 0.4.3 + url: https://files.pythonhosted.org/packages/5a/6b/9c1b94d5a5720390029c810428c60f791ba77cfd3de2c13a51f3beb02916/ruff-0.4.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 18b00e0bcccf0fc8d7186ed21e311dffd19761cb632241a6e4fe4477cc80ef6e + requires_python: '>=3.7' +- kind: pypi + name: sortedcontainers + version: 2.4.0 + url: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl + sha256: a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0 +- kind: conda + name: sqlite + version: 3.45.3 + build: h2c6b66d_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.45.3-h2c6b66d_0.conda + sha256: 945ac702e2bd8cc59cc780dfc37c18255d5e538c8433dc290c0edbad2bcbaeb4 + md5: be7d70f2db41b674733667bdd69bd000 + depends: + - libgcc-ng >=12 + - libsqlite 3.45.3 h2797004_0 + - libzlib >=1.2.13,<1.3.0a0 + - ncurses >=6.4.20240210,<7.0a0 + - readline >=8.2,<9.0a0 + license: Unlicense + size: 848611 + timestamp: 1713367461306 +- kind: conda + name: tk + version: 8.6.13 + build: noxft_h4845f30_101 + build_number: 101 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda + sha256: e0569c9caa68bf476bead1bed3d79650bb080b532c64a4af7d8ca286c08dea4e + md5: d453b98d9c83e71da0741bb0ff4d76bc + depends: + - libgcc-ng >=12 + - libzlib >=1.2.13,<1.3.0a0 + license: TCL + license_family: BSD + size: 3318875 + timestamp: 1699202167581 +- kind: pypi + name: tomli + version: 2.0.1 + url: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl + sha256: 939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc + requires_python: '>=3.7' +- kind: pypi + name: tomlkit + version: 0.12.5 + url: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl + sha256: af914f5a9c59ed9d0762c7b64d3b5d5df007448eb9cd2edc8a46b1eafead172f + requires_python: '>=3.7' +- kind: pypi + name: typing-extensions + version: 4.12.0 + url: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl + sha256: b349c66bea9016ac22978d800cfff206d5f9816951f12a7d0ec5578b0a819594 + requires_python: '>=3.8' +- kind: conda + name: tzdata + version: 2024a + build: h0c530f3_0 + subdir: noarch + noarch: generic + url: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda + sha256: 7b2b69c54ec62a243eb6fba2391b5e443421608c3ae5dbff938ad33ca8db5122 + md5: 161081fc7cec0bfda0d86d7cb595f8d8 + license: LicenseRef-Public-Domain + size: 119815 + timestamp: 1706886945727 +- kind: conda + name: xz + version: 5.2.6 + build: h166bdaf_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 + sha256: 03a6d28ded42af8a347345f82f3eebdd6807a08526d47899a42d62d319609162 + md5: 2161070d867d1b1204ea749c8eec4ef0 + depends: + - libgcc-ng >=12 + license: LGPL-2.1 and GPL-2.0 + size: 418368 + timestamp: 1660346797927 diff --git a/pyproject.toml b/pyproject.toml index b1d7686..177d0d8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,14 +1,21 @@ [project] name = "python_template" version = "0.2.0" - authors = [{ name = "Austin Gregg-Smith", email = "blooop@gmail.com" }] description = "A python package template" readme = "README.md" +requires-python = "==3.10" + +dependencies = [] -requires-python = ">=3.10" +[tool.pixi.project] +channels = ["conda-forge"] +platforms = ["linux-64"] -dependencies = ["numpy>=1.2,<=1.26.4"] +[tool.pixi.dependencies] + +[tool.pixi.pypi-dependencies] +python_template = { path = ".", editable = true } [project.optional-dependencies] test = [ @@ -25,14 +32,26 @@ test = [ Source = "https://github.com/blooop/python_template" Home = "https://github.com/blooop/python_template" +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" -[tool.flit.module] -name = "python_template" +# Environments +[tool.pixi.environments] +default = { solve-group = "default" } +test = { features = ["test"], solve-group = "default" } -[build-system] -requires = ["flit_core >=3.2,<4"] -build-backend = "flit_core.buildapi" +[tool.pixi.tasks] +pr = "pixi install; git commit -a -m'update pixi.lock';git push" + +[tool.pixi.feature.test.tasks] +fmt = "black ." +lint = "ruff check . --fix ; pylint $(git ls-files '*.py')" +test = "pytest" +coverage = "coverage run -m pytest; coverage xml -o coverage.xml" +[tool.setuptools.packages.find] +include= ["python_template"] [tool.pylint] extension-pkg-whitelist = ["numpy"] @@ -48,7 +67,7 @@ line-length = 100 [tool.ruff] # Never enforce `E501` (line length violations). #"F841" will auto remove unused variables which is annoying during development, pylint catches this anyway -lint.ignore = ["E501", "E902", "F841"] +ignore = ["E501", "E902", "F841"] # Same as Black. line-length = 100 @@ -56,7 +75,7 @@ line-length = 100 target-version = "py310" # Allow unused variables when underscore-prefixed. -lint.dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" +dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" # Ignore `E402` (import violations) in all `__init__.py` files, and in `path/to/file.py`. [tool.ruff.lint.per-file-ignores] From 2f1b97e995ce377a7e22d1b91751fc5ae3e121ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 May 2024 11:27:44 +0000 Subject: [PATCH 009/109] Bump codecov/codecov-action from 3 to 4 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3...v4) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5191cb3..f50f436 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,6 @@ jobs: run: | pixi run coverage - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file From 48667a3cedc4e1ef95d05a867ab8f020e014f754 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 12:40:07 +0100 Subject: [PATCH 010/109] [add] coverage excluded --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 177d0d8..18ee6e7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,4 +93,6 @@ exclude_also = [ "raise AssertionError", "raise NotImplementedError", "if __name__ == .__main__.:", + "pass", + "(_):", ] From 902e18f92055628330839daf8e91dbb4d6c9ed25 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 12:51:25 +0100 Subject: [PATCH 011/109] update pixi.lock --- pixi.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.lock b/pixi.lock index e348e93..95d3c85 100644 --- a/pixi.lock +++ b/pixi.lock @@ -578,7 +578,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 59c2a996be1b9e8f041ef206670d570aa83961c1d1076748096004898cf688a3 + sha256: c94172f3c7e13d7df3754f1e02d82bb6cc38d7bd276d12f56a53c51eb882ae4b requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.16,<=3.1.0 ; extra == 'test' From 8c78564b812faecacd7612bd9017c61d5fbb1744 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 May 2024 15:12:05 +0000 Subject: [PATCH 012/109] Bump the dev-dependencies group with 4 updates Updates the requirements on [pylint](https://github.com/pylint-dev/pylint), [pytest](https://github.com/pytest-dev/pytest), [hypothesis](https://github.com/HypothesisWorks/hypothesis) and [ruff](https://github.com/astral-sh/ruff) to permit the latest version. Updates `pylint` to 3.2.2 - [Release notes](https://github.com/pylint-dev/pylint/releases) - [Commits](https://github.com/pylint-dev/pylint/compare/pylint-3.0.0a0...v3.2.2) Updates `pytest` to 8.2.1 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.4.0...8.2.1) Updates `hypothesis` to 6.102.6 - [Release notes](https://github.com/HypothesisWorks/hypothesis/releases) - [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.82.0...hypothesis-python-6.102.6) Updates `ruff` to 0.4.5 - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.0.280...v0.4.5) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: pytest dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: hypothesis dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: ruff dependency-type: direct:production dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 177d0d8..7b142d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,11 +20,11 @@ python_template = { path = ".", editable = true } [project.optional-dependencies] test = [ "black>=23,<=24.4.2", - "pylint>=2.16,<=3.1.0", + "pylint>=2.16,<=3.2.2", "pytest-cov>=4.1,<=5.0.0", - "pytest>=7.4,<=8.2.0", - "hypothesis>=6.82,<=6.100.5", - "ruff>=0.0.280,<=0.4.3", + "pytest>=7.4,<=8.2.1", + "hypothesis>=6.82,<=6.102.6", + "ruff>=0.0.280,<=0.4.5", "coverage>=7.2.7,<=7.5.1", ] From 1382323993be995e35abdaaff902c759c821351b Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 16:13:10 +0100 Subject: [PATCH 013/109] add frozen: True for lockfile --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f50f436..6b49f87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,7 @@ jobs: with: pixi-version: v0.22.0 cache: true + frozen: true - name: Format and lint run: | pixi run fmt From 9d497dc26ad5f4f2afcbc328a0fb29a50ff15e74 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 16:30:25 +0100 Subject: [PATCH 014/109] add ci task and fix ruff linting --- pixi.lock | 2 +- pyproject.toml | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pixi.lock b/pixi.lock index 95d3c85..22cf386 100644 --- a/pixi.lock +++ b/pixi.lock @@ -578,7 +578,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: c94172f3c7e13d7df3754f1e02d82bb6cc38d7bd276d12f56a53c51eb882ae4b + sha256: 00475621a7c18c924d33e3e9cf31092a4c2264df2a0f82ca6b20b0e77be024f3 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.16,<=3.1.0 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index 18ee6e7..4c033ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,6 +49,7 @@ fmt = "black ." lint = "ruff check . --fix ; pylint $(git ls-files '*.py')" test = "pytest" coverage = "coverage run -m pytest; coverage xml -o coverage.xml" +ci = {depends_on = ["fmt","lint","test"]} [tool.setuptools.packages.find] include= ["python_template"] @@ -65,15 +66,17 @@ enable = "no-else-return,consider-using-in" line-length = 100 [tool.ruff] -# Never enforce `E501` (line length violations). -#"F841" will auto remove unused variables which is annoying during development, pylint catches this anyway -ignore = ["E501", "E902", "F841"] + # Same as Black. line-length = 100 target-version = "py310" +[tool.ruff.lint] +# Never enforce `E501` (line length violations). +#"F841" will auto remove unused variables which is annoying during development, pylint catches this anyway +ignore = ["E501", "E902", "F841"] # Allow unused variables when underscore-prefixed. dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" From 9dd1c1449ae72d30b2b484838cfaee6b3d60585c Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 16:34:12 +0100 Subject: [PATCH 015/109] update pixi.lock --- pixi.lock | 2 +- pyproject.toml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pixi.lock b/pixi.lock index 22cf386..3ae4fdc 100644 --- a/pixi.lock +++ b/pixi.lock @@ -578,7 +578,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 00475621a7c18c924d33e3e9cf31092a4c2264df2a0f82ca6b20b0e77be024f3 + sha256: 6d45b9efaee488e1a83d8124f99356e38f3acd07789d82a4b4fe76e9cf940330 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.16,<=3.1.0 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index 4c033ec..81b6e99 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,9 @@ fmt = "black ." lint = "ruff check . --fix ; pylint $(git ls-files '*.py')" test = "pytest" coverage = "coverage run -m pytest; coverage xml -o coverage.xml" -ci = {depends_on = ["fmt","lint","test"]} +ci-no-cover = {depends_on = ["fmt","lint","test"]} +ci = {depends_on = ["fmt","lint","coverage"]} + [tool.setuptools.packages.find] include= ["python_template"] From eab0615a3259ed97009c7a4606c54704c77563cb Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 17:55:13 +0100 Subject: [PATCH 016/109] update pixi.lock --- .vscode/tasks.json | 33 +++++++++------------------------ pixi.lock | 2 +- pyproject.toml | 5 +++-- 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index b099596..6c133bf 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -14,7 +14,7 @@ { "label": "run ", "type": "shell", - "command": "RUNFILE=$(cat ${workspaceFolder}/.vscode/active_file.cfg); echo Running file: $RUNFILE; python3 $RUNFILE", + "command": "RUNFILE=$(cat ${workspaceFolder}/.vscode/active_file.cfg); echo Running file: $RUNFILE; pixi run python3 $RUNFILE", "problemMatcher": [], "group": { "kind": "build", @@ -25,28 +25,19 @@ "label": "autoformat", "detail": "Use ruff and black to automatically fix and format the code", "type": "shell", - "command": "ruff check . --fix && black ." - }, + "command": "pixi run fmt" + }, { - "label": "autoformat, commit and push", - "detail": "Use ruff and black to automatically fix and format the code and commit changes", - "type": "shell", - "dependsOn": [ - "autoformat" - ], - "command": "git commit -a -m 'fix: autoformatted and ruff --fix all code' || true && git push" - }, - { - "label": "pylint", + "label": "lint", "detail": "Run pylint on files tracked by git", "type": "shell", - "command": "pylint $(git ls-files '*.py') " + "command": "pixi run lint" }, { "label": "code coverage", "detail": "Run code coverage and print a coverage report, also update coverage.xml for in the in-editor coverage gutter", "type": "shell", - "command": "coverage run -m pytest; coverage xml -o coverage.xml" + "command": "pixi run coverage" }, { "label": "code coverage report", @@ -55,7 +46,7 @@ "dependsOn": [ "code coverage" ], - "command": "coverage report -m" + "command": "pixi run coverage-report" }, { "label": "pytest duration", @@ -65,14 +56,9 @@ }, { "label": "check CI", - "detail": "Runs the basic formatting and linting checks performed by CI", + "detail": "Runs the basic formatting and linting and tests performed by CI", "type": "shell", - "dependsOn": [ - "autoformat", - "pylint", - "code coverage report" - ], - "dependsOrder": "sequence", + "command": "pixi run ci-no-cover" }, { "label": "check CI, commit and push", @@ -81,7 +67,6 @@ "dependsOn": [ "git pull origin main", "check CI", - "autoformat, commit and push", ], "dependsOrder": "sequence", }, diff --git a/pixi.lock b/pixi.lock index 3ae4fdc..68d63e0 100644 --- a/pixi.lock +++ b/pixi.lock @@ -578,7 +578,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 6d45b9efaee488e1a83d8124f99356e38f3acd07789d82a4b4fe76e9cf940330 + sha256: c642f6498b30deacd97ed3682897b0fc585f13bebd0c3b08860b1ccaa920c36c requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.16,<=3.1.0 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index 81b6e99..711c744 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,9 +49,10 @@ fmt = "black ." lint = "ruff check . --fix ; pylint $(git ls-files '*.py')" test = "pytest" coverage = "coverage run -m pytest; coverage xml -o coverage.xml" +coverage-report = "coverage report -m" ci-no-cover = {depends_on = ["fmt","lint","test"]} -ci = {depends_on = ["fmt","lint","coverage"]} - +ci = {depends_on = ["fmt","lint","coverage","coverage-report"]} +update-lock-push = "pixi install; git commit -a -m'update pixi.lock';git push" [tool.setuptools.packages.find] include= ["python_template"] From 52ad1690e0b2e2e7fd06268a1fd56cccb2b0c274 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 18:14:46 +0100 Subject: [PATCH 017/109] update pixi.lock --- pixi.lock | 56 +++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/pixi.lock b/pixi.lock index 68d63e0..d4aecc4 100644 --- a/pixi.lock +++ b/pixi.lock @@ -55,14 +55,14 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 - - pypi: https://files.pythonhosted.org/packages/ed/1c/ee18acf9070f77253954b7d71b4c0cf8f5969fb23067d8f1a8793573ba00/astroid-3.1.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/7d/7f8df0fdbbbefc4362d3eca6b69b7a8a4249a8a88dabc00a207d31fddcd7/black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/3b/43/3bdab48c6bdd09216c19f4f1d11430869880c387af5c4a759a3eff47dd8f/hypothesis-6.100.5-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl @@ -71,10 +71,10 @@ environments: - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/4d/2b/dfcf298607c73c3af47d5a699c3bd84ba580f1b8642a53ba2a53eead7c49/pylint-3.1.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/c4/43/6b1debd95ecdf001bc46789a933f658da3f9738c65f32db3f4e8f2a4ca97/pytest-8.2.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/5a/6b/9c1b94d5a5720390029c810428c60f791ba77cfd3de2c13a51f3beb02916/ruff-0.4.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl @@ -112,9 +112,9 @@ packages: timestamp: 1650670423406 - kind: pypi name: astroid - version: 3.1.0 - url: https://files.pythonhosted.org/packages/ed/1c/ee18acf9070f77253954b7d71b4c0cf8f5969fb23067d8f1a8793573ba00/astroid-3.1.0-py3-none-any.whl - sha256: 951798f922990137ac090c53af473db7ab4e70c770e6d7fae0cec59f74411819 + version: 3.2.2 + url: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl + sha256: e8a0083b4bb28fcffb6207a3bfc9e5d0a68be951dd7e336d5dcf639c682388c0 requires_dist: - typing-extensions>=4.0.0 ; python_version < '3.11' requires_python: '>=3.8.0' @@ -229,9 +229,9 @@ packages: requires_python: '>=3.7' - kind: pypi name: hypothesis - version: 6.100.5 - url: https://files.pythonhosted.org/packages/3b/43/3bdab48c6bdd09216c19f4f1d11430869880c387af5c4a759a3eff47dd8f/hypothesis-6.100.5-py3-none-any.whl - sha256: d2f875a8791abdf68599e85cc9238f7239a73b72362d34be95e532e811766723 + version: 6.102.6 + url: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl + sha256: ef281ba8b2626ebade9f463fbe8851ae6ff6ae4a8621a9e54c7c2477a97ccff0 requires_dist: - attrs>=22.2.0 - sortedcontainers<3.0.0,>=2.1.0 @@ -241,7 +241,7 @@ packages: - crosshair-tool>=0.0.54 ; extra == 'all' - django>=3.2 ; extra == 'all' - dpcontracts>=0.4 ; extra == 'all' - - hypothesis-crosshair>=0.0.2 ; extra == 'all' + - hypothesis-crosshair>=0.0.4 ; extra == 'all' - lark>=0.10.1 ; extra == 'all' - libcst>=0.3.16 ; extra == 'all' - numpy>=1.17.3 ; extra == 'all' @@ -257,7 +257,7 @@ packages: - black>=19.10b0 ; extra == 'cli' - rich>=9.0.0 ; extra == 'cli' - libcst>=0.3.16 ; extra == 'codemods' - - hypothesis-crosshair>=0.0.2 ; extra == 'crosshair' + - hypothesis-crosshair>=0.0.4 ; extra == 'crosshair' - crosshair-tool>=0.0.54 ; extra == 'crosshair' - python-dateutil>=1.4 ; extra == 'dateutil' - django>=3.2 ; extra == 'django' @@ -492,12 +492,12 @@ packages: requires_python: '>=3.8' - kind: pypi name: pylint - version: 3.1.0 - url: https://files.pythonhosted.org/packages/4d/2b/dfcf298607c73c3af47d5a699c3bd84ba580f1b8642a53ba2a53eead7c49/pylint-3.1.0-py3-none-any.whl - sha256: 507a5b60953874766d8a366e8e8c7af63e058b26345cfcb5f91f89d987fd6b74 + version: 3.2.2 + url: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl + sha256: 3f8788ab20bb8383e06dd2233e50f8e08949cfd9574804564803441a4946eab4 requires_dist: - platformdirs>=2.2.0 - - astroid<=3.2.0.dev0,>=3.1.0 + - astroid<=3.3.0.dev0,>=3.2.2 - isort!=5.13.0,<6,>=4.2.5 - mccabe<0.8,>=0.6 - tomlkit>=0.10.1 @@ -512,9 +512,9 @@ packages: requires_python: '>=3.8.0' - kind: pypi name: pytest - version: 8.2.0 - url: https://files.pythonhosted.org/packages/c4/43/6b1debd95ecdf001bc46789a933f658da3f9738c65f32db3f4e8f2a4ca97/pytest-8.2.0-py3-none-any.whl - sha256: 1733f0620f6cda4095bbf0d9ff8022486e91892245bb9e7d5542c018f612f233 + version: 8.2.1 + url: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl + sha256: faccc5d332b8c3719f40283d0d44aa5cf101cec36f88cde9ed8f2bc0538612b1 requires_dist: - iniconfig - packaging @@ -578,14 +578,14 @@ packages: name: python-template version: 0.2.0 path: . - sha256: c642f6498b30deacd97ed3682897b0fc585f13bebd0c3b08860b1ccaa920c36c + sha256: 718654fccca791a5b638e704b3f9a7f00972e32273a40b6c20835ab5b3fb8262 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - - pylint>=2.16,<=3.1.0 ; extra == 'test' + - pylint>=2.16,<=3.2.2 ; extra == 'test' - pytest-cov>=4.1,<=5.0.0 ; extra == 'test' - - pytest>=7.4,<=8.2.0 ; extra == 'test' - - hypothesis>=6.82,<=6.100.5 ; extra == 'test' - - ruff>=0.0.280,<=0.4.3 ; extra == 'test' + - pytest>=7.4,<=8.2.1 ; extra == 'test' + - hypothesis>=6.82,<=6.102.6 ; extra == 'test' + - ruff>=0.0.280,<=0.4.5 ; extra == 'test' - coverage>=7.2.7,<=7.5.1 ; extra == 'test' requires_python: ==3.10 editable: true @@ -607,9 +607,9 @@ packages: timestamp: 1679532220005 - kind: pypi name: ruff - version: 0.4.3 - url: https://files.pythonhosted.org/packages/5a/6b/9c1b94d5a5720390029c810428c60f791ba77cfd3de2c13a51f3beb02916/ruff-0.4.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 18b00e0bcccf0fc8d7186ed21e311dffd19761cb632241a6e4fe4477cc80ef6e + version: 0.4.5 + url: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: f4b02a65985be2b34b170025a8b92449088ce61e33e69956ce4d316c0fe7cce0 requires_python: '>=3.7' - kind: pypi name: sortedcontainers From 068f75e55a52536d76b18848b5cb1e1bc0de60b9 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 18:18:34 +0100 Subject: [PATCH 018/109] add pixi badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 48bd709..54a4736 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ This has basic setup for [![GitHub release](https://img.shields.io/github/release/blooop/python_template.svg)](https://GitHub.com/blooop/python_template/releases/) [![License](https://img.shields.io/pypi/l/bencher)](https://opensource.org/license/mit/) [![Python](https://img.shields.io/badge/python-3.10-blue)](https://www.python.org/downloads/release/python-310/) +[![Pixi Badge](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/prefix-dev/pixi/main/assets/badge/v0.json)](https://pixi.sh) To set up your project run the vscode task "pull updates from template repo" and then task "rename project template name" From 62141ba1973a02e189ababcb9bf5c56c44461b6c Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 18:54:06 +0100 Subject: [PATCH 019/109] add pixi badge section to the readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 48bd709..d019420 100644 --- a/README.md +++ b/README.md @@ -25,3 +25,6 @@ This has basic setup for To set up your project run the vscode task "pull updates from template repo" and then task "rename project template name" + +### Pixi Badge +The Pixi badge indicates that this project is optimized for performance and follows best practices as evaluated by the Pixi tool. For more information, visit [Pixi](https://pixi.sh). \ No newline at end of file From bce18e49f7237cd3623c6b98e1e012a87e3c6e17 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 18:58:19 +0100 Subject: [PATCH 020/109] update tasks --- .github/workflows/ci.yml | 2 +- pixi.lock | 2 +- pyproject.toml | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b49f87..ce62d92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: frozen: true - name: Format and lint run: | - pixi run fmt + pixi run format pixi run lint - name: Assert no changes run: | diff --git a/pixi.lock b/pixi.lock index d4aecc4..9edaa22 100644 --- a/pixi.lock +++ b/pixi.lock @@ -578,7 +578,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 718654fccca791a5b638e704b3f9a7f00972e32273a40b6c20835ab5b3fb8262 + sha256: 86a9593ac977c536e5e5b47b61ba8ba2f36c9dce6c445bdd5e82ebeb7ff3b575 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.16,<=3.2.2 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index 8bac5a4..9fbe038 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,15 +45,16 @@ test = { features = ["test"], solve-group = "default" } pr = "pixi install; git commit -a -m'update pixi.lock';git push" [tool.pixi.feature.test.tasks] -fmt = "black ." -lint = "ruff check . --fix ; pylint $(git ls-files '*.py')" +format = "black ." +lint = "ruff check . --fix ; echo 'running pylint...' pylint $(git ls-files '*.py'); git diff --exit-code" test = "pytest" coverage = "coverage run -m pytest; coverage xml -o coverage.xml" coverage-report = "coverage report -m" -ci-no-cover = {depends_on = ["fmt","lint","test"]} -ci = {depends_on = ["fmt","lint","coverage","coverage-report"]} +ci-no-cover = {depends_on = ["format","lint","test"]} +ci = {depends_on = ["format","lint","coverage","coverage-report"]} update-lock-push = "pixi install; git commit -a -m'update pixi.lock';git push" + [tool.setuptools.packages.find] include= ["python_template"] From b31203142bc1843283e8492e9d734f8255470212 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 18:58:40 +0100 Subject: [PATCH 021/109] fail formatting --- python_template/basic_class.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python_template/basic_class.py b/python_template/basic_class.py index e118a8e..9bf2039 100644 --- a/python_template/basic_class.py +++ b/python_template/basic_class.py @@ -3,4 +3,5 @@ @dataclass class BasicClass: + int_var: int = 0 From 1d1c758e4f1d3dd75ff5ca8bfb96251dda95d781 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 18:59:24 +0100 Subject: [PATCH 022/109] autoformat --- pixi.lock | 2 +- python_template/basic_class.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pixi.lock b/pixi.lock index 9edaa22..e65629e 100644 --- a/pixi.lock +++ b/pixi.lock @@ -578,7 +578,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 86a9593ac977c536e5e5b47b61ba8ba2f36c9dce6c445bdd5e82ebeb7ff3b575 + sha256: 4edec672bfa0b660ff7b0cc14bd238a710c2eaaf4ef650ca62644cef9188f9ea requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.16,<=3.2.2 ; extra == 'test' diff --git a/python_template/basic_class.py b/python_template/basic_class.py index 9bf2039..e118a8e 100644 --- a/python_template/basic_class.py +++ b/python_template/basic_class.py @@ -3,5 +3,4 @@ @dataclass class BasicClass: - int_var: int = 0 From a373c5267ec1aa94ba4a23a23667cd4c6e8250b9 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 19:13:12 +0100 Subject: [PATCH 023/109] update linting task --- pixi.lock | 2 +- pyproject.toml | 4 ++-- python_template/basic_class.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pixi.lock b/pixi.lock index d4aecc4..ad0d327 100644 --- a/pixi.lock +++ b/pixi.lock @@ -578,7 +578,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 718654fccca791a5b638e704b3f9a7f00972e32273a40b6c20835ab5b3fb8262 + sha256: de8ddff052be788470245c6af8e4d49b7d77710414ebe5c84b704e42163732a6 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.16,<=3.2.2 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index 8bac5a4..7e4ab37 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,8 +45,8 @@ test = { features = ["test"], solve-group = "default" } pr = "pixi install; git commit -a -m'update pixi.lock';git push" [tool.pixi.feature.test.tasks] -fmt = "black ." -lint = "ruff check . --fix ; pylint $(git ls-files '*.py')" +format = "black ." +lint = "ruff check . --fix && echo 'running pylint...' && pylint $(git ls-files '*.py') && git diff --exit-code" test = "pytest" coverage = "coverage run -m pytest; coverage xml -o coverage.xml" coverage-report = "coverage report -m" diff --git a/python_template/basic_class.py b/python_template/basic_class.py index e118a8e..014a08e 100644 --- a/python_template/basic_class.py +++ b/python_template/basic_class.py @@ -1,4 +1,5 @@ from dataclasses import dataclass +from numpy import * @dataclass From bc827029f8a94c451a01edd19de6631f87610c04 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 19:15:44 +0100 Subject: [PATCH 024/109] fix linting --- python_template/basic_class.py | 1 - 1 file changed, 1 deletion(-) diff --git a/python_template/basic_class.py b/python_template/basic_class.py index 014a08e..e118a8e 100644 --- a/python_template/basic_class.py +++ b/python_template/basic_class.py @@ -1,5 +1,4 @@ from dataclasses import dataclass -from numpy import * @dataclass From 0ace7fb88ec5b83786aea1544e98bd4adf57fc14 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 19:16:52 +0100 Subject: [PATCH 025/109] update pixi.lock --- pixi.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.lock b/pixi.lock index e65629e..ad0d327 100644 --- a/pixi.lock +++ b/pixi.lock @@ -578,7 +578,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 4edec672bfa0b660ff7b0cc14bd238a710c2eaaf4ef650ca62644cef9188f9ea + sha256: de8ddff052be788470245c6af8e4d49b7d77710414ebe5c84b704e42163732a6 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.16,<=3.2.2 ; extra == 'test' From 06140764651c3baf199b60aac928b7035fee487a Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 20:10:07 +0100 Subject: [PATCH 026/109] update pixi.lock --- .github/workflows/ci.yml | 3 +-- pixi.lock | 2 +- pyproject.toml | 10 +++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce62d92..fd900e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,7 @@ jobs: frozen: true - name: Format and lint run: | - pixi run format - pixi run lint + pixi run style - name: Assert no changes run: | git diff --exit-code diff --git a/pixi.lock b/pixi.lock index ad0d327..6f603a4 100644 --- a/pixi.lock +++ b/pixi.lock @@ -578,7 +578,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: de8ddff052be788470245c6af8e4d49b7d77710414ebe5c84b704e42163732a6 + sha256: 59898e5773a9dc1fa1d0a085f4a472ec238b3f73662f1f30be25e8afc78a3724 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.16,<=3.2.2 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index a7b85f8..ab7f0c3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,12 +46,16 @@ pr = "pixi install; git commit -a -m'update pixi.lock';git push" [tool.pixi.feature.test.tasks] format = "black ." -lint = "ruff check . --fix && echo 'running pylint...' && pylint $(git ls-files '*.py') && git diff --exit-code" +check-clean-workspace = "git diff --exit-code" +ruff-lint = "ruff check . --fix" +pylint = "echo 'running pylint...'; pylint --version && pylint $(git ls-files '*.py')" +lint = { depends_on = ["ruff-lint","check-clean-workspace", "pylint"] } +style = { depends_on = ["format","lint"]} test = "pytest" coverage = "coverage run -m pytest; coverage xml -o coverage.xml" coverage-report = "coverage report -m" -ci-no-cover = {depends_on = ["format","lint","test"]} -ci = {depends_on = ["format","lint","coverage","coverage-report"]} +ci-no-cover = { depends_on = ["format", "lint", "test"] } +ci = { depends_on = ["format", "lint", "coverage", "coverage-report"] } update-lock-push = "pixi install; git commit -a -m'update pixi.lock';git push" From 61c054ffa4d2e716f0419fc09cdad26c52fecd9b Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 20:11:44 +0100 Subject: [PATCH 027/109] simplify ci --- .github/workflows/ci.yml | 10 ++-------- pyproject.toml | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd900e6..9830871 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,15 +20,9 @@ jobs: pixi-version: v0.22.0 cache: true frozen: true - - name: Format and lint + - name: CI run: | - pixi run style - - name: Assert no changes - run: | - git diff --exit-code - - name: Test - run: | - pixi run coverage + pixi run ci - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4 env: diff --git a/pyproject.toml b/pyproject.toml index ab7f0c3..e06f6cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,8 +54,8 @@ style = { depends_on = ["format","lint"]} test = "pytest" coverage = "coverage run -m pytest; coverage xml -o coverage.xml" coverage-report = "coverage report -m" -ci-no-cover = { depends_on = ["format", "lint", "test"] } -ci = { depends_on = ["format", "lint", "coverage", "coverage-report"] } +ci-no-cover = { depends_on = ["style", "test"] } +ci = { depends_on = ["style", "coverage", "coverage-report"] } update-lock-push = "pixi install; git commit -a -m'update pixi.lock';git push" From b38cec5ad2b2dfd9bd53481fd5807281a89966ff Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 20:12:20 +0100 Subject: [PATCH 028/109] update min pylint version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e06f6cc..b077e8b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ python_template = { path = ".", editable = true } [project.optional-dependencies] test = [ "black>=23,<=24.4.2", - "pylint>=2.16,<=3.2.2", + "pylint>=2.17.7,<=3.2.2", "pytest-cov>=4.1,<=5.0.0", "pytest>=7.4,<=8.2.1", "hypothesis>=6.82,<=6.102.6", From a89d756dfc545d6b8ce3b21d8a8481e3bf1afc97 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 20:12:51 +0100 Subject: [PATCH 029/109] update python version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b077e8b..d2f5fcc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ version = "0.2.0" authors = [{ name = "Austin Gregg-Smith", email = "blooop@gmail.com" }] description = "A python package template" readme = "README.md" -requires-python = "==3.10" +requires-python = ">= 3.10" dependencies = [] From baabfddadf31034fad5042f0c3cca17605b4bbcc Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 20:14:11 +0100 Subject: [PATCH 030/109] update pixi.lock --- pixi.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pixi.lock b/pixi.lock index 6f603a4..2b278c1 100644 --- a/pixi.lock +++ b/pixi.lock @@ -578,16 +578,16 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 59898e5773a9dc1fa1d0a085f4a472ec238b3f73662f1f30be25e8afc78a3724 + sha256: 23f5c8f977b44c096aefc4cc84ee13ff36b8ebcad49ddc4dbc57972cf71a177a requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - - pylint>=2.16,<=3.2.2 ; extra == 'test' + - pylint>=2.17.7,<=3.2.2 ; extra == 'test' - pytest-cov>=4.1,<=5.0.0 ; extra == 'test' - pytest>=7.4,<=8.2.1 ; extra == 'test' - hypothesis>=6.82,<=6.102.6 ; extra == 'test' - ruff>=0.0.280,<=0.4.5 ; extra == 'test' - coverage>=7.2.7,<=7.5.1 ; extra == 'test' - requires_python: ==3.10 + requires_python: '>=3.10' editable: true - kind: conda name: readline From f81f4513f0a5809b4c8c790a88fdd8caf595e99d Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 25 May 2024 20:19:13 +0100 Subject: [PATCH 031/109] update pixi.lock --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9830871..8dd08b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,6 @@ jobs: with: pixi-version: v0.22.0 cache: true - frozen: true - name: CI run: | pixi run ci From 5828c0d794c9cae8a4e3385e76cfdb3e4ce95129 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 14:45:48 +0100 Subject: [PATCH 032/109] update setup host script to install pixi --- scripts/setup_host.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/setup_host.sh b/scripts/setup_host.sh index 246fd00..6a7686e 100755 --- a/scripts/setup_host.sh +++ b/scripts/setup_host.sh @@ -51,4 +51,8 @@ echo "testing docker install" docker run hello-world -echo "you may need to restart your machine" \ No newline at end of file +echo "you may need to restart your machine" + +#INSTALL PIXI +curl -fsSL https://pixi.sh/install.sh | bash +echo 'eval "$(pixi completion --shell bash)"' >> ~/.bashrc From 9a6731b1f6a9ae7ae1ff192ce6fd40bcac43f64b Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 14:53:18 +0100 Subject: [PATCH 033/109] update readme and numpy dep --- README.md | 15 +- pixi.lock | 312 ++++++++++++++++++++++++++++-------- pyproject.toml | 1 + scripts/first_time_setup.sh | 22 --- 4 files changed, 254 insertions(+), 96 deletions(-) delete mode 100755 scripts/first_time_setup.sh diff --git a/README.md b/README.md index 00f6199..0c1882f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # python_template -A template repo for python projects +A template repo for python projects that is set up using [pixi](https://pixi.sh). This has basic setup for @@ -25,7 +25,14 @@ This has basic setup for [![Pixi Badge](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/prefix-dev/pixi/main/assets/badge/v0.json)](https://pixi.sh) -To set up your project run the vscode task "pull updates from template repo" and then task "rename project template name" +# Install -### Pixi Badge -The Pixi badge indicates that this project is optimized for performance and follows best practices as evaluated by the Pixi tool. For more information, visit [Pixi](https://pixi.sh). \ No newline at end of file +There are three methods of using this project. + +1. Use github to use this project as a template +2. Clone the project and run, scripts/update_from_template.sh and then scripts/rename_project.sh to rename the project. +3. In your existing git project run this command: + +``` + +``` \ No newline at end of file diff --git a/pixi.lock b/pixi.lock index 2b278c1..671eca4 100644 --- a/pixi.lock +++ b/pixi.lock @@ -12,18 +12,28 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-22_linux64_openblas.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-hca663fb_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.27-pthreads_h413a1c8_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-hc0a3c3a_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.0-h543edf9_3_cpython.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.45.3-h2c6b66d_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 @@ -40,28 +50,37 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-22_linux64_openblas.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-hca663fb_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.27-pthreads_h413a1c8_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-hc0a3c3a_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.0-h543edf9_3_cpython.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.45.3-h2c6b66d_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e0/7d/7f8df0fdbbbefc4362d3eca6b69b7a8a4249a8a88dabc00a207d31fddcd7/black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/25/6d/eb15a1b155f755f43766cc473618c6e1de6555d6a1764965643f486dcf01/black-24.4.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/3f/4f/fcad903698f02ac0d7501432449db12e15fbe5ecfbc01e363eb752c65cbd/coverage-7.5.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl @@ -76,9 +95,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl - pypi: . packages: - kind: conda @@ -150,8 +167,8 @@ packages: - kind: pypi name: black version: 24.4.2 - url: https://files.pythonhosted.org/packages/e0/7d/7f8df0fdbbbefc4362d3eca6b69b7a8a4249a8a88dabc00a207d31fddcd7/black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: eaea3008c281f1038edb473c1aa8ed8143a5535ff18f978a318f10302b254063 + url: https://files.pythonhosted.org/packages/25/6d/eb15a1b155f755f43766cc473618c6e1de6555d6a1764965643f486dcf01/black-24.4.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: be8bef99eb46d5021bf053114442914baeb3649a89dc5f3a555c88737e5e98fc requires_dist: - click>=8.0.0 - mypy-extensions>=0.4.3 @@ -205,8 +222,8 @@ packages: - kind: pypi name: coverage version: 7.5.1 - url: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 5fd215c0c7d7aab005221608a3c2b46f58c0285a819565887ee0b718c052aa4e + url: https://files.pythonhosted.org/packages/3f/4f/fcad903698f02ac0d7501432449db12e15fbe5ecfbc01e363eb752c65cbd/coverage-7.5.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 8748731ad392d736cc9ccac03c9845b13bb07d020a33423fa5b3a36521ac6e4e requires_dist: - tomli ; python_full_version <= '3.11.0a6' and extra == 'toml' requires_python: '>=3.8' @@ -219,14 +236,6 @@ packages: - objgraph>=1.7.2 ; extra == 'graph' - gprof2dot>=2022.7.29 ; extra == 'profile' requires_python: '>=3.8' -- kind: pypi - name: exceptiongroup - version: 1.2.1 - url: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl - sha256: 5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad - requires_dist: - - pytest>=6 ; extra == 'test' - requires_python: '>=3.7' - kind: pypi name: hypothesis version: 6.102.6 @@ -300,6 +309,62 @@ packages: license: GPL-3.0-only size: 707934 timestamp: 1716583433869 +- kind: conda + name: libblas + version: 3.9.0 + build: 22_linux64_openblas + build_number: 22 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-22_linux64_openblas.conda + sha256: 082b8ac20d43a7bbcdc28b3b1cd40e4df3a8b5daf0a2d23d68953a44d2d12c1b + md5: 1a2a0cd3153464fee6646f3dd6dad9b8 + depends: + - libopenblas >=0.3.27,<0.3.28.0a0 + - libopenblas >=0.3.27,<1.0a0 + constrains: + - libcblas 3.9.0 22_linux64_openblas + - blas * openblas + - liblapacke 3.9.0 22_linux64_openblas + - liblapack 3.9.0 22_linux64_openblas + license: BSD-3-Clause + license_family: BSD + size: 14537 + timestamp: 1712542250081 +- kind: conda + name: libcblas + version: 3.9.0 + build: 22_linux64_openblas + build_number: 22 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda + sha256: da1b2faa017663c8f5555c1c5518e96ac4cd8e0be2a673c1c9e2cb8507c8fe46 + md5: 4b31699e0ec5de64d5896e580389c9a1 + depends: + - libblas 3.9.0 22_linux64_openblas + constrains: + - liblapack 3.9.0 22_linux64_openblas + - blas * openblas + - liblapacke 3.9.0 22_linux64_openblas + license: BSD-3-Clause + license_family: BSD + size: 14438 + timestamp: 1712542270166 +- kind: conda + name: libexpat + version: 2.6.2 + build: h59595ed_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda + sha256: 331bb7c7c05025343ebd79f86ae612b9e1e74d2687b8f3179faec234f986ce19 + md5: e7ba12deb7020dd080c6c70e7b6f6a3d + depends: + - libgcc-ng >=12 + constrains: + - expat 2.6.2.* + license: MIT + license_family: MIT + size: 73730 + timestamp: 1710362120304 - kind: conda name: libffi version: 3.4.2 @@ -333,6 +398,38 @@ packages: license_family: GPL size: 775806 timestamp: 1715016057793 +- kind: conda + name: libgfortran-ng + version: 13.2.0 + build: h69a702a_7 + build_number: 7 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_7.conda + sha256: a588e69f96b8e0983a8cdfdbf1dc75eb48189f5420ec71150c8d8cdc0a811a9b + md5: 1b84f26d9f4f6026e179e7805d5a15cd + depends: + - libgfortran5 13.2.0 hca663fb_7 + license: GPL-3.0-only WITH GCC-exception-3.1 + license_family: GPL + size: 24314 + timestamp: 1715016272844 +- kind: conda + name: libgfortran5 + version: 13.2.0 + build: hca663fb_7 + build_number: 7 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-hca663fb_7.conda + sha256: 754ab038115edce550fdccdc9ddf7dead2fa8346b8cdd4428c59ae1e83293978 + md5: c0bd771f09a326fdcd95a60b617795bf + depends: + - libgcc-ng >=13.2.0 + constrains: + - libgfortran-ng 13.2.0 + license: GPL-3.0-only WITH GCC-exception-3.1 + license_family: GPL + size: 1441361 + timestamp: 1715016068766 - kind: conda name: libgomp version: 13.2.0 @@ -348,6 +445,25 @@ packages: license_family: GPL size: 422336 timestamp: 1715015995979 +- kind: conda + name: liblapack + version: 3.9.0 + build: 22_linux64_openblas + build_number: 22 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda + sha256: db246341d42f9100d45adeb1a7ba8b1ef5b51ceb9056fd643e98046a3259fde6 + md5: b083767b6c877e24ee597d93b87ab838 + depends: + - libblas 3.9.0 22_linux64_openblas + constrains: + - libcblas 3.9.0 22_linux64_openblas + - blas * openblas + - liblapacke 3.9.0 22_linux64_openblas + license: BSD-3-Clause + license_family: BSD + size: 14471 + timestamp: 1712542277696 - kind: conda name: libnsl version: 2.0.1 @@ -362,6 +478,24 @@ packages: license_family: GPL size: 33408 timestamp: 1697359010159 +- kind: conda + name: libopenblas + version: 0.3.27 + build: pthreads_h413a1c8_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.27-pthreads_h413a1c8_0.conda + sha256: 2ae7559aed0705deb3f716c7b247c74fd1b5e35b64e39834ce8b95f7564d4a3e + md5: a356024784da6dfd4683dc5ecf45b155 + depends: + - libgcc-ng >=12 + - libgfortran-ng + - libgfortran5 >=12.3.0 + constrains: + - openblas >=0.3.27,<0.3.28.0a0 + license: BSD-3-Clause + license_family: BSD + size: 5598747 + timestamp: 1712364444346 - kind: conda name: libsqlite version: 3.45.3 @@ -376,6 +510,19 @@ packages: license: Unlicense size: 859858 timestamp: 1713367435849 +- kind: conda + name: libstdcxx-ng + version: 13.2.0 + build: hc0a3c3a_7 + build_number: 7 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-hc0a3c3a_7.conda + sha256: 35f1e08be0a84810c9075f5bd008495ac94e6c5fe306dfe4b34546f11fed850f + md5: 53ebd4c833fa01cb2c6353e99f905406 + license: GPL-3.0-only WITH GCC-exception-3.1 + license_family: GPL + size: 3837704 + timestamp: 1715016117360 - kind: conda name: libuuid version: 2.38.1 @@ -390,6 +537,20 @@ packages: license_family: BSD size: 33601 timestamp: 1680112270483 +- kind: conda + name: libxcrypt + version: 4.4.36 + build: hd590300_1 + build_number: 1 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda + sha256: 6ae68e0b86423ef188196fff6207ed0c8195dd84273cb5623b85aa08033a410c + md5: 5aa797f8787fe7a17d1b0821485b5adc + depends: + - libgcc-ng >=12 + license: LGPL-2.1-or-later + size: 100393 + timestamp: 1702724383534 - kind: conda name: libzlib version: 1.2.13 @@ -432,6 +593,30 @@ packages: license: X11 AND BSD-3-Clause size: 887465 timestamp: 1715194722503 +- kind: conda + name: numpy + version: 1.26.4 + build: py312heda63a1_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda + sha256: fe3459c75cf84dcef6ef14efcc4adb0ade66038ddd27cadb894f34f4797687d8 + md5: d8285bea2a350f63fab23bf460221f3f + depends: + - libblas >=3.9.0,<4.0a0 + - libcblas >=3.9.0,<4.0a0 + - libgcc-ng >=12 + - liblapack >=3.9.0,<4.0a0 + - libstdcxx-ng >=12 + - python >=3.12,<3.13.0a0 + - python_abi 3.12.* *_cp312 + constrains: + - numpy-base <0a0 + license: BSD-3-Clause + license_family: BSD + purls: + - pkg:pypi/numpy + size: 7484186 + timestamp: 1707225809722 - kind: conda name: openssl version: 3.3.0 @@ -547,33 +732,34 @@ packages: requires_python: '>=3.8' - kind: conda name: python - version: 3.10.0 - build: h543edf9_3_cpython - build_number: 3 + version: 3.12.3 + build: hab00c5b_0_cpython subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.0-h543edf9_3_cpython.tar.bz2 - sha256: 0661f43d7bc446c22bfcf1730ad5c7a2ac695c696ba4609bac896cefff879431 - md5: 67cdff58413ce9f034fb971188060313 + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda + sha256: f9865bcbff69f15fd89a33a2da12ad616e98d65ce7c83c644b92e66e5016b227 + md5: 2540b74d304f71d3e89c81209db4db84 depends: - bzip2 >=1.0.8,<2.0a0 - ld_impl_linux-64 >=2.36.1 - - libffi >=3.4.2,<3.5.0a0 - - libgcc-ng >=9.4.0 - - libnsl >=2.0.0,<2.1.0a0 - - libuuid >=2.32.1,<3.0a0 - - libzlib >=1.2.11,<1.3.0a0 - - ncurses >=6.2,<7.0.0a0 - - openssl >=3.0.0,<4.0a0 - - readline >=8.1,<9.0a0 - - sqlite >=3.36.0,<4.0a0 - - tk >=8.6.11,<8.7.0a0 + - libexpat >=2.6.2,<3.0a0 + - libffi >=3.4,<4.0a0 + - libgcc-ng >=12 + - libnsl >=2.0.1,<2.1.0a0 + - libsqlite >=3.45.2,<4.0a0 + - libuuid >=2.38.1,<3.0a0 + - libxcrypt >=4.4.36 + - libzlib >=1.2.13,<1.3.0a0 + - ncurses >=6.4.20240210,<7.0a0 + - openssl >=3.2.1,<4.0a0 + - readline >=8.2,<9.0a0 + - tk >=8.6.13,<8.7.0a0 - tzdata - - xz >=5.2.5,<6.0.0a0 + - xz >=5.2.6,<6.0a0 constrains: - - python_abi 3.10.* *_cp310 + - python_abi 3.12.* *_cp312 license: Python-2.0 - size: 31281695 - timestamp: 1637376125446 + size: 31991381 + timestamp: 1713208036041 - kind: pypi name: python-template version: 0.2.0 @@ -589,6 +775,21 @@ packages: - coverage>=7.2.7,<=7.5.1 ; extra == 'test' requires_python: '>=3.10' editable: true +- kind: conda + name: python_abi + version: '3.12' + build: 4_cp312 + build_number: 4 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda + sha256: 182a329de10a4165f6e8a3804caf751f918f6ea6176dd4e5abcdae1ed3095bf6 + md5: dccc2d142812964fcc6abdc97b672dff + constrains: + - python 3.12.* *_cpython + license: BSD-3-Clause + license_family: BSD + size: 6385 + timestamp: 1695147396604 - kind: conda name: readline version: '8.2' @@ -616,23 +817,6 @@ packages: version: 2.4.0 url: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl sha256: a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0 -- kind: conda - name: sqlite - version: 3.45.3 - build: h2c6b66d_0 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.45.3-h2c6b66d_0.conda - sha256: 945ac702e2bd8cc59cc780dfc37c18255d5e538c8433dc290c0edbad2bcbaeb4 - md5: be7d70f2db41b674733667bdd69bd000 - depends: - - libgcc-ng >=12 - - libsqlite 3.45.3 h2797004_0 - - libzlib >=1.2.13,<1.3.0a0 - - ncurses >=6.4.20240210,<7.0a0 - - readline >=8.2,<9.0a0 - license: Unlicense - size: 848611 - timestamp: 1713367461306 - kind: conda name: tk version: 8.6.13 @@ -649,24 +833,12 @@ packages: license_family: BSD size: 3318875 timestamp: 1699202167581 -- kind: pypi - name: tomli - version: 2.0.1 - url: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl - sha256: 939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc - requires_python: '>=3.7' - kind: pypi name: tomlkit version: 0.12.5 url: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl sha256: af914f5a9c59ed9d0762c7b64d3b5d5df007448eb9cd2edc8a46b1eafead172f requires_python: '>=3.7' -- kind: pypi - name: typing-extensions - version: 4.12.0 - url: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl - sha256: b349c66bea9016ac22978d800cfff206d5f9816951f12a7d0ec5578b0a819594 - requires_python: '>=3.8' - kind: conda name: tzdata version: 2024a diff --git a/pyproject.toml b/pyproject.toml index d2f5fcc..2bb8198 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,6 +13,7 @@ channels = ["conda-forge"] platforms = ["linux-64"] [tool.pixi.dependencies] +numpy = ">=1.26.4,<1.27" [tool.pixi.pypi-dependencies] python_template = { path = ".", editable = true } diff --git a/scripts/first_time_setup.sh b/scripts/first_time_setup.sh deleted file mode 100755 index e74b0b4..0000000 --- a/scripts/first_time_setup.sh +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/bash -set -e -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #gets the current directory - -#move to the project root folder -cd "$SCRIPT_DIR"/.. -git submodule update --init --recursive -CONTAINER_NAME=${PWD##*/} - -git config --global pull.rebase false -git remote add template https://github.com/blooop/repo_b.git -git fetch --all -git checkout main && git pull origin main -git merge template/main --allow-unrelated-histories -m 'feat: pull changes from remote template' - -$SCRIPT_DIR/rename_project.sh $CONTAINER_NAME -git commit -a -m 'rename project to $CONTAINER_NAME' - -git merge template/main --strategy-option ours --allow-unrelated-histories -m 'feat: pull changes from remote template' -git remote remove template - -git push \ No newline at end of file From 3e43a9e142ab898a90cd1166fb35ddd1014d7a4b Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 14:57:23 +0100 Subject: [PATCH 034/109] remove numpy --- pixi.lock | 181 +------------------------------------------------ pyproject.toml | 3 - 2 files changed, 1 insertion(+), 183 deletions(-) diff --git a/pixi.lock b/pixi.lock index 671eca4..69c9d98 100644 --- a/pixi.lock +++ b/pixi.lock @@ -12,27 +12,18 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-22_linux64_openblas.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-hca663fb_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.27-pthreads_h413a1c8_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-hc0a3c3a_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda @@ -50,27 +41,18 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-22_linux64_openblas.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-hca663fb_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.27-pthreads_h413a1c8_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-hc0a3c3a_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda @@ -309,46 +291,6 @@ packages: license: GPL-3.0-only size: 707934 timestamp: 1716583433869 -- kind: conda - name: libblas - version: 3.9.0 - build: 22_linux64_openblas - build_number: 22 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-22_linux64_openblas.conda - sha256: 082b8ac20d43a7bbcdc28b3b1cd40e4df3a8b5daf0a2d23d68953a44d2d12c1b - md5: 1a2a0cd3153464fee6646f3dd6dad9b8 - depends: - - libopenblas >=0.3.27,<0.3.28.0a0 - - libopenblas >=0.3.27,<1.0a0 - constrains: - - libcblas 3.9.0 22_linux64_openblas - - blas * openblas - - liblapacke 3.9.0 22_linux64_openblas - - liblapack 3.9.0 22_linux64_openblas - license: BSD-3-Clause - license_family: BSD - size: 14537 - timestamp: 1712542250081 -- kind: conda - name: libcblas - version: 3.9.0 - build: 22_linux64_openblas - build_number: 22 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda - sha256: da1b2faa017663c8f5555c1c5518e96ac4cd8e0be2a673c1c9e2cb8507c8fe46 - md5: 4b31699e0ec5de64d5896e580389c9a1 - depends: - - libblas 3.9.0 22_linux64_openblas - constrains: - - liblapack 3.9.0 22_linux64_openblas - - blas * openblas - - liblapacke 3.9.0 22_linux64_openblas - license: BSD-3-Clause - license_family: BSD - size: 14438 - timestamp: 1712542270166 - kind: conda name: libexpat version: 2.6.2 @@ -398,38 +340,6 @@ packages: license_family: GPL size: 775806 timestamp: 1715016057793 -- kind: conda - name: libgfortran-ng - version: 13.2.0 - build: h69a702a_7 - build_number: 7 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_7.conda - sha256: a588e69f96b8e0983a8cdfdbf1dc75eb48189f5420ec71150c8d8cdc0a811a9b - md5: 1b84f26d9f4f6026e179e7805d5a15cd - depends: - - libgfortran5 13.2.0 hca663fb_7 - license: GPL-3.0-only WITH GCC-exception-3.1 - license_family: GPL - size: 24314 - timestamp: 1715016272844 -- kind: conda - name: libgfortran5 - version: 13.2.0 - build: hca663fb_7 - build_number: 7 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-hca663fb_7.conda - sha256: 754ab038115edce550fdccdc9ddf7dead2fa8346b8cdd4428c59ae1e83293978 - md5: c0bd771f09a326fdcd95a60b617795bf - depends: - - libgcc-ng >=13.2.0 - constrains: - - libgfortran-ng 13.2.0 - license: GPL-3.0-only WITH GCC-exception-3.1 - license_family: GPL - size: 1441361 - timestamp: 1715016068766 - kind: conda name: libgomp version: 13.2.0 @@ -445,25 +355,6 @@ packages: license_family: GPL size: 422336 timestamp: 1715015995979 -- kind: conda - name: liblapack - version: 3.9.0 - build: 22_linux64_openblas - build_number: 22 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda - sha256: db246341d42f9100d45adeb1a7ba8b1ef5b51ceb9056fd643e98046a3259fde6 - md5: b083767b6c877e24ee597d93b87ab838 - depends: - - libblas 3.9.0 22_linux64_openblas - constrains: - - libcblas 3.9.0 22_linux64_openblas - - blas * openblas - - liblapacke 3.9.0 22_linux64_openblas - license: BSD-3-Clause - license_family: BSD - size: 14471 - timestamp: 1712542277696 - kind: conda name: libnsl version: 2.0.1 @@ -478,24 +369,6 @@ packages: license_family: GPL size: 33408 timestamp: 1697359010159 -- kind: conda - name: libopenblas - version: 0.3.27 - build: pthreads_h413a1c8_0 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.27-pthreads_h413a1c8_0.conda - sha256: 2ae7559aed0705deb3f716c7b247c74fd1b5e35b64e39834ce8b95f7564d4a3e - md5: a356024784da6dfd4683dc5ecf45b155 - depends: - - libgcc-ng >=12 - - libgfortran-ng - - libgfortran5 >=12.3.0 - constrains: - - openblas >=0.3.27,<0.3.28.0a0 - license: BSD-3-Clause - license_family: BSD - size: 5598747 - timestamp: 1712364444346 - kind: conda name: libsqlite version: 3.45.3 @@ -510,19 +383,6 @@ packages: license: Unlicense size: 859858 timestamp: 1713367435849 -- kind: conda - name: libstdcxx-ng - version: 13.2.0 - build: hc0a3c3a_7 - build_number: 7 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-hc0a3c3a_7.conda - sha256: 35f1e08be0a84810c9075f5bd008495ac94e6c5fe306dfe4b34546f11fed850f - md5: 53ebd4c833fa01cb2c6353e99f905406 - license: GPL-3.0-only WITH GCC-exception-3.1 - license_family: GPL - size: 3837704 - timestamp: 1715016117360 - kind: conda name: libuuid version: 2.38.1 @@ -593,30 +453,6 @@ packages: license: X11 AND BSD-3-Clause size: 887465 timestamp: 1715194722503 -- kind: conda - name: numpy - version: 1.26.4 - build: py312heda63a1_0 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda - sha256: fe3459c75cf84dcef6ef14efcc4adb0ade66038ddd27cadb894f34f4797687d8 - md5: d8285bea2a350f63fab23bf460221f3f - depends: - - libblas >=3.9.0,<4.0a0 - - libcblas >=3.9.0,<4.0a0 - - libgcc-ng >=12 - - liblapack >=3.9.0,<4.0a0 - - libstdcxx-ng >=12 - - python >=3.12,<3.13.0a0 - - python_abi 3.12.* *_cp312 - constrains: - - numpy-base <0a0 - license: BSD-3-Clause - license_family: BSD - purls: - - pkg:pypi/numpy - size: 7484186 - timestamp: 1707225809722 - kind: conda name: openssl version: 3.3.0 @@ -764,7 +600,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 23f5c8f977b44c096aefc4cc84ee13ff36b8ebcad49ddc4dbc57972cf71a177a + sha256: d726392a9d64984fc4652213632da02a48d0f3aa33dd2d84ffac9c4bac56313b requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' @@ -775,21 +611,6 @@ packages: - coverage>=7.2.7,<=7.5.1 ; extra == 'test' requires_python: '>=3.10' editable: true -- kind: conda - name: python_abi - version: '3.12' - build: 4_cp312 - build_number: 4 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda - sha256: 182a329de10a4165f6e8a3804caf751f918f6ea6176dd4e5abcdae1ed3095bf6 - md5: dccc2d142812964fcc6abdc97b672dff - constrains: - - python 3.12.* *_cpython - license: BSD-3-Clause - license_family: BSD - size: 6385 - timestamp: 1695147396604 - kind: conda name: readline version: '8.2' diff --git a/pyproject.toml b/pyproject.toml index 2bb8198..8e15d5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,9 +12,6 @@ dependencies = [] channels = ["conda-forge"] platforms = ["linux-64"] -[tool.pixi.dependencies] -numpy = ">=1.26.4,<1.27" - [tool.pixi.pypi-dependencies] python_template = { path = ".", editable = true } From e8f8b946d219792c26aed747cb6a12e30f3c531e Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 15:26:57 +0100 Subject: [PATCH 035/109] update pixi.lock --- scripts/update_from_template.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/update_from_template.sh b/scripts/update_from_template.sh index 437c551..85f4d63 100755 --- a/scripts/update_from_template.sh +++ b/scripts/update_from_template.sh @@ -6,5 +6,6 @@ git fetch --all git checkout main && git pull origin main git checkout -B feature/update_from_template; git pull git merge template/main --allow-unrelated-histories -m 'feat: pull changes from remote template' +git checkout --ours pixi.lock; git add pixi.lock git remote remove template git push --set-upstream origin feature/update_from_template \ No newline at end of file From 2efb5d44b26de59d2b73159d3ef441d0bff093b7 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 15:27:57 +0100 Subject: [PATCH 036/109] update pixi.lock --- pixi.lock | 181 ++++++++++++++++++++++++++++++++++++++++++++++++- pyproject.toml | 3 + 2 files changed, 183 insertions(+), 1 deletion(-) diff --git a/pixi.lock b/pixi.lock index 69c9d98..1e59502 100644 --- a/pixi.lock +++ b/pixi.lock @@ -12,18 +12,27 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-22_linux64_openblas.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-hca663fb_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.27-pthreads_h413a1c8_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-hc0a3c3a_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda @@ -41,18 +50,27 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-22_linux64_openblas.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-hca663fb_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.27-pthreads_h413a1c8_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-hc0a3c3a_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda @@ -291,6 +309,46 @@ packages: license: GPL-3.0-only size: 707934 timestamp: 1716583433869 +- kind: conda + name: libblas + version: 3.9.0 + build: 22_linux64_openblas + build_number: 22 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-22_linux64_openblas.conda + sha256: 082b8ac20d43a7bbcdc28b3b1cd40e4df3a8b5daf0a2d23d68953a44d2d12c1b + md5: 1a2a0cd3153464fee6646f3dd6dad9b8 + depends: + - libopenblas >=0.3.27,<0.3.28.0a0 + - libopenblas >=0.3.27,<1.0a0 + constrains: + - libcblas 3.9.0 22_linux64_openblas + - blas * openblas + - liblapacke 3.9.0 22_linux64_openblas + - liblapack 3.9.0 22_linux64_openblas + license: BSD-3-Clause + license_family: BSD + size: 14537 + timestamp: 1712542250081 +- kind: conda + name: libcblas + version: 3.9.0 + build: 22_linux64_openblas + build_number: 22 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda + sha256: da1b2faa017663c8f5555c1c5518e96ac4cd8e0be2a673c1c9e2cb8507c8fe46 + md5: 4b31699e0ec5de64d5896e580389c9a1 + depends: + - libblas 3.9.0 22_linux64_openblas + constrains: + - liblapack 3.9.0 22_linux64_openblas + - blas * openblas + - liblapacke 3.9.0 22_linux64_openblas + license: BSD-3-Clause + license_family: BSD + size: 14438 + timestamp: 1712542270166 - kind: conda name: libexpat version: 2.6.2 @@ -340,6 +398,38 @@ packages: license_family: GPL size: 775806 timestamp: 1715016057793 +- kind: conda + name: libgfortran-ng + version: 13.2.0 + build: h69a702a_7 + build_number: 7 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_7.conda + sha256: a588e69f96b8e0983a8cdfdbf1dc75eb48189f5420ec71150c8d8cdc0a811a9b + md5: 1b84f26d9f4f6026e179e7805d5a15cd + depends: + - libgfortran5 13.2.0 hca663fb_7 + license: GPL-3.0-only WITH GCC-exception-3.1 + license_family: GPL + size: 24314 + timestamp: 1715016272844 +- kind: conda + name: libgfortran5 + version: 13.2.0 + build: hca663fb_7 + build_number: 7 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-hca663fb_7.conda + sha256: 754ab038115edce550fdccdc9ddf7dead2fa8346b8cdd4428c59ae1e83293978 + md5: c0bd771f09a326fdcd95a60b617795bf + depends: + - libgcc-ng >=13.2.0 + constrains: + - libgfortran-ng 13.2.0 + license: GPL-3.0-only WITH GCC-exception-3.1 + license_family: GPL + size: 1441361 + timestamp: 1715016068766 - kind: conda name: libgomp version: 13.2.0 @@ -355,6 +445,25 @@ packages: license_family: GPL size: 422336 timestamp: 1715015995979 +- kind: conda + name: liblapack + version: 3.9.0 + build: 22_linux64_openblas + build_number: 22 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda + sha256: db246341d42f9100d45adeb1a7ba8b1ef5b51ceb9056fd643e98046a3259fde6 + md5: b083767b6c877e24ee597d93b87ab838 + depends: + - libblas 3.9.0 22_linux64_openblas + constrains: + - libcblas 3.9.0 22_linux64_openblas + - blas * openblas + - liblapacke 3.9.0 22_linux64_openblas + license: BSD-3-Clause + license_family: BSD + size: 14471 + timestamp: 1712542277696 - kind: conda name: libnsl version: 2.0.1 @@ -369,6 +478,24 @@ packages: license_family: GPL size: 33408 timestamp: 1697359010159 +- kind: conda + name: libopenblas + version: 0.3.27 + build: pthreads_h413a1c8_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.27-pthreads_h413a1c8_0.conda + sha256: 2ae7559aed0705deb3f716c7b247c74fd1b5e35b64e39834ce8b95f7564d4a3e + md5: a356024784da6dfd4683dc5ecf45b155 + depends: + - libgcc-ng >=12 + - libgfortran-ng + - libgfortran5 >=12.3.0 + constrains: + - openblas >=0.3.27,<0.3.28.0a0 + license: BSD-3-Clause + license_family: BSD + size: 5598747 + timestamp: 1712364444346 - kind: conda name: libsqlite version: 3.45.3 @@ -383,6 +510,19 @@ packages: license: Unlicense size: 859858 timestamp: 1713367435849 +- kind: conda + name: libstdcxx-ng + version: 13.2.0 + build: hc0a3c3a_7 + build_number: 7 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-hc0a3c3a_7.conda + sha256: 35f1e08be0a84810c9075f5bd008495ac94e6c5fe306dfe4b34546f11fed850f + md5: 53ebd4c833fa01cb2c6353e99f905406 + license: GPL-3.0-only WITH GCC-exception-3.1 + license_family: GPL + size: 3837704 + timestamp: 1715016117360 - kind: conda name: libuuid version: 2.38.1 @@ -453,6 +593,30 @@ packages: license: X11 AND BSD-3-Clause size: 887465 timestamp: 1715194722503 +- kind: conda + name: numpy + version: 1.26.4 + build: py312heda63a1_0 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda + sha256: fe3459c75cf84dcef6ef14efcc4adb0ade66038ddd27cadb894f34f4797687d8 + md5: d8285bea2a350f63fab23bf460221f3f + depends: + - libblas >=3.9.0,<4.0a0 + - libcblas >=3.9.0,<4.0a0 + - libgcc-ng >=12 + - liblapack >=3.9.0,<4.0a0 + - libstdcxx-ng >=12 + - python >=3.12,<3.13.0a0 + - python_abi 3.12.* *_cp312 + constrains: + - numpy-base <0a0 + license: BSD-3-Clause + license_family: BSD + purls: + - pkg:pypi/numpy + size: 7484186 + timestamp: 1707225809722 - kind: conda name: openssl version: 3.3.0 @@ -600,7 +764,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: d726392a9d64984fc4652213632da02a48d0f3aa33dd2d84ffac9c4bac56313b + sha256: c521d4df0d58314cca2222b17d58925c6d47bd57d8ed7e1aaa67563531601d6f requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' @@ -611,6 +775,21 @@ packages: - coverage>=7.2.7,<=7.5.1 ; extra == 'test' requires_python: '>=3.10' editable: true +- kind: conda + name: python_abi + version: '3.12' + build: 4_cp312 + build_number: 4 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda + sha256: 182a329de10a4165f6e8a3804caf751f918f6ea6176dd4e5abcdae1ed3095bf6 + md5: dccc2d142812964fcc6abdc97b672dff + constrains: + - python 3.12.* *_cpython + license: BSD-3-Clause + license_family: BSD + size: 6385 + timestamp: 1695147396604 - kind: conda name: readline version: '8.2' diff --git a/pyproject.toml b/pyproject.toml index 8e15d5d..0571df4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,6 +56,9 @@ ci-no-cover = { depends_on = ["style", "test"] } ci = { depends_on = ["style", "coverage", "coverage-report"] } update-lock-push = "pixi install; git commit -a -m'update pixi.lock';git push" +[tool.pixi.dependencies] +numpy = ">=1.26.4,<1.27" + [tool.setuptools.packages.find] include= ["python_template"] From de821c43ea82c242bcc78e4a2309ec9979b20d75 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 15:30:11 +0100 Subject: [PATCH 037/109] update pixi.lock --- pixi.lock | 181 +------------------------------------------------ pyproject.toml | 3 - 2 files changed, 1 insertion(+), 183 deletions(-) diff --git a/pixi.lock b/pixi.lock index 1e59502..69c9d98 100644 --- a/pixi.lock +++ b/pixi.lock @@ -12,27 +12,18 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-22_linux64_openblas.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-hca663fb_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.27-pthreads_h413a1c8_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-hc0a3c3a_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda @@ -50,27 +41,18 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-22_linux64_openblas.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-hca663fb_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.27-pthreads_h413a1c8_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-hc0a3c3a_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda @@ -309,46 +291,6 @@ packages: license: GPL-3.0-only size: 707934 timestamp: 1716583433869 -- kind: conda - name: libblas - version: 3.9.0 - build: 22_linux64_openblas - build_number: 22 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-22_linux64_openblas.conda - sha256: 082b8ac20d43a7bbcdc28b3b1cd40e4df3a8b5daf0a2d23d68953a44d2d12c1b - md5: 1a2a0cd3153464fee6646f3dd6dad9b8 - depends: - - libopenblas >=0.3.27,<0.3.28.0a0 - - libopenblas >=0.3.27,<1.0a0 - constrains: - - libcblas 3.9.0 22_linux64_openblas - - blas * openblas - - liblapacke 3.9.0 22_linux64_openblas - - liblapack 3.9.0 22_linux64_openblas - license: BSD-3-Clause - license_family: BSD - size: 14537 - timestamp: 1712542250081 -- kind: conda - name: libcblas - version: 3.9.0 - build: 22_linux64_openblas - build_number: 22 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-22_linux64_openblas.conda - sha256: da1b2faa017663c8f5555c1c5518e96ac4cd8e0be2a673c1c9e2cb8507c8fe46 - md5: 4b31699e0ec5de64d5896e580389c9a1 - depends: - - libblas 3.9.0 22_linux64_openblas - constrains: - - liblapack 3.9.0 22_linux64_openblas - - blas * openblas - - liblapacke 3.9.0 22_linux64_openblas - license: BSD-3-Clause - license_family: BSD - size: 14438 - timestamp: 1712542270166 - kind: conda name: libexpat version: 2.6.2 @@ -398,38 +340,6 @@ packages: license_family: GPL size: 775806 timestamp: 1715016057793 -- kind: conda - name: libgfortran-ng - version: 13.2.0 - build: h69a702a_7 - build_number: 7 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_7.conda - sha256: a588e69f96b8e0983a8cdfdbf1dc75eb48189f5420ec71150c8d8cdc0a811a9b - md5: 1b84f26d9f4f6026e179e7805d5a15cd - depends: - - libgfortran5 13.2.0 hca663fb_7 - license: GPL-3.0-only WITH GCC-exception-3.1 - license_family: GPL - size: 24314 - timestamp: 1715016272844 -- kind: conda - name: libgfortran5 - version: 13.2.0 - build: hca663fb_7 - build_number: 7 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-hca663fb_7.conda - sha256: 754ab038115edce550fdccdc9ddf7dead2fa8346b8cdd4428c59ae1e83293978 - md5: c0bd771f09a326fdcd95a60b617795bf - depends: - - libgcc-ng >=13.2.0 - constrains: - - libgfortran-ng 13.2.0 - license: GPL-3.0-only WITH GCC-exception-3.1 - license_family: GPL - size: 1441361 - timestamp: 1715016068766 - kind: conda name: libgomp version: 13.2.0 @@ -445,25 +355,6 @@ packages: license_family: GPL size: 422336 timestamp: 1715015995979 -- kind: conda - name: liblapack - version: 3.9.0 - build: 22_linux64_openblas - build_number: 22 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-22_linux64_openblas.conda - sha256: db246341d42f9100d45adeb1a7ba8b1ef5b51ceb9056fd643e98046a3259fde6 - md5: b083767b6c877e24ee597d93b87ab838 - depends: - - libblas 3.9.0 22_linux64_openblas - constrains: - - libcblas 3.9.0 22_linux64_openblas - - blas * openblas - - liblapacke 3.9.0 22_linux64_openblas - license: BSD-3-Clause - license_family: BSD - size: 14471 - timestamp: 1712542277696 - kind: conda name: libnsl version: 2.0.1 @@ -478,24 +369,6 @@ packages: license_family: GPL size: 33408 timestamp: 1697359010159 -- kind: conda - name: libopenblas - version: 0.3.27 - build: pthreads_h413a1c8_0 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.27-pthreads_h413a1c8_0.conda - sha256: 2ae7559aed0705deb3f716c7b247c74fd1b5e35b64e39834ce8b95f7564d4a3e - md5: a356024784da6dfd4683dc5ecf45b155 - depends: - - libgcc-ng >=12 - - libgfortran-ng - - libgfortran5 >=12.3.0 - constrains: - - openblas >=0.3.27,<0.3.28.0a0 - license: BSD-3-Clause - license_family: BSD - size: 5598747 - timestamp: 1712364444346 - kind: conda name: libsqlite version: 3.45.3 @@ -510,19 +383,6 @@ packages: license: Unlicense size: 859858 timestamp: 1713367435849 -- kind: conda - name: libstdcxx-ng - version: 13.2.0 - build: hc0a3c3a_7 - build_number: 7 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-hc0a3c3a_7.conda - sha256: 35f1e08be0a84810c9075f5bd008495ac94e6c5fe306dfe4b34546f11fed850f - md5: 53ebd4c833fa01cb2c6353e99f905406 - license: GPL-3.0-only WITH GCC-exception-3.1 - license_family: GPL - size: 3837704 - timestamp: 1715016117360 - kind: conda name: libuuid version: 2.38.1 @@ -593,30 +453,6 @@ packages: license: X11 AND BSD-3-Clause size: 887465 timestamp: 1715194722503 -- kind: conda - name: numpy - version: 1.26.4 - build: py312heda63a1_0 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda - sha256: fe3459c75cf84dcef6ef14efcc4adb0ade66038ddd27cadb894f34f4797687d8 - md5: d8285bea2a350f63fab23bf460221f3f - depends: - - libblas >=3.9.0,<4.0a0 - - libcblas >=3.9.0,<4.0a0 - - libgcc-ng >=12 - - liblapack >=3.9.0,<4.0a0 - - libstdcxx-ng >=12 - - python >=3.12,<3.13.0a0 - - python_abi 3.12.* *_cp312 - constrains: - - numpy-base <0a0 - license: BSD-3-Clause - license_family: BSD - purls: - - pkg:pypi/numpy - size: 7484186 - timestamp: 1707225809722 - kind: conda name: openssl version: 3.3.0 @@ -764,7 +600,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: c521d4df0d58314cca2222b17d58925c6d47bd57d8ed7e1aaa67563531601d6f + sha256: d726392a9d64984fc4652213632da02a48d0f3aa33dd2d84ffac9c4bac56313b requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' @@ -775,21 +611,6 @@ packages: - coverage>=7.2.7,<=7.5.1 ; extra == 'test' requires_python: '>=3.10' editable: true -- kind: conda - name: python_abi - version: '3.12' - build: 4_cp312 - build_number: 4 - subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-4_cp312.conda - sha256: 182a329de10a4165f6e8a3804caf751f918f6ea6176dd4e5abcdae1ed3095bf6 - md5: dccc2d142812964fcc6abdc97b672dff - constrains: - - python 3.12.* *_cpython - license: BSD-3-Clause - license_family: BSD - size: 6385 - timestamp: 1695147396604 - kind: conda name: readline version: '8.2' diff --git a/pyproject.toml b/pyproject.toml index 0571df4..8e15d5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,9 +56,6 @@ ci-no-cover = { depends_on = ["style", "test"] } ci = { depends_on = ["style", "coverage", "coverage-report"] } update-lock-push = "pixi install; git commit -a -m'update pixi.lock';git push" -[tool.pixi.dependencies] -numpy = ">=1.26.4,<1.27" - [tool.setuptools.packages.find] include= ["python_template"] From 78c7cf3e3161b2c6dae13893dab3d46a549ff399 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 16:30:46 +0100 Subject: [PATCH 038/109] test multiple python versions --- .github/workflows/ci.yml | 7 ++++++- pixi.lock | 2 +- pyproject.toml | 10 ++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8dd08b1..de5dc7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,9 @@ permissions: jobs: ci: runs-on: ubuntu-latest + strategy: + matrix: + environment: [py310, py311] steps: - name: Checkout uses: actions/checkout@v4 @@ -19,9 +22,11 @@ jobs: with: pixi-version: v0.22.0 cache: true + environments: ${{ matrix.environment }} - name: CI run: | - pixi run ci + pixi run -e py310 ci + pixi run -e py311 ci - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4 env: diff --git a/pixi.lock b/pixi.lock index 69c9d98..4a6c18e 100644 --- a/pixi.lock +++ b/pixi.lock @@ -600,7 +600,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: d726392a9d64984fc4652213632da02a48d0f3aa33dd2d84ffac9c4bac56313b + sha256: a0d4d94767d8c41109a743e2cb7bde8c99b1e14f603503199c469484cddb1cfb requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index 8e15d5d..ce7f104 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,6 +12,15 @@ dependencies = [] channels = ["conda-forge"] platforms = ["linux-64"] +[tool.pixi.dependencies] +python = ">=3.10" + +[tool.pixi.feature.py310.dependencies] +python = "3.10.*" +[tool.pixi.feature.py311.dependencies] +python = "3.11.*" + + [tool.pixi.pypi-dependencies] python_template = { path = ".", editable = true } @@ -42,6 +51,7 @@ test = { features = ["test"], solve-group = "default" } [tool.pixi.tasks] pr = "pixi install; git commit -a -m'update pixi.lock';git push" + [tool.pixi.feature.test.tasks] format = "black ." check-clean-workspace = "git diff --exit-code" From 6ed2241683cdf44497d31dc004ad721d858b465b Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 16:31:39 +0100 Subject: [PATCH 039/109] update pixi.lock --- pixi.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.lock b/pixi.lock index 4a6c18e..d4d1cde 100644 --- a/pixi.lock +++ b/pixi.lock @@ -600,7 +600,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: a0d4d94767d8c41109a743e2cb7bde8c99b1e14f603503199c469484cddb1cfb + sha256: f71d3b2786e97430aa3c536905340d71bff4354726ff5ad6d5d6f5e5c1efec3b requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' From 82faddbae42514de4f12b2d53c70ac58be950694 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 16:40:50 +0100 Subject: [PATCH 040/109] update pixi.lock --- pixi.lock | 239 ++++++++++++++++++++++++++++++++++++++++++++++++- pyproject.toml | 7 +- 2 files changed, 243 insertions(+), 3 deletions(-) diff --git a/pixi.lock b/pixi.lock index d4d1cde..29601f4 100644 --- a/pixi.lock +++ b/pixi.lock @@ -29,6 +29,108 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 - pypi: . + py310: + channels: + - url: https://conda.anaconda.org/conda-forge/ + indexes: + - https://pypi.org/simple + packages: + linux-64: + - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.14-hd12c33a_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 + - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e0/7d/7f8df0fdbbbefc4362d3eca6b69b7a8a4249a8a88dabc00a207d31fddcd7/black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl + - pypi: . + py311: + channels: + - url: https://conda.anaconda.org/conda-forge/ + indexes: + - https://pypi.org/simple + packages: + linux-64: + - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.11.9-hb806964_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 + - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/c5/48/34176b522e8cff4620a5d96c2e323ff2413f574870eb25efa8025885e028/black-24.4.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/bd/e2/9da6c61f71f769e63122ac9f029dcafe5fe50e1e4043f8dd950daf58290f/coverage-7.5.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl + - pypi: . test: channels: - url: https://conda.anaconda.org/conda-forge/ @@ -166,6 +268,46 @@ packages: - tokenize-rt>=3.2.0 ; extra == 'jupyter' - uvloop>=0.15.2 ; extra == 'uvloop' requires_python: '>=3.8' +- kind: pypi + name: black + version: 24.4.2 + url: https://files.pythonhosted.org/packages/e0/7d/7f8df0fdbbbefc4362d3eca6b69b7a8a4249a8a88dabc00a207d31fddcd7/black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: eaea3008c281f1038edb473c1aa8ed8143a5535ff18f978a318f10302b254063 + requires_dist: + - click>=8.0.0 + - mypy-extensions>=0.4.3 + - packaging>=22.0 + - pathspec>=0.9.0 + - platformdirs>=2 + - tomli>=1.1.0 ; python_version < '3.11' + - typing-extensions>=4.0.1 ; python_version < '3.11' + - colorama>=0.4.3 ; extra == 'colorama' + - aiohttp!=3.9.0,>=3.7.4 ; (sys_platform == 'win32' and implementation_name == 'pypy') and extra == 'd' + - aiohttp>=3.7.4 ; (sys_platform != 'win32' or implementation_name != 'pypy') and extra == 'd' + - ipython>=7.8.0 ; extra == 'jupyter' + - tokenize-rt>=3.2.0 ; extra == 'jupyter' + - uvloop>=0.15.2 ; extra == 'uvloop' + requires_python: '>=3.8' +- kind: pypi + name: black + version: 24.4.2 + url: https://files.pythonhosted.org/packages/c5/48/34176b522e8cff4620a5d96c2e323ff2413f574870eb25efa8025885e028/black-24.4.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: e151054aa00bad1f4e1f04919542885f89f5f7d086b8a59e5000e6c616896ffb + requires_dist: + - click>=8.0.0 + - mypy-extensions>=0.4.3 + - packaging>=22.0 + - pathspec>=0.9.0 + - platformdirs>=2 + - tomli>=1.1.0 ; python_version < '3.11' + - typing-extensions>=4.0.1 ; python_version < '3.11' + - colorama>=0.4.3 ; extra == 'colorama' + - aiohttp!=3.9.0,>=3.7.4 ; (sys_platform == 'win32' and implementation_name == 'pypy') and extra == 'd' + - aiohttp>=3.7.4 ; (sys_platform != 'win32' or implementation_name != 'pypy') and extra == 'd' + - ipython>=7.8.0 ; extra == 'jupyter' + - tokenize-rt>=3.2.0 ; extra == 'jupyter' + - uvloop>=0.15.2 ; extra == 'uvloop' + requires_python: '>=3.8' - kind: conda name: bzip2 version: 1.0.8 @@ -209,6 +351,22 @@ packages: requires_dist: - tomli ; python_full_version <= '3.11.0a6' and extra == 'toml' requires_python: '>=3.8' +- kind: pypi + name: coverage + version: 7.5.1 + url: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 5fd215c0c7d7aab005221608a3c2b46f58c0285a819565887ee0b718c052aa4e + requires_dist: + - tomli ; python_full_version <= '3.11.0a6' and extra == 'toml' + requires_python: '>=3.8' +- kind: pypi + name: coverage + version: 7.5.1 + url: https://files.pythonhosted.org/packages/bd/e2/9da6c61f71f769e63122ac9f029dcafe5fe50e1e4043f8dd950daf58290f/coverage-7.5.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 556cf1a7cbc8028cb60e1ff0be806be2eded2daf8129b8811c63e2b9a6c43bca + requires_dist: + - tomli ; python_full_version <= '3.11.0a6' and extra == 'toml' + requires_python: '>=3.8' - kind: pypi name: dill version: 0.3.8 @@ -218,6 +376,14 @@ packages: - objgraph>=1.7.2 ; extra == 'graph' - gprof2dot>=2022.7.29 ; extra == 'profile' requires_python: '>=3.8' +- kind: pypi + name: exceptiongroup + version: 1.2.1 + url: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl + sha256: 5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad + requires_dist: + - pytest>=6 ; extra == 'test' + requires_python: '>=3.7' - kind: pypi name: hypothesis version: 6.102.6 @@ -566,6 +732,65 @@ packages: - pytest-xdist ; extra == 'testing' - virtualenv ; extra == 'testing' requires_python: '>=3.8' +- kind: conda + name: python + version: 3.10.14 + build: hd12c33a_0_cpython + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.14-hd12c33a_0_cpython.conda + sha256: 76a5d12e73542678b70a94570f7b0f7763f9a938f77f0e75d9ea615ef22aa84c + md5: 2b4ba962994e8bd4be9ff5b64b75aff2 + depends: + - bzip2 >=1.0.8,<2.0a0 + - ld_impl_linux-64 >=2.36.1 + - libffi >=3.4,<4.0a0 + - libgcc-ng >=12 + - libnsl >=2.0.1,<2.1.0a0 + - libsqlite >=3.45.2,<4.0a0 + - libuuid >=2.38.1,<3.0a0 + - libxcrypt >=4.4.36 + - libzlib >=1.2.13,<1.3.0a0 + - ncurses >=6.4.20240210,<7.0a0 + - openssl >=3.2.1,<4.0a0 + - readline >=8.2,<9.0a0 + - tk >=8.6.13,<8.7.0a0 + - tzdata + - xz >=5.2.6,<6.0a0 + constrains: + - python_abi 3.10.* *_cp310 + license: Python-2.0 + size: 25517742 + timestamp: 1710939725109 +- kind: conda + name: python + version: 3.11.9 + build: hb806964_0_cpython + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.11.9-hb806964_0_cpython.conda + sha256: 177f33a1fb8d3476b38f73c37b42f01c0b014fa0e039a701fd9f83d83aae6d40 + md5: ac68acfa8b558ed406c75e98d3428d7b + depends: + - bzip2 >=1.0.8,<2.0a0 + - ld_impl_linux-64 >=2.36.1 + - libexpat >=2.6.2,<3.0a0 + - libffi >=3.4,<4.0a0 + - libgcc-ng >=12 + - libnsl >=2.0.1,<2.1.0a0 + - libsqlite >=3.45.3,<4.0a0 + - libuuid >=2.38.1,<3.0a0 + - libxcrypt >=4.4.36 + - libzlib >=1.2.13,<1.3.0a0 + - ncurses >=6.4.20240210,<7.0a0 + - openssl >=3.2.1,<4.0a0 + - readline >=8.2,<9.0a0 + - tk >=8.6.13,<8.7.0a0 + - tzdata + - xz >=5.2.6,<6.0a0 + constrains: + - python_abi 3.11.* *_cp311 + license: Python-2.0 + size: 30884494 + timestamp: 1713553104915 - kind: conda name: python version: 3.12.3 @@ -600,7 +825,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: f71d3b2786e97430aa3c536905340d71bff4354726ff5ad6d5d6f5e5c1efec3b + sha256: fd1d2764eab47f5c7bfd5e43e0789221571e5c76f5393a7cf43c426b79805425 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' @@ -654,12 +879,24 @@ packages: license_family: BSD size: 3318875 timestamp: 1699202167581 +- kind: pypi + name: tomli + version: 2.0.1 + url: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl + sha256: 939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc + requires_python: '>=3.7' - kind: pypi name: tomlkit version: 0.12.5 url: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl sha256: af914f5a9c59ed9d0762c7b64d3b5d5df007448eb9cd2edc8a46b1eafead172f requires_python: '>=3.7' +- kind: pypi + name: typing-extensions + version: 4.12.0 + url: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl + sha256: b349c66bea9016ac22978d800cfff206d5f9816951f12a7d0ec5578b0a819594 + requires_python: '>=3.8' - kind: conda name: tzdata version: 2024a diff --git a/pyproject.toml b/pyproject.toml index ce7f104..1d494c7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,8 +45,11 @@ build-backend = "setuptools.build_meta" # Environments [tool.pixi.environments] -default = { solve-group = "default" } -test = { features = ["test"], solve-group = "default" } +default = {features = ["test"], solve-group = "default" } +# test = { , solve-group = "default" } +py310 = ["py310","test"] +py311 = ["py311","test"] + [tool.pixi.tasks] pr = "pixi install; git commit -a -m'update pixi.lock';git push" From 47064629fc4334d11c444695c198a80f2bac829f Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 16:40:55 +0100 Subject: [PATCH 041/109] update pixi.lock --- pixi.lock | 57 ++++++++++++++----------------------------------------- 1 file changed, 14 insertions(+), 43 deletions(-) diff --git a/pixi.lock b/pixi.lock index 29601f4..214daf8 100644 --- a/pixi.lock +++ b/pixi.lock @@ -28,41 +28,12 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 - - pypi: . - py310: - channels: - - url: https://conda.anaconda.org/conda-forge/ - indexes: - - https://pypi.org/simple - packages: - linux-64: - - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.14-hd12c33a_0_cpython.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e0/7d/7f8df0fdbbbefc4362d3eca6b69b7a8a4249a8a88dabc00a207d31fddcd7/black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/25/6d/eb15a1b155f755f43766cc473618c6e1de6555d6a1764965643f486dcf01/black-24.4.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/3f/4f/fcad903698f02ac0d7501432449db12e15fbe5ecfbc01e363eb752c65cbd/coverage-7.5.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl @@ -77,11 +48,9 @@ environments: - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl - pypi: . - py311: + py310: channels: - url: https://conda.anaconda.org/conda-forge/ indexes: @@ -93,7 +62,6 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda @@ -104,17 +72,18 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.11.9-hb806964_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.14-hd12c33a_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/c5/48/34176b522e8cff4620a5d96c2e323ff2413f574870eb25efa8025885e028/black-24.4.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/e0/7d/7f8df0fdbbbefc4362d3eca6b69b7a8a4249a8a88dabc00a207d31fddcd7/black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/bd/e2/9da6c61f71f769e63122ac9f029dcafe5fe50e1e4043f8dd950daf58290f/coverage-7.5.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl @@ -129,9 +98,11 @@ environments: - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl - pypi: . - test: + py311: channels: - url: https://conda.anaconda.org/conda-forge/ indexes: @@ -154,16 +125,16 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.11.9-hb806964_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/25/6d/eb15a1b155f755f43766cc473618c6e1de6555d6a1764965643f486dcf01/black-24.4.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/c5/48/34176b522e8cff4620a5d96c2e323ff2413f574870eb25efa8025885e028/black-24.4.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/3f/4f/fcad903698f02ac0d7501432449db12e15fbe5ecfbc01e363eb752c65cbd/coverage-7.5.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/bd/e2/9da6c61f71f769e63122ac9f029dcafe5fe50e1e4043f8dd950daf58290f/coverage-7.5.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl @@ -825,7 +796,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: fd1d2764eab47f5c7bfd5e43e0789221571e5c76f5393a7cf43c426b79805425 + sha256: 64be61c8dc5bca2a87c111779c0a8b3fe9d9a12a923090761f17d80ab1a400a5 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' From ed5b8a7e5a72ed8700ccb7fc86782a08be5c59da Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 16:43:43 +0100 Subject: [PATCH 042/109] remove basic test env and replace with py310 and py311 --- pixi.lock | 2 +- pyproject.toml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pixi.lock b/pixi.lock index 214daf8..11c1e34 100644 --- a/pixi.lock +++ b/pixi.lock @@ -796,7 +796,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 64be61c8dc5bca2a87c111779c0a8b3fe9d9a12a923090761f17d80ab1a400a5 + sha256: 53494427e42bb76984916ac938bbc15e8427c71f3cb2911e2e9e9d364ac45269 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index 1d494c7..eadb8bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,6 @@ build-backend = "setuptools.build_meta" # Environments [tool.pixi.environments] default = {features = ["test"], solve-group = "default" } -# test = { , solve-group = "default" } py310 = ["py310","test"] py311 = ["py311","test"] From 889cd8f48d74296c23329975adbff7b5c808234e Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 17:01:47 +0100 Subject: [PATCH 043/109] update ci --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de5dc7c..477e1e7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,8 +25,7 @@ jobs: environments: ${{ matrix.environment }} - name: CI run: | - pixi run -e py310 ci - pixi run -e py311 ci + pixi run -e ${{ matrix.environment }} ci - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4 env: From 443db1824f72a2665697527ef81b12d54cb2db1c Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 17:05:04 +0100 Subject: [PATCH 044/109] add python3.11 badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0c1882f..b84997b 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ This has basic setup for [![GitHub release](https://img.shields.io/github/release/blooop/python_template.svg)](https://GitHub.com/blooop/python_template/releases/) [![License](https://img.shields.io/pypi/l/bencher)](https://opensource.org/license/mit/) [![Python](https://img.shields.io/badge/python-3.10-blue)](https://www.python.org/downloads/release/python-310/) +[![Python](https://img.shields.io/badge/python-3.11-blue)](https://www.python.org/downloads/release/python-311/) [![Pixi Badge](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/prefix-dev/pixi/main/assets/badge/v0.json)](https://pixi.sh) From aa4ee28340277897fe39b0b0a3df6c366180c37e Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 17:09:59 +0100 Subject: [PATCH 045/109] fix spacing --- pyproject.toml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index eadb8bb..bfb24d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,6 @@ python = "3.10.*" [tool.pixi.feature.py311.dependencies] python = "3.11.*" - [tool.pixi.pypi-dependencies] python_template = { path = ".", editable = true } @@ -49,11 +48,9 @@ default = {features = ["test"], solve-group = "default" } py310 = ["py310","test"] py311 = ["py311","test"] - [tool.pixi.tasks] pr = "pixi install; git commit -a -m'update pixi.lock';git push" - [tool.pixi.feature.test.tasks] format = "black ." check-clean-workspace = "git diff --exit-code" @@ -84,10 +81,7 @@ enable = "no-else-return,consider-using-in" line-length = 100 [tool.ruff] - - -# Same as Black. -line-length = 100 +line-length = 100 # Same as Black. target-version = "py310" From 7da4f654cfdd212fdd43a336ca6f5dc43f9dd811 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 17:13:08 +0100 Subject: [PATCH 046/109] fix python badge --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index b84997b..5fd842f 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,7 @@ This has basic setup for [![GitHub pull-requests merged](https://badgen.net/github/merged-prs/blooop/python_template)](https://github.com/blooop/python_template/pulls?q=is%3Amerged) [![GitHub release](https://img.shields.io/github/release/blooop/python_template.svg)](https://GitHub.com/blooop/python_template/releases/) [![License](https://img.shields.io/pypi/l/bencher)](https://opensource.org/license/mit/) -[![Python](https://img.shields.io/badge/python-3.10-blue)](https://www.python.org/downloads/release/python-310/) -[![Python](https://img.shields.io/badge/python-3.11-blue)](https://www.python.org/downloads/release/python-311/) +[![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11-blue)](https://www.python.org/downloads/) [![Pixi Badge](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/prefix-dev/pixi/main/assets/badge/v0.json)](https://pixi.sh) From e4926feab8b5695a29dcec67ab21b3a6b1cc5cb0 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 17:44:12 +0100 Subject: [PATCH 047/109] update pylint message --- pixi.lock | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pixi.lock b/pixi.lock index 11c1e34..0f2a4cf 100644 --- a/pixi.lock +++ b/pixi.lock @@ -796,7 +796,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 53494427e42bb76984916ac938bbc15e8427c71f3cb2911e2e9e9d364ac45269 + sha256: 35e6075a0d246f3ab57f39dfb3080f2df02aad6c2760f7309d625f37db62ea4f requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index bfb24d1..1b819e8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,7 +55,7 @@ pr = "pixi install; git commit -a -m'update pixi.lock';git push" format = "black ." check-clean-workspace = "git diff --exit-code" ruff-lint = "ruff check . --fix" -pylint = "echo 'running pylint...'; pylint --version && pylint $(git ls-files '*.py')" +pylint = "pylint --version ; echo 'running pylint...'; pylint $(git ls-files '*.py')" lint = { depends_on = ["ruff-lint","check-clean-workspace", "pylint"] } style = { depends_on = ["format","lint"]} test = "pytest" From b254ac825ff50bea7e94fd76623465c997e9d1d4 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 17:55:22 +0100 Subject: [PATCH 048/109] update pixi.lock --- pixi.lock | 2 +- pyproject.toml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pixi.lock b/pixi.lock index 0f2a4cf..682c905 100644 --- a/pixi.lock +++ b/pixi.lock @@ -796,7 +796,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 35e6075a0d246f3ab57f39dfb3080f2df02aad6c2760f7309d625f37db62ea4f + sha256: bec4f87d29472ce10a8e974ed395fec802284fd234b7b08b34cc4502ea3550d1 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index 1b819e8..3c3148b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,9 +49,6 @@ py310 = ["py310","test"] py311 = ["py311","test"] [tool.pixi.tasks] -pr = "pixi install; git commit -a -m'update pixi.lock';git push" - -[tool.pixi.feature.test.tasks] format = "black ." check-clean-workspace = "git diff --exit-code" ruff-lint = "ruff check . --fix" @@ -64,6 +61,7 @@ coverage-report = "coverage report -m" ci-no-cover = { depends_on = ["style", "test"] } ci = { depends_on = ["style", "coverage", "coverage-report"] } update-lock-push = "pixi install; git commit -a -m'update pixi.lock';git push" +clear-pixi = "rm -rf .pixi pixi.lock" [tool.setuptools.packages.find] From 393bc89f333780772143f2efd7de58c7e57c75b4 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 26 May 2024 18:01:29 +0100 Subject: [PATCH 049/109] add pixi to the vscode extensions --- .vscode/extensions.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 75ab85e..fcdb527 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -11,6 +11,7 @@ "tamasfe.even-better-toml", "Codium.codium", "ms-azuretools.vscode-docker", - "ryanluker.vscode-coverage-gutters" + "ryanluker.vscode-coverage-gutters", + "jjjermiah.pixi-vscode", ] } \ No newline at end of file From 9102e11b9f0060c5964de299b00c245009c0e38f Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Tue, 28 May 2024 10:02:02 +0100 Subject: [PATCH 050/109] update to pixi 23.0 --- .github/workflows/ci.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 477e1e7..d57a443 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v4 - uses: prefix-dev/setup-pixi@v0.8.0 with: - pixi-version: v0.22.0 + pixi-version: v0.23.0 cache: true environments: ${{ matrix.environment }} - name: CI diff --git a/pyproject.toml b/pyproject.toml index 3c3148b..12bcd5b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ coverage = "coverage run -m pytest; coverage xml -o coverage.xml" coverage-report = "coverage report -m" ci-no-cover = { depends_on = ["style", "test"] } ci = { depends_on = ["style", "coverage", "coverage-report"] } -update-lock-push = "pixi install; git commit -a -m'update pixi.lock';git push" +update-lock-push = "pixi update; git commit -a -m'update pixi.lock';git push" clear-pixi = "rm -rf .pixi pixi.lock" From c8f70d01a45bd5ea7e14c6ba89dfc38df174f333 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Tue, 28 May 2024 11:13:55 +0100 Subject: [PATCH 051/109] update pixi.lock --- .github/workflows/ci.yml | 1 + pixi.lock | 48 ++++++++++++++++++++++++++++++---------- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d57a443..2d30557 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,7 @@ jobs: with: pixi-version: v0.23.0 cache: true + frozen: true environments: ${{ matrix.environment }} - name: CI run: | diff --git a/pixi.lock b/pixi.lock index 682c905..b768f84 100644 --- a/pixi.lock +++ b/pixi.lock @@ -20,7 +20,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h4ab18f5_6.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda @@ -69,7 +69,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h4ab18f5_6.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.14-hd12c33a_0_cpython.conda @@ -122,7 +122,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h4ab18f5_6.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.11.9-hb806964_0_cpython.conda @@ -162,6 +162,7 @@ packages: sha256: fe51de6107f9edc7aa4f786a70f4a883943bc9d39b3bb7307c04c41410990726 md5: d7c89558ba9fa0495403155b64376d81 license: None + purls: [] size: 2562 timestamp: 1578324546067 - kind: conda @@ -180,6 +181,7 @@ packages: - openmp_impl 9999 license: BSD-3-Clause license_family: BSD + purls: [] size: 23621 timestamp: 1650670423406 - kind: pypi @@ -292,6 +294,7 @@ packages: - libgcc-ng >=12 license: bzip2-1.0.6 license_family: BSD + purls: [] size: 254228 timestamp: 1699279927352 - kind: conda @@ -303,6 +306,7 @@ packages: sha256: 91d81bfecdbb142c15066df70cc952590ae8991670198f92c66b62019b251aeb md5: 2f4327a1cbe7f022401b236e915a5fef license: ISC + purls: [] size: 155432 timestamp: 1706843687645 - kind: pypi @@ -426,6 +430,8 @@ packages: constrains: - binutils_impl_linux-64 2.40 license: GPL-3.0-only + license_family: GPL + purls: [] size: 707934 timestamp: 1716583433869 - kind: conda @@ -442,6 +448,7 @@ packages: - expat 2.6.2.* license: MIT license_family: MIT + purls: [] size: 73730 timestamp: 1710362120304 - kind: conda @@ -457,6 +464,7 @@ packages: - libgcc-ng >=9.4.0 license: MIT license_family: MIT + purls: [] size: 58292 timestamp: 1636488182923 - kind: conda @@ -475,6 +483,7 @@ packages: - libgomp 13.2.0 h77fa898_7 license: GPL-3.0-only WITH GCC-exception-3.1 license_family: GPL + purls: [] size: 775806 timestamp: 1715016057793 - kind: conda @@ -490,6 +499,7 @@ packages: - _libgcc_mutex 0.1 conda_forge license: GPL-3.0-only WITH GCC-exception-3.1 license_family: GPL + purls: [] size: 422336 timestamp: 1715015995979 - kind: conda @@ -504,6 +514,7 @@ packages: - libgcc-ng >=12 license: LGPL-2.1-only license_family: GPL + purls: [] size: 33408 timestamp: 1697359010159 - kind: conda @@ -518,6 +529,7 @@ packages: - libgcc-ng >=12 - libzlib >=1.2.13,<1.3.0a0 license: Unlicense + purls: [] size: 859858 timestamp: 1713367435849 - kind: conda @@ -532,6 +544,7 @@ packages: - libgcc-ng >=12 license: BSD-3-Clause license_family: BSD + purls: [] size: 33601 timestamp: 1680112270483 - kind: conda @@ -546,25 +559,27 @@ packages: depends: - libgcc-ng >=12 license: LGPL-2.1-or-later + purls: [] size: 100393 timestamp: 1702724383534 - kind: conda name: libzlib version: 1.2.13 - build: hd590300_5 - build_number: 5 + build: h4ab18f5_6 + build_number: 6 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda - sha256: 370c7c5893b737596fd6ca0d9190c9715d89d888b8c88537ae1ef168c25e82e4 - md5: f36c115f1ee199da648e0597ec2047ad + url: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h4ab18f5_6.conda + sha256: 8ced4afed6322172182af503f21725d072a589a6eb918f8a58135c1e00d35980 + md5: 27329162c0dc732bcf67a4e0cd488125 depends: - libgcc-ng >=12 constrains: - - zlib 1.2.13 *_5 + - zlib 1.2.13 *_6 license: Zlib license_family: Other - size: 61588 - timestamp: 1686575217516 + purls: [] + size: 61571 + timestamp: 1716874066944 - kind: pypi name: mccabe version: 0.7.0 @@ -588,6 +603,7 @@ packages: depends: - libgcc-ng >=12 license: X11 AND BSD-3-Clause + purls: [] size: 887465 timestamp: 1715194722503 - kind: conda @@ -606,6 +622,7 @@ packages: - pyopenssl >=22.1 license: Apache-2.0 license_family: Apache + purls: [] size: 2891147 timestamp: 1716468354865 - kind: pypi @@ -730,6 +747,7 @@ packages: constrains: - python_abi 3.10.* *_cp310 license: Python-2.0 + purls: [] size: 25517742 timestamp: 1710939725109 - kind: conda @@ -760,6 +778,7 @@ packages: constrains: - python_abi 3.11.* *_cp311 license: Python-2.0 + purls: [] size: 30884494 timestamp: 1713553104915 - kind: conda @@ -790,13 +809,14 @@ packages: constrains: - python_abi 3.12.* *_cp312 license: Python-2.0 + purls: [] size: 31991381 timestamp: 1713208036041 - kind: pypi name: python-template version: 0.2.0 path: . - sha256: bec4f87d29472ce10a8e974ed395fec802284fd234b7b08b34cc4502ea3550d1 + sha256: 1d4e959a56e9c299bc7aa9a8684506d5e17a8e83db1e18b0ac4ab57647177eec requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' @@ -821,6 +841,7 @@ packages: - ncurses >=6.3,<7.0a0 license: GPL-3.0-only license_family: GPL + purls: [] size: 281456 timestamp: 1679532220005 - kind: pypi @@ -848,6 +869,7 @@ packages: - libzlib >=1.2.13,<1.3.0a0 license: TCL license_family: BSD + purls: [] size: 3318875 timestamp: 1699202167581 - kind: pypi @@ -878,6 +900,7 @@ packages: sha256: 7b2b69c54ec62a243eb6fba2391b5e443421608c3ae5dbff938ad33ca8db5122 md5: 161081fc7cec0bfda0d86d7cb595f8d8 license: LicenseRef-Public-Domain + purls: [] size: 119815 timestamp: 1706886945727 - kind: conda @@ -891,5 +914,6 @@ packages: depends: - libgcc-ng >=12 license: LGPL-2.1 and GPL-2.0 + purls: [] size: 418368 timestamp: 1660346797927 From 73fca2cb9dd25b75a25d7ba37fc7e92322d32c82 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Tue, 28 May 2024 11:29:23 +0100 Subject: [PATCH 052/109] remove requires_python --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 12bcd5b..6556e45 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,6 @@ version = "0.2.0" authors = [{ name = "Austin Gregg-Smith", email = "blooop@gmail.com" }] description = "A python package template" readme = "README.md" -requires-python = ">= 3.10" dependencies = [] From e9cdb3aa598c5a23a142be2b2ab492a0aab8e9cf Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Tue, 28 May 2024 11:30:31 +0100 Subject: [PATCH 053/109] update pixi.lock --- pixi.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pixi.lock b/pixi.lock index b768f84..3476148 100644 --- a/pixi.lock +++ b/pixi.lock @@ -816,7 +816,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 1d4e959a56e9c299bc7aa9a8684506d5e17a8e83db1e18b0ac4ab57647177eec + sha256: e60cba2cd20036a3057953f4a7b28e544e940f393873312fe828742ea27516d1 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' @@ -825,7 +825,6 @@ packages: - hypothesis>=6.82,<=6.102.6 ; extra == 'test' - ruff>=0.0.280,<=0.4.5 ; extra == 'test' - coverage>=7.2.7,<=7.5.1 ; extra == 'test' - requires_python: '>=3.10' editable: true - kind: conda name: readline From eedd99eaa9dd56095fa5f7dff5741165ed97df55 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Tue, 28 May 2024 13:33:57 +0100 Subject: [PATCH 054/109] updte check clean workspace --- pyproject.toml | 4 ++-- python_template/basic_class.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 12bcd5b..6077c6d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,13 +53,13 @@ format = "black ." check-clean-workspace = "git diff --exit-code" ruff-lint = "ruff check . --fix" pylint = "pylint --version ; echo 'running pylint...'; pylint $(git ls-files '*.py')" -lint = { depends_on = ["ruff-lint","check-clean-workspace", "pylint"] } +lint = { depends_on = ["ruff-lint", "pylint"] } style = { depends_on = ["format","lint"]} test = "pytest" coverage = "coverage run -m pytest; coverage xml -o coverage.xml" coverage-report = "coverage report -m" ci-no-cover = { depends_on = ["style", "test"] } -ci = { depends_on = ["style", "coverage", "coverage-report"] } +ci = { depends_on = ["style","check-clean-workspace", "coverage", "coverage-report"] } update-lock-push = "pixi update; git commit -a -m'update pixi.lock';git push" clear-pixi = "rm -rf .pixi pixi.lock" diff --git a/python_template/basic_class.py b/python_template/basic_class.py index e118a8e..01f8522 100644 --- a/python_template/basic_class.py +++ b/python_template/basic_class.py @@ -1,4 +1,5 @@ from dataclasses import dataclass +import os @dataclass From 9abfca40c73f986dc02fd038de3b67458a326cb8 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Tue, 28 May 2024 13:34:31 +0100 Subject: [PATCH 055/109] update pixi.lock --- pixi.lock | 2 +- python_template/basic_class.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pixi.lock b/pixi.lock index b768f84..f38348f 100644 --- a/pixi.lock +++ b/pixi.lock @@ -816,7 +816,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 1d4e959a56e9c299bc7aa9a8684506d5e17a8e83db1e18b0ac4ab57647177eec + sha256: d246333815e93b87fc3934161916fa3d7c4bf5b8518acc487c6bbc86769e9f6e requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' diff --git a/python_template/basic_class.py b/python_template/basic_class.py index 01f8522..e118a8e 100644 --- a/python_template/basic_class.py +++ b/python_template/basic_class.py @@ -1,5 +1,4 @@ from dataclasses import dataclass -import os @dataclass From e29f674449a0a505c9b3a83ff34f7beb077842ba Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Tue, 28 May 2024 13:36:06 +0100 Subject: [PATCH 056/109] update pixi.lock --- pixi.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.lock b/pixi.lock index 4976277..844eaed 100644 --- a/pixi.lock +++ b/pixi.lock @@ -816,7 +816,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: d246333815e93b87fc3934161916fa3d7c4bf5b8518acc487c6bbc86769e9f6e + sha256: aa4641aa03d642bea3734da19a800176296b97e8973616165eb19fdf3d55346c requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' From 1030ff4d812686f5fc32d207e14ae6505c047101 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 29 May 2024 18:50:26 +0100 Subject: [PATCH 057/109] hotfix: remove trailing comma --- .vscode/extensions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index fcdb527..4cf65aa 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -12,6 +12,6 @@ "Codium.codium", "ms-azuretools.vscode-docker", "ryanluker.vscode-coverage-gutters", - "jjjermiah.pixi-vscode", + "jjjermiah.pixi-vscode" ] } \ No newline at end of file From ce4d380983f1c7916515bc41239507152bc75801 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 29 May 2024 19:13:56 +0100 Subject: [PATCH 058/109] update deps.yaml --- deps.yaml => python_template.deps.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) rename deps.yaml => python_template.deps.yaml (54%) diff --git a/deps.yaml b/python_template.deps.yaml similarity index 54% rename from deps.yaml rename to python_template.deps.yaml index 7fe50d6..ef766bc 100644 --- a/deps.yaml +++ b/python_template.deps.yaml @@ -1,3 +1,6 @@ +apt_sources: + - curl + apt_tools: - git - git-lfs @@ -5,10 +8,10 @@ apt_tools: - apt-utils - jq - -pip_tools: +pip_language-toolchain: - flit - pip #updates to latest pip -pip: - - pip \ No newline at end of file + +script_pixi-user: + - scripts/install_pixi.sh \ No newline at end of file From 60f0f82d30450a5879b893461ec5be05b3ad7e71 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 29 May 2024 19:14:06 +0100 Subject: [PATCH 059/109] add install_pixi.sh --- scripts/install_pixi.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 scripts/install_pixi.sh diff --git a/scripts/install_pixi.sh b/scripts/install_pixi.sh new file mode 100755 index 0000000..81117c7 --- /dev/null +++ b/scripts/install_pixi.sh @@ -0,0 +1,4 @@ +#! /bin/bash +set -e +curl -fsSL https://pixi.sh/install.sh | bash +echo 'eval "$(pixi completion --shell bash)"' >> ~/.bashrc \ No newline at end of file From b007c5bfcccc8c040f6c12d2d4087661f297d306 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 29 May 2024 19:29:46 +0100 Subject: [PATCH 060/109] add basic example --- example/example.py | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 example/example.py diff --git a/example/example.py b/example/example.py new file mode 100644 index 0000000..56f6541 --- /dev/null +++ b/example/example.py @@ -0,0 +1,4 @@ +from python_template.basic_class import BasicClass + +bc = BasicClass() +print(bc.int_var) From c263545bca695683b11ff9389e68775319921dc0 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 29 May 2024 19:37:17 +0100 Subject: [PATCH 061/109] remove space --- .github/workflows/publish.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 81e246d..6e745b7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,6 @@ jobs: runs-on: ubuntu-latest permissions: # Don't forget permissions contents: write - steps: - uses: etils-actions/pypi-auto-publish@v1 with: From 9b2a4148bbb980efc2f5251253c6c59ba73b6a07 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 30 May 2024 18:19:51 +0100 Subject: [PATCH 062/109] add: a failing test --- pyproject.toml | 6 +++--- test/test_basic.py | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f99c526..b497709 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,15 +51,15 @@ py311 = ["py311","test"] format = "black ." check-clean-workspace = "git diff --exit-code" ruff-lint = "ruff check . --fix" -pylint = "pylint --version ; echo 'running pylint...'; pylint $(git ls-files '*.py')" +pylint = "pylint --version && echo 'running pylint...' && pylint $(git ls-files '*.py')" lint = { depends_on = ["ruff-lint", "pylint"] } style = { depends_on = ["format","lint"]} test = "pytest" -coverage = "coverage run -m pytest; coverage xml -o coverage.xml" +coverage = "coverage run -m pytest && coverage xml -o coverage.xml" coverage-report = "coverage report -m" ci-no-cover = { depends_on = ["style", "test"] } ci = { depends_on = ["style","check-clean-workspace", "coverage", "coverage-report"] } -update-lock-push = "pixi update; git commit -a -m'update pixi.lock';git push" +update-lock-push = "pixi update && git commit -a -m'update pixi.lock' && git push" clear-pixi = "rm -rf .pixi pixi.lock" diff --git a/test/test_basic.py b/test/test_basic.py index 91fa700..1a2c85b 100644 --- a/test/test_basic.py +++ b/test/test_basic.py @@ -7,3 +7,8 @@ def test_init(self): instance = BasicClass() self.assertEqual(instance.int_var, 0) + + def test_init_fail(self): + instance = BasicClass() + + self.assertEqual(instance.int_var, 1) From 803ede9a48b7d64a306fd16428ab6dfb6db97c5a Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 30 May 2024 18:21:27 +0100 Subject: [PATCH 063/109] update pixi.lock --- pixi.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pixi.lock b/pixi.lock index 844eaed..0bf10b0 100644 --- a/pixi.lock +++ b/pixi.lock @@ -527,7 +527,7 @@ packages: md5: b3316cbe90249da4f8e84cd66e1cc55b depends: - libgcc-ng >=12 - - libzlib >=1.2.13,<1.3.0a0 + - libzlib >=1.2.13,<2.0.0a0 license: Unlicense purls: [] size: 859858 @@ -737,7 +737,7 @@ packages: - libsqlite >=3.45.2,<4.0a0 - libuuid >=2.38.1,<3.0a0 - libxcrypt >=4.4.36 - - libzlib >=1.2.13,<1.3.0a0 + - libzlib >=1.2.13,<2.0.0a0 - ncurses >=6.4.20240210,<7.0a0 - openssl >=3.2.1,<4.0a0 - readline >=8.2,<9.0a0 @@ -768,7 +768,7 @@ packages: - libsqlite >=3.45.3,<4.0a0 - libuuid >=2.38.1,<3.0a0 - libxcrypt >=4.4.36 - - libzlib >=1.2.13,<1.3.0a0 + - libzlib >=1.2.13,<2.0.0a0 - ncurses >=6.4.20240210,<7.0a0 - openssl >=3.2.1,<4.0a0 - readline >=8.2,<9.0a0 @@ -799,7 +799,7 @@ packages: - libsqlite >=3.45.2,<4.0a0 - libuuid >=2.38.1,<3.0a0 - libxcrypt >=4.4.36 - - libzlib >=1.2.13,<1.3.0a0 + - libzlib >=1.2.13,<2.0.0a0 - ncurses >=6.4.20240210,<7.0a0 - openssl >=3.2.1,<4.0a0 - readline >=8.2,<9.0a0 @@ -816,7 +816,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: aa4641aa03d642bea3734da19a800176296b97e8973616165eb19fdf3d55346c + sha256: e42bd67e77092525478c6f0a6b61babcd37cbdaa1cf00fd715732810d683ed7e requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' From f9f0d57bed98603f28bc241b58da036e141c506c Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 30 May 2024 18:25:45 +0100 Subject: [PATCH 064/109] update pixi.lock --- pixi.lock | 2 +- pyproject.toml | 5 ++++- test/test_basic.py | 5 ----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pixi.lock b/pixi.lock index 0bf10b0..336ff71 100644 --- a/pixi.lock +++ b/pixi.lock @@ -816,7 +816,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: e42bd67e77092525478c6f0a6b61babcd37cbdaa1cf00fd715732810d683ed7e + sha256: 15d3fcad668111c1f9bccb95026d960fd6d6a8f4d1da48cd4b964cd5c508a738 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index b497709..c06267b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,9 +57,12 @@ style = { depends_on = ["format","lint"]} test = "pytest" coverage = "coverage run -m pytest && coverage xml -o coverage.xml" coverage-report = "coverage report -m" +update-lock = "pixi update && git commit -a -m'update pixi.lock'" +push = "git push" +update-lock-push = { depends_on = ["update-lock", "push"] } ci-no-cover = { depends_on = ["style", "test"] } ci = { depends_on = ["style","check-clean-workspace", "coverage", "coverage-report"] } -update-lock-push = "pixi update && git commit -a -m'update pixi.lock' && git push" +ci-push = {depends_on=["update-lock","ci","push"]} clear-pixi = "rm -rf .pixi pixi.lock" diff --git a/test/test_basic.py b/test/test_basic.py index 1a2c85b..91fa700 100644 --- a/test/test_basic.py +++ b/test/test_basic.py @@ -7,8 +7,3 @@ def test_init(self): instance = BasicClass() self.assertEqual(instance.int_var, 0) - - def test_init_fail(self): - instance = BasicClass() - - self.assertEqual(instance.int_var, 1) From 6d73fced7436fb23f3a42e27ac30c64ca7f1f677 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 30 May 2024 18:36:25 +0100 Subject: [PATCH 065/109] autoformat code --- pixi.lock | 2 +- pyproject.toml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pixi.lock b/pixi.lock index 336ff71..6850aa5 100644 --- a/pixi.lock +++ b/pixi.lock @@ -816,7 +816,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 15d3fcad668111c1f9bccb95026d960fd6d6a8f4d1da48cd4b964cd5c508a738 + sha256: 6c3ee47434851e6c7b187bb80995ebdf52cbc79fa674cecd602de95f711ee15d requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index c06267b..3728369 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,6 +54,7 @@ ruff-lint = "ruff check . --fix" pylint = "pylint --version && echo 'running pylint...' && pylint $(git ls-files '*.py')" lint = { depends_on = ["ruff-lint", "pylint"] } style = { depends_on = ["format","lint"]} +commit-format = "git commit -a -m'autoformat code'" test = "pytest" coverage = "coverage run -m pytest && coverage xml -o coverage.xml" coverage-report = "coverage report -m" @@ -62,7 +63,7 @@ push = "git push" update-lock-push = { depends_on = ["update-lock", "push"] } ci-no-cover = { depends_on = ["style", "test"] } ci = { depends_on = ["style","check-clean-workspace", "coverage", "coverage-report"] } -ci-push = {depends_on=["update-lock","ci","push"]} +ci-push = {depends_on=["commit-format","update-lock","ci","push"]} clear-pixi = "rm -rf .pixi pixi.lock" From c014462d0ab38dfa260090900ad8277da5bd3fbf Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 30 May 2024 18:39:26 +0100 Subject: [PATCH 066/109] update pixi.lock --- pixi.lock | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pixi.lock b/pixi.lock index 6850aa5..5f26a42 100644 --- a/pixi.lock +++ b/pixi.lock @@ -816,7 +816,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 6c3ee47434851e6c7b187bb80995ebdf52cbc79fa674cecd602de95f711ee15d + sha256: 5f981ccb94c54a9c830d6a28d52be5e20248404d66305328954b94127e802861 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index 3728369..7232889 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,7 @@ push = "git push" update-lock-push = { depends_on = ["update-lock", "push"] } ci-no-cover = { depends_on = ["style", "test"] } ci = { depends_on = ["style","check-clean-workspace", "coverage", "coverage-report"] } -ci-push = {depends_on=["commit-format","update-lock","ci","push"]} +ci-push = {depends_on=["format","ruff-lint","update-lock","ci","push"]} clear-pixi = "rm -rf .pixi pixi.lock" From b25c31eb19586bba3b1e0a558b49e41f77b5ad0f Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 30 May 2024 18:59:44 +0100 Subject: [PATCH 067/109] add failed os import --- pixi.lock | 2 +- pyproject.toml | 2 +- test/test_basic.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pixi.lock b/pixi.lock index 5f26a42..d6f8666 100644 --- a/pixi.lock +++ b/pixi.lock @@ -816,7 +816,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 5f981ccb94c54a9c830d6a28d52be5e20248404d66305328954b94127e802861 + sha256: 80184f8e6c7853fc018105e7be2d6c761906d640923ab756ed710006f4f61f71 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index 7232889..369a85b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ update-lock = "pixi update && git commit -a -m'update pixi.lock'" push = "git push" update-lock-push = { depends_on = ["update-lock", "push"] } ci-no-cover = { depends_on = ["style", "test"] } -ci = { depends_on = ["style","check-clean-workspace", "coverage", "coverage-report"] } +ci = { depends_on = ["format","ruff-lint","check-clean-workspace","pylint", "coverage", "coverage-report"] } ci-push = {depends_on=["format","ruff-lint","update-lock","ci","push"]} clear-pixi = "rm -rf .pixi pixi.lock" diff --git a/test/test_basic.py b/test/test_basic.py index 91fa700..3b18bdf 100644 --- a/test/test_basic.py +++ b/test/test_basic.py @@ -1,5 +1,6 @@ from unittest import TestCase from python_template.basic_class import BasicClass +import os class TestBasicClass(TestCase): From 6ee60881582b8c53748672663fff5e8a7e9ee863 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 30 May 2024 19:00:45 +0100 Subject: [PATCH 068/109] update pixi.lock --- test/test_basic.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test_basic.py b/test/test_basic.py index 3b18bdf..91fa700 100644 --- a/test/test_basic.py +++ b/test/test_basic.py @@ -1,6 +1,5 @@ from unittest import TestCase from python_template.basic_class import BasicClass -import os class TestBasicClass(TestCase): From 7d68a90a7a5ded72fb9ae8732e545cc78cdf4d2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Jun 2024 09:36:47 +0000 Subject: [PATCH 069/109] Bump the dev-dependencies group with 3 updates Updates the requirements on [hypothesis](https://github.com/HypothesisWorks/hypothesis), [ruff](https://github.com/astral-sh/ruff) and [coverage](https://github.com/nedbat/coveragepy) to permit the latest version. Updates `hypothesis` to 6.103.0 - [Release notes](https://github.com/HypothesisWorks/hypothesis/releases) - [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.82.0...hypothesis-python-6.103.0) Updates `ruff` to 0.4.7 - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.0.280...v0.4.7) Updates `coverage` to 7.5.3 - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.2.7...7.5.3) --- updated-dependencies: - dependency-name: hypothesis dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: ruff dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: coverage dependency-type: direct:production dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 369a85b..9d7c801 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,9 +28,9 @@ test = [ "pylint>=2.17.7,<=3.2.2", "pytest-cov>=4.1,<=5.0.0", "pytest>=7.4,<=8.2.1", - "hypothesis>=6.82,<=6.102.6", - "ruff>=0.0.280,<=0.4.5", - "coverage>=7.2.7,<=7.5.1", + "hypothesis>=6.82,<=6.103.0", + "ruff>=0.0.280,<=0.4.7", + "coverage>=7.2.7,<=7.5.3", ] [project.urls] From ab08e64a3edf36af9fdf3a58088a46d1f63b5657 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Jun 2024 10:08:41 +0000 Subject: [PATCH 070/109] Bump prefix-dev/setup-pixi from 0.8.0 to 0.8.1 Bumps [prefix-dev/setup-pixi](https://github.com/prefix-dev/setup-pixi) from 0.8.0 to 0.8.1. - [Release notes](https://github.com/prefix-dev/setup-pixi/releases) - [Commits](https://github.com/prefix-dev/setup-pixi/compare/v0.8.0...v0.8.1) --- updated-dependencies: - dependency-name: prefix-dev/setup-pixi dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d30557..016eaa1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - uses: prefix-dev/setup-pixi@v0.8.0 + - uses: prefix-dev/setup-pixi@v0.8.1 with: pixi-version: v0.23.0 cache: true From 3b52a13aef919d065644f9495eba493006a7e3d8 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 13 Jun 2024 14:24:46 +0100 Subject: [PATCH 071/109] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31039eb..5d9734a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## python_tempate +## python_template ## [0.0.0] From 9e930bc6e914a83a9953d3fa35a6ddd9d7ba37b9 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 13 Jun 2024 20:05:08 +0100 Subject: [PATCH 072/109] add vscode launch task --- pixi.lock | 2 +- pyproject.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pixi.lock b/pixi.lock index d6f8666..3f4764a 100644 --- a/pixi.lock +++ b/pixi.lock @@ -816,7 +816,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 80184f8e6c7853fc018105e7be2d6c761906d640923ab756ed710006f4f61f71 + sha256: 3a7ceb2b048bf678ce5b0a557c5611437b649821713eede4b3ac26112f010ea0 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' diff --git a/pyproject.toml b/pyproject.toml index 369a85b..e6d69a2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,6 +48,7 @@ py310 = ["py310","test"] py311 = ["py311","test"] [tool.pixi.tasks] +code = "scripts/launch_vscode.sh" format = "black ." check-clean-workspace = "git diff --exit-code" ruff-lint = "ruff check . --fix" From 7bee0f40eb748d38bac348fb033ca9e21e67f20d Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 13 Jun 2024 20:52:16 +0100 Subject: [PATCH 073/109] add host dependencies --- pyproject.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index e6d69a2..a8065e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,6 +14,11 @@ platforms = ["linux-64"] [tool.pixi.dependencies] python = ">=3.10" +# [tool.pixi.host-dependencies] +# rocker= ">=0.2.16" +# off-your-rocker = ">=0.1.0" +# deps-rocker = ">=0.2" + [tool.pixi.feature.py310.dependencies] python = "3.10.*" [tool.pixi.feature.py311.dependencies] From 7896158da781870df28361921795e24be55b38a8 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 13 Jun 2024 20:54:14 +0100 Subject: [PATCH 074/109] update pixi.lock --- pixi.lock | 227 +++++++++++++++++++++++++++--------------------------- 1 file changed, 113 insertions(+), 114 deletions(-) diff --git a/pixi.lock b/pixi.lock index 3f4764a..8cac9c6 100644 --- a/pixi.lock +++ b/pixi.lock @@ -10,19 +10,19 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h4ab18f5_6.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4ab18f5_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda @@ -32,21 +32,21 @@ environments: - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/25/6d/eb15a1b155f755f43766cc473618c6e1de6555d6a1764965643f486dcf01/black-24.4.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/3f/4f/fcad903698f02ac0d7501432449db12e15fbe5ecfbc01e363eb752c65cbd/coverage-7.5.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/0e/39/c44111cfc5e40fc1681a41b96911fba6560b51172b59c204b08b75d58495/coverage-7.5.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - pypi: . @@ -60,18 +60,18 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h4ab18f5_6.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4ab18f5_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.14-hd12c33a_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda @@ -81,26 +81,26 @@ environments: - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/7d/7f8df0fdbbbefc4362d3eca6b69b7a8a4249a8a88dabc00a207d31fddcd7/black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/10/77/9d65122b73f2cfa14744286adc3c1f88bdef49ffd628076429ae59e8fa21/coverage-7.5.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl - pypi: . py311: channels: @@ -112,19 +112,19 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h4ab18f5_6.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4ab18f5_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.11.9-hb806964_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda @@ -134,21 +134,21 @@ environments: - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c5/48/34176b522e8cff4620a5d96c2e323ff2413f574870eb25efa8025885e028/black-24.4.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/bd/e2/9da6c61f71f769e63122ac9f029dcafe5fe50e1e4043f8dd950daf58290f/coverage-7.5.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/9c/38/d8d6616b3c5da0b6d6ab99a0141f8ba80e979596b360196240c96a67ac11/coverage-7.5.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - pypi: . @@ -299,16 +299,16 @@ packages: timestamp: 1699279927352 - kind: conda name: ca-certificates - version: 2024.2.2 + version: 2024.6.2 build: hbcca054_0 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - sha256: 91d81bfecdbb142c15066df70cc952590ae8991670198f92c66b62019b251aeb - md5: 2f4327a1cbe7f022401b236e915a5fef + url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda + sha256: 979af0932b2a5a26112044891a2d79e402e5ae8166f50fa48b8ebae47c0a2d65 + md5: 847c3c2905cc467cea52c24f9cfa8080 license: ISC purls: [] - size: 155432 - timestamp: 1706843687645 + size: 156035 + timestamp: 1717311767102 - kind: pypi name: click version: 8.1.7 @@ -320,25 +320,25 @@ packages: requires_python: '>=3.7' - kind: pypi name: coverage - version: 7.5.1 - url: https://files.pythonhosted.org/packages/3f/4f/fcad903698f02ac0d7501432449db12e15fbe5ecfbc01e363eb752c65cbd/coverage-7.5.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 8748731ad392d736cc9ccac03c9845b13bb07d020a33423fa5b3a36521ac6e4e + version: 7.5.3 + url: https://files.pythonhosted.org/packages/0e/39/c44111cfc5e40fc1681a41b96911fba6560b51172b59c204b08b75d58495/coverage-7.5.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: b1196e13c45e327d6cd0b6e471530a1882f1017eb83c6229fc613cd1a11b53cd requires_dist: - tomli ; python_full_version <= '3.11.0a6' and extra == 'toml' requires_python: '>=3.8' - kind: pypi name: coverage - version: 7.5.1 - url: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 5fd215c0c7d7aab005221608a3c2b46f58c0285a819565887ee0b718c052aa4e + version: 7.5.3 + url: https://files.pythonhosted.org/packages/10/77/9d65122b73f2cfa14744286adc3c1f88bdef49ffd628076429ae59e8fa21/coverage-7.5.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: d8b7339180d00de83e930358223c617cc343dd08e1aa5ec7b06c3a121aec4e1d requires_dist: - tomli ; python_full_version <= '3.11.0a6' and extra == 'toml' requires_python: '>=3.8' - kind: pypi name: coverage - version: 7.5.1 - url: https://files.pythonhosted.org/packages/bd/e2/9da6c61f71f769e63122ac9f029dcafe5fe50e1e4043f8dd950daf58290f/coverage-7.5.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 556cf1a7cbc8028cb60e1ff0be806be2eded2daf8129b8811c63e2b9a6c43bca + version: 7.5.3 + url: https://files.pythonhosted.org/packages/9c/38/d8d6616b3c5da0b6d6ab99a0141f8ba80e979596b360196240c96a67ac11/coverage-7.5.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 341dd8f61c26337c37988345ca5c8ccabeff33093a26953a1ac72e7d0103c4fb requires_dist: - tomli ; python_full_version <= '3.11.0a6' and extra == 'toml' requires_python: '>=3.8' @@ -361,9 +361,9 @@ packages: requires_python: '>=3.7' - kind: pypi name: hypothesis - version: 6.102.6 - url: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl - sha256: ef281ba8b2626ebade9f463fbe8851ae6ff6ae4a8621a9e54c7c2477a97ccff0 + version: 6.103.0 + url: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl + sha256: 0d21a87e2d68b4937f19f1e6e681d747de65f748c9caa818308a0e3899ea8481 requires_dist: - attrs>=22.2.0 - sortedcontainers<3.0.0,>=2.1.0 @@ -421,19 +421,19 @@ packages: - kind: conda name: ld_impl_linux-64 version: '2.40' - build: hf3520f5_1 - build_number: 1 + build: hf3520f5_3 + build_number: 3 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda - sha256: cb54a873c1c84c47f7174093889686b626946b8143905ec0f76a56785b26a304 - md5: 33b7851c39c25da14f6a233a8ccbeeca + url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda + sha256: 002d48084157a23c7e40a9b225bab95ea02ac6cb9267aa7739da2a3491bb0220 + md5: 7c1062eaa78dec4ea8a9a988dbda6045 constrains: - binutils_impl_linux-64 2.40 license: GPL-3.0-only license_family: GPL purls: [] - size: 707934 - timestamp: 1716583433869 + size: 713873 + timestamp: 1717997303330 - kind: conda name: libexpat version: 2.6.2 @@ -470,38 +470,38 @@ packages: - kind: conda name: libgcc-ng version: 13.2.0 - build: h77fa898_7 - build_number: 7 + build: h77fa898_8 + build_number: 8 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - sha256: 62af2b89acbe74a21606c8410c276e57309c0a2ab8a9e8639e3c8131c0b60c92 - md5: 72ec1b1b04c4d15d4204ece1ecea5978 + url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda + sha256: 849ed1de90ee9d668c5d80e6728dca3d97e10d05b365d212b84197cf1874a7ca + md5: a579489cacbe7775680d40704a537553 depends: - _libgcc_mutex 0.1 conda_forge - _openmp_mutex >=4.5 constrains: - - libgomp 13.2.0 h77fa898_7 + - libgomp 13.2.0 h77fa898_8 license: GPL-3.0-only WITH GCC-exception-3.1 license_family: GPL purls: [] - size: 775806 - timestamp: 1715016057793 + size: 795760 + timestamp: 1718209341553 - kind: conda name: libgomp version: 13.2.0 - build: h77fa898_7 - build_number: 7 + build: h77fa898_8 + build_number: 8 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda - sha256: 781444fa069d3b50e8ed667b750571cacda785761c7fc2a89ece1ac49693d4ad - md5: abf3fec87c2563697defa759dec3d639 + url: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda + sha256: 9ef0f93d87e12a8bc93b950801789a856497d7b3f5ed1476b9b465db24f3047e + md5: 43820d2a9bac31b9c84ecbeef32375b3 depends: - _libgcc_mutex 0.1 conda_forge license: GPL-3.0-only WITH GCC-exception-3.1 license_family: GPL purls: [] - size: 422336 - timestamp: 1715015995979 + size: 444169 + timestamp: 1718209252805 - kind: conda name: libnsl version: 2.0.1 @@ -519,19 +519,19 @@ packages: timestamp: 1697359010159 - kind: conda name: libsqlite - version: 3.45.3 - build: h2797004_0 + version: 3.46.0 + build: hde9e2c9_0 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda - sha256: e2273d6860eadcf714a759ffb6dc24a69cfd01f2a0ea9d6c20f86049b9334e0c - md5: b3316cbe90249da4f8e84cd66e1cc55b + url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda + sha256: daee3f68786231dad457d0dfde3f7f1f9a7f2018adabdbb864226775101341a8 + md5: 18aa975d2094c34aef978060ae7da7d8 depends: - libgcc-ng >=12 - - libzlib >=1.2.13,<2.0.0a0 + - libzlib >=1.2.13,<2.0a0 license: Unlicense purls: [] - size: 859858 - timestamp: 1713367435849 + size: 865346 + timestamp: 1718050628718 - kind: conda name: libuuid version: 2.38.1 @@ -564,22 +564,22 @@ packages: timestamp: 1702724383534 - kind: conda name: libzlib - version: 1.2.13 - build: h4ab18f5_6 - build_number: 6 + version: 1.3.1 + build: h4ab18f5_1 + build_number: 1 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h4ab18f5_6.conda - sha256: 8ced4afed6322172182af503f21725d072a589a6eb918f8a58135c1e00d35980 - md5: 27329162c0dc732bcf67a4e0cd488125 + url: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda + sha256: adf6096f98b537a11ae3729eaa642b0811478f0ea0402ca67b5108fe2cb0010d + md5: 57d7dc60e9325e3de37ff8dffd18e814 depends: - libgcc-ng >=12 constrains: - - zlib 1.2.13 *_6 + - zlib 1.3.1 *_1 license: Zlib license_family: Other purls: [] - size: 61571 - timestamp: 1716874066944 + size: 61574 + timestamp: 1716874187109 - kind: pypi name: mccabe version: 0.7.0 @@ -608,13 +608,12 @@ packages: timestamp: 1715194722503 - kind: conda name: openssl - version: 3.3.0 - build: h4ab18f5_3 - build_number: 3 + version: 3.3.1 + build: h4ab18f5_0 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - sha256: 33dcea0ed3a61b2de6b66661cdd55278640eb99d676cd129fbff3e53641fa125 - md5: 12ea6d0d4ed54530eaed18e4835c1f7c + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4ab18f5_0.conda + sha256: 9691f8bd6394c5bb0b8d2f47cd1467b91bd5b1df923b69e6b517f54496ee4b50 + md5: a41fa0e391cc9e0d6b78ac69ca047a6c depends: - ca-certificates - libgcc-ng >=12 @@ -623,14 +622,14 @@ packages: license: Apache-2.0 license_family: Apache purls: [] - size: 2891147 - timestamp: 1716468354865 + size: 2896170 + timestamp: 1717546157673 - kind: pypi name: packaging - version: '24.0' - url: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl - sha256: 2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 - requires_python: '>=3.7' + version: '24.1' + url: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl + sha256: 5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124 + requires_python: '>=3.8' - kind: pypi name: pathspec version: 0.12.1 @@ -816,15 +815,15 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 3a7ceb2b048bf678ce5b0a557c5611437b649821713eede4b3ac26112f010ea0 + sha256: 5316312b27d742b46ac3c3bef997a2ace82522ded8452cd98551e6e2de6baa2a requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' - pytest-cov>=4.1,<=5.0.0 ; extra == 'test' - pytest>=7.4,<=8.2.1 ; extra == 'test' - - hypothesis>=6.82,<=6.102.6 ; extra == 'test' - - ruff>=0.0.280,<=0.4.5 ; extra == 'test' - - coverage>=7.2.7,<=7.5.1 ; extra == 'test' + - hypothesis>=6.82,<=6.103.0 ; extra == 'test' + - ruff>=0.0.280,<=0.4.7 ; extra == 'test' + - coverage>=7.2.7,<=7.5.3 ; extra == 'test' editable: true - kind: conda name: readline @@ -845,9 +844,9 @@ packages: timestamp: 1679532220005 - kind: pypi name: ruff - version: 0.4.5 - url: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: f4b02a65985be2b34b170025a8b92449088ce61e33e69956ce4d316c0fe7cce0 + version: 0.4.7 + url: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: cbf5d818553add7511c38b05532d94a407f499d1a76ebb0cad0374e32bc67202 requires_python: '>=3.7' - kind: pypi name: sortedcontainers @@ -865,7 +864,7 @@ packages: md5: d453b98d9c83e71da0741bb0ff4d76bc depends: - libgcc-ng >=12 - - libzlib >=1.2.13,<1.3.0a0 + - libzlib >=1.2.13,<2.0.0a0 license: TCL license_family: BSD purls: [] @@ -885,9 +884,9 @@ packages: requires_python: '>=3.7' - kind: pypi name: typing-extensions - version: 4.12.0 - url: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl - sha256: b349c66bea9016ac22978d800cfff206d5f9816951f12a7d0ec5578b0a819594 + version: 4.12.2 + url: https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl + sha256: 04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d requires_python: '>=3.8' - kind: conda name: tzdata From a6cf9e58aab2f69141bc8f60e00da047c9f9f9fc Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 13 Jun 2024 21:03:02 +0100 Subject: [PATCH 075/109] update pip deps --- pixi.lock | 199 ++++++++++++++++++++++++++++++++++++++++++++++++- pyproject.toml | 1 + 2 files changed, 199 insertions(+), 1 deletion(-) diff --git a/pixi.lock b/pixi.lock index 3f4764a..41f4b7f 100644 --- a/pixi.lock +++ b/pixi.lock @@ -31,24 +31,38 @@ environments: - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/25/6d/eb15a1b155f755f43766cc473618c6e1de6555d6a1764965643f486dcf01/black-24.4.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/ee/fb/14d30eb4956408ee3ae09ad34299131fb383c47df355ddb428a7331cfa1e/charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/3f/4f/fcad903698f02ac0d7501432449db12e15fbe5ecfbc01e363eb752c65cbd/coverage-7.5.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/b4/33/720548182ffa8344418126017aa1d4ab4aeec9a2275f04ce3f3573d8ace8/PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/58/de/793f52c3a91a39f7d40a10818aaaecf052ebdd73ef64455a8c79362931b0/rocker-0.2.16-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - pypi: . py310: channels: @@ -80,27 +94,41 @@ environments: - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/7d/7f8df0fdbbbefc4362d3eca6b69b7a8a4249a8a88dabc00a207d31fddcd7/black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/da/f1/3702ba2a7470666a62fd81c58a4c40be00670e5006a67f4d626e57f013ae/charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz - pypi: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/29/61/bf33c6c85c55bc45a29eee3195848ff2d518d84735eb0e2d8cb42e0d285e/PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/58/de/793f52c3a91a39f7d40a10818aaaecf052ebdd73ef64455a8c79362931b0/rocker-0.2.16-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - pypi: . py311: channels: @@ -133,24 +161,38 @@ environments: - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c5/48/34176b522e8cff4620a5d96c2e323ff2413f574870eb25efa8025885e028/black-24.4.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/40/26/f35951c45070edc957ba40a5b1db3cf60a9dbb1b350c2d5bef03e01e61de/charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/bd/e2/9da6c61f71f769e63122ac9f029dcafe5fe50e1e4043f8dd950daf58290f/coverage-7.5.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/7b/5e/efd033ab7199a0b2044dab3b9f7a4f6670e6a52c089de572e928d2873b06/PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/58/de/793f52c3a91a39f7d40a10818aaaecf052ebdd73ef64455a8c79362931b0/rocker-0.2.16-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - pypi: . packages: - kind: conda @@ -309,6 +351,30 @@ packages: purls: [] size: 155432 timestamp: 1706843687645 +- kind: pypi + name: certifi + version: 2024.6.2 + url: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl + sha256: ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56 + requires_python: '>=3.6' +- kind: pypi + name: charset-normalizer + version: 3.3.2 + url: https://files.pythonhosted.org/packages/ee/fb/14d30eb4956408ee3ae09ad34299131fb383c47df355ddb428a7331cfa1e/charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b + requires_python: '>=3.7.0' +- kind: pypi + name: charset-normalizer + version: 3.3.2 + url: https://files.pythonhosted.org/packages/da/f1/3702ba2a7470666a62fd81c58a4c40be00670e5006a67f4d626e57f013ae/charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5 + requires_python: '>=3.7.0' +- kind: pypi + name: charset-normalizer + version: 3.3.2 + url: https://files.pythonhosted.org/packages/40/26/f35951c45070edc957ba40a5b1db3cf60a9dbb1b350c2d5bef03e01e61de/charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8 + requires_python: '>=3.7.0' - kind: pypi name: click version: 8.1.7 @@ -342,6 +408,24 @@ packages: requires_dist: - tomli ; python_full_version <= '3.11.0a6' and extra == 'toml' requires_python: '>=3.8' +- kind: pypi + name: deps-rocker + version: 0.2.0 + url: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl + sha256: 72e831c44ef11e2094f987576f571f014a7f33bd39079c62bf122025b6deae9e + requires_dist: + - rocker + - pyyaml + - off-your-rocker + - toml + - black>=23,<=24.4.2 ; extra == 'test' + - pylint>=2.16,<=3.2.0 ; extra == 'test' + - pytest-cov>=4.1,<=5.0.0 ; extra == 'test' + - pytest>=7.4,<=8.2.0 ; extra == 'test' + - hypothesis>=6.82,<=6.102.4 ; extra == 'test' + - ruff>=0.0.280,<=0.4.4 ; extra == 'test' + - coverage>=7.2.7,<=7.5.1 ; extra == 'test' + requires_python: '>=3.10' - kind: pypi name: dill version: 0.3.8 @@ -351,6 +435,31 @@ packages: - objgraph>=1.7.2 ; extra == 'graph' - gprof2dot>=2022.7.29 ; extra == 'profile' requires_python: '>=3.8' +- kind: pypi + name: docker + version: 7.1.0 + url: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl + sha256: c96b93b7f0a746f9e77d325bcfb87422a3d8bd4f03136ae8a85b37f1898d5fc0 + requires_dist: + - pywin32>=304 ; sys_platform == 'win32' + - requests>=2.26.0 + - urllib3>=1.26.0 + - coverage==7.2.7 ; extra == 'dev' + - pytest-cov==4.1.0 ; extra == 'dev' + - pytest-timeout==2.1.0 ; extra == 'dev' + - pytest==7.4.2 ; extra == 'dev' + - ruff==0.1.8 ; extra == 'dev' + - myst-parser==0.18.0 ; extra == 'docs' + - sphinx==5.1.1 ; extra == 'docs' + - paramiko>=2.4.3 ; extra == 'ssh' + - websocket-client>=1.3.0 ; extra == 'websockets' + requires_python: '>=3.8' +- kind: pypi + name: empy + version: '4.1' + url: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz + sha256: 9d712e97c1395859be13d2b45788c9186cd97f1c04dac510399130f328643367 + requires_python: '>=2.3' - kind: pypi name: exceptiongroup version: 1.2.1 @@ -404,6 +513,12 @@ packages: - backports-zoneinfo>=0.2.1 ; python_version < '3.9' and extra == 'zoneinfo' - tzdata>=2024.1 ; (sys_platform == 'win32' or sys_platform == 'emscripten') and extra == 'zoneinfo' requires_python: '>=3.8' +- kind: pypi + name: idna + version: '3.7' + url: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl + sha256: 82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0 + requires_python: '>=3.5' - kind: pypi name: iniconfig version: 2.0.0 @@ -606,6 +721,13 @@ packages: purls: [] size: 887465 timestamp: 1715194722503 +- kind: pypi + name: off-your-rocker + version: 0.1.0 + url: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl + sha256: d59930ae0ae66e3a4618e0432a2406f22ca6a896198d74efa480592082174858 + requires_dist: + - rocker - kind: conda name: openssl version: 3.3.0 @@ -637,6 +759,13 @@ packages: url: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl sha256: a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08 requires_python: '>=3.8' +- kind: pypi + name: pexpect + version: 4.9.0 + url: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl + sha256: 7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523 + requires_dist: + - ptyprocess>=0.5 - kind: pypi name: platformdirs version: 4.2.2 @@ -665,6 +794,11 @@ packages: - pytest ; extra == 'testing' - pytest-benchmark ; extra == 'testing' requires_python: '>=3.8' +- kind: pypi + name: ptyprocess + version: 0.7.0 + url: https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl + sha256: 4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35 - kind: pypi name: pylint version: 3.2.2 @@ -816,7 +950,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 3a7ceb2b048bf678ce5b0a557c5611437b649821713eede4b3ac26112f010ea0 + sha256: f95869c9068b34363d3a322b9e217e499a5b3a58f53da9f8301a6fab8c07aed4 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' @@ -826,6 +960,24 @@ packages: - ruff>=0.0.280,<=0.4.5 ; extra == 'test' - coverage>=7.2.7,<=7.5.1 ; extra == 'test' editable: true +- kind: pypi + name: pyyaml + version: 6.0.1 + url: https://files.pythonhosted.org/packages/b4/33/720548182ffa8344418126017aa1d4ab4aeec9a2275f04ce3f3573d8ace8/PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: 6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0 + requires_python: '>=3.6' +- kind: pypi + name: pyyaml + version: 6.0.1 + url: https://files.pythonhosted.org/packages/29/61/bf33c6c85c55bc45a29eee3195848ff2d518d84735eb0e2d8cb42e0d285e/PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515 + requires_python: '>=3.6' +- kind: pypi + name: pyyaml + version: 6.0.1 + url: https://files.pythonhosted.org/packages/7b/5e/efd033ab7199a0b2044dab3b9f7a4f6670e6a52c089de572e928d2873b06/PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673 + requires_python: '>=3.6' - kind: conda name: readline version: '8.2' @@ -843,6 +995,33 @@ packages: purls: [] size: 281456 timestamp: 1679532220005 +- kind: pypi + name: requests + version: 2.32.3 + url: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl + sha256: 70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6 + requires_dist: + - charset-normalizer<4,>=2 + - idna<4,>=2.5 + - urllib3<3,>=1.21.1 + - certifi>=2017.4.17 + - pysocks!=1.5.7,>=1.5.6 ; extra == 'socks' + - chardet<6,>=3.0.2 ; extra == 'use-chardet-on-py3' + requires_python: '>=3.8' +- kind: pypi + name: rocker + version: 0.2.16 + url: https://files.pythonhosted.org/packages/58/de/793f52c3a91a39f7d40a10818aaaecf052ebdd73ef64455a8c79362931b0/rocker-0.2.16-py3-none-any.whl + sha256: 75ab38a9ee37ce55ab8dbd71688b578e6f2e7ffc63852d5b10523ff764b28791 + requires_dist: + - empy + - pexpect + - packaging + - urllib3 + - docker + - importlib-metadata ; python_version < '3.8' + - pytest ; extra == 'test' + requires_python: '>=3.0' - kind: pypi name: ruff version: 0.4.5 @@ -871,6 +1050,12 @@ packages: purls: [] size: 3318875 timestamp: 1699202167581 +- kind: pypi + name: toml + version: 0.10.2 + url: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl + sha256: 806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b + requires_python: '>=2.6,!=3.0.*,!=3.1.*,!=3.2.*' - kind: pypi name: tomli version: 2.0.1 @@ -902,6 +1087,18 @@ packages: purls: [] size: 119815 timestamp: 1706886945727 +- kind: pypi + name: urllib3 + version: 2.2.1 + url: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl + sha256: 450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d + requires_dist: + - brotli>=1.0.9 ; platform_python_implementation == 'CPython' and extra == 'brotli' + - brotlicffi>=0.8.0 ; platform_python_implementation != 'CPython' and extra == 'brotli' + - h2<5,>=4 ; extra == 'h2' + - pysocks!=1.5.7,<2.0,>=1.5.6 ; extra == 'socks' + - zstandard>=0.18.0 ; extra == 'zstd' + requires_python: '>=3.8' - kind: conda name: xz version: 5.2.6 diff --git a/pyproject.toml b/pyproject.toml index a8065e4..e73cfdc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,6 +26,7 @@ python = "3.11.*" [tool.pixi.pypi-dependencies] python_template = { path = ".", editable = true } +deps-rocker = ">=0.2" [project.optional-dependencies] test = [ From 415a1df2243b0680ea078c95bc73dd39e06d2f13 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 13 Jun 2024 21:03:59 +0100 Subject: [PATCH 076/109] update pixi.lock --- pixi.lock | 173 +++++++++++++++++++++++++++--------------------------- 1 file changed, 86 insertions(+), 87 deletions(-) diff --git a/pixi.lock b/pixi.lock index 41f4b7f..5396349 100644 --- a/pixi.lock +++ b/pixi.lock @@ -10,19 +10,19 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h4ab18f5_6.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4ab18f5_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda @@ -46,7 +46,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl @@ -74,18 +74,18 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h4ab18f5_6.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4ab18f5_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.14-hd12c33a_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda @@ -110,7 +110,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl @@ -127,7 +127,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - pypi: . py311: @@ -140,19 +140,19 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h4ab18f5_6.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4ab18f5_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.11.9-hb806964_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda @@ -176,7 +176,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl @@ -341,16 +341,16 @@ packages: timestamp: 1699279927352 - kind: conda name: ca-certificates - version: 2024.2.2 + version: 2024.6.2 build: hbcca054_0 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.2.2-hbcca054_0.conda - sha256: 91d81bfecdbb142c15066df70cc952590ae8991670198f92c66b62019b251aeb - md5: 2f4327a1cbe7f022401b236e915a5fef + url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda + sha256: 979af0932b2a5a26112044891a2d79e402e5ae8166f50fa48b8ebae47c0a2d65 + md5: 847c3c2905cc467cea52c24f9cfa8080 license: ISC purls: [] - size: 155432 - timestamp: 1706843687645 + size: 156035 + timestamp: 1717311767102 - kind: pypi name: certifi version: 2024.6.2 @@ -536,19 +536,19 @@ packages: - kind: conda name: ld_impl_linux-64 version: '2.40' - build: hf3520f5_1 - build_number: 1 + build: hf3520f5_3 + build_number: 3 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_1.conda - sha256: cb54a873c1c84c47f7174093889686b626946b8143905ec0f76a56785b26a304 - md5: 33b7851c39c25da14f6a233a8ccbeeca + url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda + sha256: 002d48084157a23c7e40a9b225bab95ea02ac6cb9267aa7739da2a3491bb0220 + md5: 7c1062eaa78dec4ea8a9a988dbda6045 constrains: - binutils_impl_linux-64 2.40 license: GPL-3.0-only license_family: GPL purls: [] - size: 707934 - timestamp: 1716583433869 + size: 713873 + timestamp: 1717997303330 - kind: conda name: libexpat version: 2.6.2 @@ -585,38 +585,38 @@ packages: - kind: conda name: libgcc-ng version: 13.2.0 - build: h77fa898_7 - build_number: 7 + build: h77fa898_8 + build_number: 8 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_7.conda - sha256: 62af2b89acbe74a21606c8410c276e57309c0a2ab8a9e8639e3c8131c0b60c92 - md5: 72ec1b1b04c4d15d4204ece1ecea5978 + url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda + sha256: 849ed1de90ee9d668c5d80e6728dca3d97e10d05b365d212b84197cf1874a7ca + md5: a579489cacbe7775680d40704a537553 depends: - _libgcc_mutex 0.1 conda_forge - _openmp_mutex >=4.5 constrains: - - libgomp 13.2.0 h77fa898_7 + - libgomp 13.2.0 h77fa898_8 license: GPL-3.0-only WITH GCC-exception-3.1 license_family: GPL purls: [] - size: 775806 - timestamp: 1715016057793 + size: 795760 + timestamp: 1718209341553 - kind: conda name: libgomp version: 13.2.0 - build: h77fa898_7 - build_number: 7 + build: h77fa898_8 + build_number: 8 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_7.conda - sha256: 781444fa069d3b50e8ed667b750571cacda785761c7fc2a89ece1ac49693d4ad - md5: abf3fec87c2563697defa759dec3d639 + url: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda + sha256: 9ef0f93d87e12a8bc93b950801789a856497d7b3f5ed1476b9b465db24f3047e + md5: 43820d2a9bac31b9c84ecbeef32375b3 depends: - _libgcc_mutex 0.1 conda_forge license: GPL-3.0-only WITH GCC-exception-3.1 license_family: GPL purls: [] - size: 422336 - timestamp: 1715015995979 + size: 444169 + timestamp: 1718209252805 - kind: conda name: libnsl version: 2.0.1 @@ -634,19 +634,19 @@ packages: timestamp: 1697359010159 - kind: conda name: libsqlite - version: 3.45.3 - build: h2797004_0 + version: 3.46.0 + build: hde9e2c9_0 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.45.3-h2797004_0.conda - sha256: e2273d6860eadcf714a759ffb6dc24a69cfd01f2a0ea9d6c20f86049b9334e0c - md5: b3316cbe90249da4f8e84cd66e1cc55b + url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda + sha256: daee3f68786231dad457d0dfde3f7f1f9a7f2018adabdbb864226775101341a8 + md5: 18aa975d2094c34aef978060ae7da7d8 depends: - libgcc-ng >=12 - - libzlib >=1.2.13,<2.0.0a0 + - libzlib >=1.2.13,<2.0a0 license: Unlicense purls: [] - size: 859858 - timestamp: 1713367435849 + size: 865346 + timestamp: 1718050628718 - kind: conda name: libuuid version: 2.38.1 @@ -679,22 +679,22 @@ packages: timestamp: 1702724383534 - kind: conda name: libzlib - version: 1.2.13 - build: h4ab18f5_6 - build_number: 6 + version: 1.3.1 + build: h4ab18f5_1 + build_number: 1 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h4ab18f5_6.conda - sha256: 8ced4afed6322172182af503f21725d072a589a6eb918f8a58135c1e00d35980 - md5: 27329162c0dc732bcf67a4e0cd488125 + url: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda + sha256: adf6096f98b537a11ae3729eaa642b0811478f0ea0402ca67b5108fe2cb0010d + md5: 57d7dc60e9325e3de37ff8dffd18e814 depends: - libgcc-ng >=12 constrains: - - zlib 1.2.13 *_6 + - zlib 1.3.1 *_1 license: Zlib license_family: Other purls: [] - size: 61571 - timestamp: 1716874066944 + size: 61574 + timestamp: 1716874187109 - kind: pypi name: mccabe version: 0.7.0 @@ -730,13 +730,12 @@ packages: - rocker - kind: conda name: openssl - version: 3.3.0 - build: h4ab18f5_3 - build_number: 3 + version: 3.3.1 + build: h4ab18f5_0 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_3.conda - sha256: 33dcea0ed3a61b2de6b66661cdd55278640eb99d676cd129fbff3e53641fa125 - md5: 12ea6d0d4ed54530eaed18e4835c1f7c + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4ab18f5_0.conda + sha256: 9691f8bd6394c5bb0b8d2f47cd1467b91bd5b1df923b69e6b517f54496ee4b50 + md5: a41fa0e391cc9e0d6b78ac69ca047a6c depends: - ca-certificates - libgcc-ng >=12 @@ -745,14 +744,14 @@ packages: license: Apache-2.0 license_family: Apache purls: [] - size: 2891147 - timestamp: 1716468354865 + size: 2896170 + timestamp: 1717546157673 - kind: pypi name: packaging - version: '24.0' - url: https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl - sha256: 2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 - requires_python: '>=3.7' + version: '24.1' + url: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl + sha256: 5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124 + requires_python: '>=3.8' - kind: pypi name: pathspec version: 0.12.1 @@ -950,7 +949,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: f95869c9068b34363d3a322b9e217e499a5b3a58f53da9f8301a6fab8c07aed4 + sha256: 46240fab75deab98282305d86afdc8085ef66f42246ddecb053c553e76b2e724 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' @@ -1044,7 +1043,7 @@ packages: md5: d453b98d9c83e71da0741bb0ff4d76bc depends: - libgcc-ng >=12 - - libzlib >=1.2.13,<1.3.0a0 + - libzlib >=1.2.13,<2.0.0a0 license: TCL license_family: BSD purls: [] @@ -1070,9 +1069,9 @@ packages: requires_python: '>=3.7' - kind: pypi name: typing-extensions - version: 4.12.0 - url: https://files.pythonhosted.org/packages/e1/4d/d612de852a0bc64a64418e1cef25fe1914c5b1611e34cc271ed7e36174c8/typing_extensions-4.12.0-py3-none-any.whl - sha256: b349c66bea9016ac22978d800cfff206d5f9816951f12a7d0ec5578b0a819594 + version: 4.12.2 + url: https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl + sha256: 04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d requires_python: '>=3.8' - kind: conda name: tzdata From 50f0eb74ca714ab01b991e9d4a40ca89db4a6fd2 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 13 Jun 2024 21:06:11 +0100 Subject: [PATCH 077/109] update pixi.lock --- pixi.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pixi.lock b/pixi.lock index 9203f38..a84e70b 100644 --- a/pixi.lock +++ b/pixi.lock @@ -34,12 +34,12 @@ environments: - pypi: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ee/fb/14d30eb4956408ee3ae09ad34299131fb383c47df355ddb428a7331cfa1e/charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/3f/4f/fcad903698f02ac0d7501432449db12e15fbe5ecfbc01e363eb752c65cbd/coverage-7.5.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/0e/39/c44111cfc5e40fc1681a41b96911fba6560b51172b59c204b08b75d58495/coverage-7.5.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz - - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl @@ -58,7 +58,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/b4/33/720548182ffa8344418126017aa1d4ab4aeec9a2275f04ce3f3573d8ace8/PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/58/de/793f52c3a91a39f7d40a10818aaaecf052ebdd73ef64455a8c79362931b0/rocker-0.2.16-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl @@ -97,13 +97,13 @@ environments: - pypi: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/da/f1/3702ba2a7470666a62fd81c58a4c40be00670e5006a67f4d626e57f013ae/charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/8f/7e/14416cf45cf755fd9b09cdb9abbda1bb2819d9911a85ec279d44c7838853/coverage-7.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/10/77/9d65122b73f2cfa14744286adc3c1f88bdef49ffd628076429ae59e8fa21/coverage-7.5.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz - pypi: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl @@ -122,7 +122,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/29/61/bf33c6c85c55bc45a29eee3195848ff2d518d84735eb0e2d8cb42e0d285e/PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/58/de/793f52c3a91a39f7d40a10818aaaecf052ebdd73ef64455a8c79362931b0/rocker-0.2.16-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl @@ -164,12 +164,12 @@ environments: - pypi: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/40/26/f35951c45070edc957ba40a5b1db3cf60a9dbb1b350c2d5bef03e01e61de/charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/bd/e2/9da6c61f71f769e63122ac9f029dcafe5fe50e1e4043f8dd950daf58290f/coverage-7.5.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/9c/38/d8d6616b3c5da0b6d6ab99a0141f8ba80e979596b360196240c96a67ac11/coverage-7.5.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz - - pypi: https://files.pythonhosted.org/packages/b5/f7/89b6869874387d22b8eee5a218613653f7b4ea40bc72e8cac8b051af4867/hypothesis-6.102.6-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl @@ -188,7 +188,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/7b/5e/efd033ab7199a0b2044dab3b9f7a4f6670e6a52c089de572e928d2873b06/PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/58/de/793f52c3a91a39f7d40a10818aaaecf052ebdd73ef64455a8c79362931b0/rocker-0.2.16-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/d8/ae/aca5966c5017df4ace52a6222d0ca3439a6e0e806771b9e8d95ac9dacfb3/ruff-0.4.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl @@ -949,7 +949,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 46240fab75deab98282305d86afdc8085ef66f42246ddecb053c553e76b2e724 + sha256: 0d9db7ea996ee2cf7783b12f8ccf7b08d65b12a9f53c7525be4b3a6877c80d47 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' @@ -1005,7 +1005,7 @@ packages: - urllib3<3,>=1.21.1 - certifi>=2017.4.17 - pysocks!=1.5.7,>=1.5.6 ; extra == 'socks' - - chardet<6,>=3.0.2 ; extra == 'use-chardet-on-py3' + - chardet<6,>=3.0.2 ; extra == 'use_chardet_on_py3' requires_python: '>=3.8' - kind: pypi name: rocker From 96e0bbd6cfae0b5f9bcb71e9cfc74f2ecf73aae9 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Fri, 14 Jun 2024 08:10:53 +0100 Subject: [PATCH 078/109] remove commented out deps --- pyproject.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0427d2d..5adc95f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,11 +14,6 @@ platforms = ["linux-64"] [tool.pixi.dependencies] python = ">=3.10" -# [tool.pixi.host-dependencies] -# rocker= ">=0.2.16" -# off-your-rocker = ">=0.1.0" -# deps-rocker = ">=0.2" - [tool.pixi.feature.py310.dependencies] python = "3.10.*" [tool.pixi.feature.py311.dependencies] From 4bfd515bc3e2150da884f029076d878a47d373a2 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Fri, 14 Jun 2024 08:17:21 +0100 Subject: [PATCH 079/109] add devenv dependency --- pixi.lock | 110 ++++++++++++++++++++----------------------------- pyproject.toml | 7 +++- 2 files changed, 50 insertions(+), 67 deletions(-) diff --git a/pixi.lock b/pixi.lock index a84e70b..9535334 100644 --- a/pixi.lock +++ b/pixi.lock @@ -31,37 +31,67 @@ environments: - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/25/6d/eb15a1b155f755f43766cc473618c6e1de6555d6a1764965643f486dcf01/black-24.4.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/ee/fb/14d30eb4956408ee3ae09ad34299131fb383c47df355ddb428a7331cfa1e/charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0e/39/c44111cfc5e40fc1681a41b96911fba6560b51172b59c204b08b75d58495/coverage-7.5.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz - pypi: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl + - pypi: . + devenv: + channels: + - url: https://conda.anaconda.org/conda-forge/ + indexes: + - https://pypi.org/simple + packages: + linux-64: + - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4ab18f5_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 + - pypi: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/ee/fb/14d30eb4956408ee3ae09ad34299131fb383c47df355ddb428a7331cfa1e/charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz + - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/33/720548182ffa8344418126017aa1d4ab4aeec9a2275f04ce3f3573d8ace8/PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/58/de/793f52c3a91a39f7d40a10818aaaecf052ebdd73ef64455a8c79362931b0/rocker-0.2.16-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - pypi: . py310: @@ -94,41 +124,27 @@ environments: - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/7d/7f8df0fdbbbefc4362d3eca6b69b7a8a4249a8a88dabc00a207d31fddcd7/black-24.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/da/f1/3702ba2a7470666a62fd81c58a4c40be00670e5006a67f4d626e57f013ae/charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/10/77/9d65122b73f2cfa14744286adc3c1f88bdef49ffd628076429ae59e8fa21/coverage-7.5.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz - pypi: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/29/61/bf33c6c85c55bc45a29eee3195848ff2d518d84735eb0e2d8cb42e0d285e/PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/58/de/793f52c3a91a39f7d40a10818aaaecf052ebdd73ef64455a8c79362931b0/rocker-0.2.16-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - pypi: . py311: channels: @@ -161,38 +177,24 @@ environments: - pypi: https://files.pythonhosted.org/packages/c7/81/f49fae71340af02a6014278517c36449bdd8e8b792f4ef7397f3b054f460/astroid-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c5/48/34176b522e8cff4620a5d96c2e323ff2413f574870eb25efa8025885e028/black-24.4.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/40/26/f35951c45070edc957ba40a5b1db3cf60a9dbb1b350c2d5bef03e01e61de/charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9c/38/d8d6616b3c5da0b6d6ab99a0141f8ba80e979596b360196240c96a67ac11/coverage-7.5.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz - pypi: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/7b/5e/efd033ab7199a0b2044dab3b9f7a4f6670e6a52c089de572e928d2873b06/PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/58/de/793f52c3a91a39f7d40a10818aaaecf052ebdd73ef64455a8c79362931b0/rocker-0.2.16-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - pypi: . packages: - kind: conda @@ -363,18 +365,6 @@ packages: url: https://files.pythonhosted.org/packages/ee/fb/14d30eb4956408ee3ae09ad34299131fb383c47df355ddb428a7331cfa1e/charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sha256: 90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b requires_python: '>=3.7.0' -- kind: pypi - name: charset-normalizer - version: 3.3.2 - url: https://files.pythonhosted.org/packages/da/f1/3702ba2a7470666a62fd81c58a4c40be00670e5006a67f4d626e57f013ae/charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5 - requires_python: '>=3.7.0' -- kind: pypi - name: charset-normalizer - version: 3.3.2 - url: https://files.pythonhosted.org/packages/40/26/f35951c45070edc957ba40a5b1db3cf60a9dbb1b350c2d5bef03e01e61de/charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8 - requires_python: '>=3.7.0' - kind: pypi name: click version: 8.1.7 @@ -949,7 +939,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 0d9db7ea996ee2cf7783b12f8ccf7b08d65b12a9f53c7525be4b3a6877c80d47 + sha256: 547cb4f8c05daf14ff7ef9d0e72c89c9470972d5412fb8ce1fdb2b0718edade6 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.2 ; extra == 'test' @@ -965,18 +955,6 @@ packages: url: https://files.pythonhosted.org/packages/b4/33/720548182ffa8344418126017aa1d4ab4aeec9a2275f04ce3f3573d8ace8/PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sha256: 6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0 requires_python: '>=3.6' -- kind: pypi - name: pyyaml - version: 6.0.1 - url: https://files.pythonhosted.org/packages/29/61/bf33c6c85c55bc45a29eee3195848ff2d518d84735eb0e2d8cb42e0d285e/PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515 - requires_python: '>=3.6' -- kind: pypi - name: pyyaml - version: 6.0.1 - url: https://files.pythonhosted.org/packages/7b/5e/efd033ab7199a0b2044dab3b9f7a4f6670e6a52c089de572e928d2873b06/PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673 - requires_python: '>=3.6' - kind: conda name: readline version: '8.2' @@ -1005,7 +983,7 @@ packages: - urllib3<3,>=1.21.1 - certifi>=2017.4.17 - pysocks!=1.5.7,>=1.5.6 ; extra == 'socks' - - chardet<6,>=3.0.2 ; extra == 'use_chardet_on_py3' + - chardet<6,>=3.0.2 ; extra == 'use-chardet-on-py3' requires_python: '>=3.8' - kind: pypi name: rocker diff --git a/pyproject.toml b/pyproject.toml index 5adc95f..e06ac1e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,8 @@ python = "3.11.*" [tool.pixi.pypi-dependencies] python_template = { path = ".", editable = true } + +[tool.pixi.feature.devenv.pypi-dependencies] deps-rocker = ">=0.2" [project.optional-dependencies] @@ -47,9 +49,12 @@ build-backend = "setuptools.build_meta" default = {features = ["test"], solve-group = "default" } py310 = ["py310","test"] py311 = ["py311","test"] +devenv =["devenv"] -[tool.pixi.tasks] +[tool.pixi.feature.devenv.tasks] code = "scripts/launch_vscode.sh" + +[tool.pixi.tasks] format = "black ." check-clean-workspace = "git diff --exit-code" ruff-lint = "ruff check . --fix" From 1b982eb10433d41f120fb8de71b3a26756341baf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 07:21:48 +0000 Subject: [PATCH 080/109] Bump the dev-dependencies group across 1 directory with 4 updates Updates the requirements on [pylint](https://github.com/pylint-dev/pylint), [pytest](https://github.com/pytest-dev/pytest), [hypothesis](https://github.com/HypothesisWorks/hypothesis) and [ruff](https://github.com/astral-sh/ruff) to permit the latest version. Updates `pylint` to 3.2.3 - [Release notes](https://github.com/pylint-dev/pylint/releases) - [Commits](https://github.com/pylint-dev/pylint/compare/pylint-3.0.0a0...v3.2.3) Updates `pytest` to 8.2.2 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.4.0...8.2.2) Updates `hypothesis` to 6.103.1 - [Release notes](https://github.com/HypothesisWorks/hypothesis/releases) - [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.82.0...hypothesis-python-6.103.1) Updates `ruff` to 0.4.8 - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.0.280...v0.4.8) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: pytest dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: hypothesis dependency-type: direct:production dependency-group: dev-dependencies - dependency-name: ruff dependency-type: direct:production dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e06ac1e..e9f7bd2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,11 +28,11 @@ deps-rocker = ">=0.2" [project.optional-dependencies] test = [ "black>=23,<=24.4.2", - "pylint>=2.17.7,<=3.2.2", + "pylint>=2.17.7,<=3.2.3", "pytest-cov>=4.1,<=5.0.0", - "pytest>=7.4,<=8.2.1", - "hypothesis>=6.82,<=6.103.0", - "ruff>=0.0.280,<=0.4.7", + "pytest>=7.4,<=8.2.2", + "hypothesis>=6.82,<=6.103.1", + "ruff>=0.0.280,<=0.4.8", "coverage>=7.2.7,<=7.5.3", ] From f8b090f54df0d61352dee54cd814351af666f111 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Fri, 14 Jun 2024 08:24:49 +0100 Subject: [PATCH 081/109] update pixi.lock --- pixi.lock | 60 +++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/pixi.lock b/pixi.lock index 9535334..69e9bf0 100644 --- a/pixi.lock +++ b/pixi.lock @@ -34,7 +34,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0e/39/c44111cfc5e40fc1681a41b96911fba6560b51172b59c204b08b75d58495/coverage-7.5.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/13/10/1040d11375da7347c404b9d54e386f5f4be47c8c449e37957ee12fdd37d0/hypothesis-6.103.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl @@ -43,10 +43,10 @@ environments: - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/50/d3/d346f779cbc9384d8b805a7557b5f2b8ee9f842bffebec9fc6364d6ae183/pylint-3.2.3-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/4e/e7/81ebdd666d3bff6670d27349b5053605d83d55548e6bd5711f3b0ae7dd23/pytest-8.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/21/77/9d9c536d8544d8b1b2fe1fcd5e3e190b946d91dc00a8956aa5fe88cb264b/ruff-0.4.8-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - pypi: . @@ -128,7 +128,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/10/77/9d65122b73f2cfa14744286adc3c1f88bdef49ffd628076429ae59e8fa21/coverage-7.5.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/01/90/79fe92dd413a9cab314ef5c591b5aa9b9ba787ae4cadab75055b0ae00b33/exceptiongroup-1.2.1-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/13/10/1040d11375da7347c404b9d54e386f5f4be47c8c449e37957ee12fdd37d0/hypothesis-6.103.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl @@ -137,10 +137,10 @@ environments: - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/50/d3/d346f779cbc9384d8b805a7557b5f2b8ee9f842bffebec9fc6364d6ae183/pylint-3.2.3-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/4e/e7/81ebdd666d3bff6670d27349b5053605d83d55548e6bd5711f3b0ae7dd23/pytest-8.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/21/77/9d9c536d8544d8b1b2fe1fcd5e3e190b946d91dc00a8956aa5fe88cb264b/ruff-0.4.8-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl @@ -180,7 +180,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9c/38/d8d6616b3c5da0b6d6ab99a0141f8ba80e979596b360196240c96a67ac11/coverage-7.5.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/c9/7a/cef76fd8438a42f96db64ddaa85280485a9c395e7df3db8158cfec1eee34/dill-0.3.8-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/13/10/1040d11375da7347c404b9d54e386f5f4be47c8c449e37957ee12fdd37d0/hypothesis-6.103.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl @@ -189,10 +189,10 @@ environments: - pypi: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/13/2aa1f0e1364feb2c9ef45302f387ac0bd81484e9c9a4c5688a322fbdfd08/platformdirs-4.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/50/d3/d346f779cbc9384d8b805a7557b5f2b8ee9f842bffebec9fc6364d6ae183/pylint-3.2.3-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/4e/e7/81ebdd666d3bff6670d27349b5053605d83d55548e6bd5711f3b0ae7dd23/pytest-8.2.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/78/3a/af5b4fa5961d9a1e6237b530eb87dd04aea6eb83da09d2a4073d81b54ccf/pytest_cov-5.0.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/21/77/9d9c536d8544d8b1b2fe1fcd5e3e190b946d91dc00a8956aa5fe88cb264b/ruff-0.4.8-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - pypi: . @@ -460,9 +460,9 @@ packages: requires_python: '>=3.7' - kind: pypi name: hypothesis - version: 6.103.0 - url: https://files.pythonhosted.org/packages/db/89/6b1d66ab6f1e627412751de7b17850e2ec88ac4f56a4ab8c947c88e90cd6/hypothesis-6.103.0-py3-none-any.whl - sha256: 0d21a87e2d68b4937f19f1e6e681d747de65f748c9caa818308a0e3899ea8481 + version: 6.103.1 + url: https://files.pythonhosted.org/packages/13/10/1040d11375da7347c404b9d54e386f5f4be47c8c449e37957ee12fdd37d0/hypothesis-6.103.1-py3-none-any.whl + sha256: d3c959fab6233e78867499e2117ae9db8dc40eeed936d71a2cfc7b6094972e74 requires_dist: - attrs>=22.2.0 - sortedcontainers<3.0.0,>=2.1.0 @@ -790,9 +790,9 @@ packages: sha256: 4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35 - kind: pypi name: pylint - version: 3.2.2 - url: https://files.pythonhosted.org/packages/bd/23/7a546224d2931cda031ee3cddc9e723650ad8e491d7c64efbab97e43e16d/pylint-3.2.2-py3-none-any.whl - sha256: 3f8788ab20bb8383e06dd2233e50f8e08949cfd9574804564803441a4946eab4 + version: 3.2.3 + url: https://files.pythonhosted.org/packages/50/d3/d346f779cbc9384d8b805a7557b5f2b8ee9f842bffebec9fc6364d6ae183/pylint-3.2.3-py3-none-any.whl + sha256: b3d7d2708a3e04b4679e02d99e72329a8b7ee8afb8d04110682278781f889fa8 requires_dist: - platformdirs>=2.2.0 - astroid<=3.3.0.dev0,>=3.2.2 @@ -810,9 +810,9 @@ packages: requires_python: '>=3.8.0' - kind: pypi name: pytest - version: 8.2.1 - url: https://files.pythonhosted.org/packages/b4/c1/27a1274b73712232328cb5115030057b7dec377f36a518c83f2e01d4f305/pytest-8.2.1-py3-none-any.whl - sha256: faccc5d332b8c3719f40283d0d44aa5cf101cec36f88cde9ed8f2bc0538612b1 + version: 8.2.2 + url: https://files.pythonhosted.org/packages/4e/e7/81ebdd666d3bff6670d27349b5053605d83d55548e6bd5711f3b0ae7dd23/pytest-8.2.2-py3-none-any.whl + sha256: c434598117762e2bd304e526244f67bf66bbd7b5d6cf22138be51ff661980343 requires_dist: - iniconfig - packaging @@ -939,14 +939,14 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 547cb4f8c05daf14ff7ef9d0e72c89c9470972d5412fb8ce1fdb2b0718edade6 + sha256: 5f6b1959b85a85f1634735091b4355f6bae89d280eb5edfaf6890088d82a697c requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - - pylint>=2.17.7,<=3.2.2 ; extra == 'test' + - pylint>=2.17.7,<=3.2.3 ; extra == 'test' - pytest-cov>=4.1,<=5.0.0 ; extra == 'test' - - pytest>=7.4,<=8.2.1 ; extra == 'test' - - hypothesis>=6.82,<=6.103.0 ; extra == 'test' - - ruff>=0.0.280,<=0.4.7 ; extra == 'test' + - pytest>=7.4,<=8.2.2 ; extra == 'test' + - hypothesis>=6.82,<=6.103.1 ; extra == 'test' + - ruff>=0.0.280,<=0.4.8 ; extra == 'test' - coverage>=7.2.7,<=7.5.3 ; extra == 'test' editable: true - kind: pypi @@ -983,7 +983,7 @@ packages: - urllib3<3,>=1.21.1 - certifi>=2017.4.17 - pysocks!=1.5.7,>=1.5.6 ; extra == 'socks' - - chardet<6,>=3.0.2 ; extra == 'use-chardet-on-py3' + - chardet<6,>=3.0.2 ; extra == 'use_chardet_on_py3' requires_python: '>=3.8' - kind: pypi name: rocker @@ -1001,9 +1001,9 @@ packages: requires_python: '>=3.0' - kind: pypi name: ruff - version: 0.4.7 - url: https://files.pythonhosted.org/packages/c2/ad/e8a251c07e67ef4f760e473ec612e42502a83f294fe44aca3aafb4e08f8b/ruff-0.4.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: cbf5d818553add7511c38b05532d94a407f499d1a76ebb0cad0374e32bc67202 + version: 0.4.8 + url: https://files.pythonhosted.org/packages/21/77/9d9c536d8544d8b1b2fe1fcd5e3e190b946d91dc00a8956aa5fe88cb264b/ruff-0.4.8-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sha256: d05f8d6f0c3cce5026cecd83b7a143dcad503045857bc49662f736437380ad45 requires_python: '>=3.7' - kind: pypi name: sortedcontainers From 52b2638195918ac9a2456a7bb939ac2713f361f7 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 15 Jun 2024 11:58:27 +0100 Subject: [PATCH 082/109] add metadata.json to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8c26a59..260ce0a 100644 --- a/.gitignore +++ b/.gitignore @@ -168,3 +168,5 @@ log/** .pixi *.egg-info +managed_context/metadata.json +test_suite_analysis/metadata.json From 8f443e07996b3589b19330d6d10b05359498ecf6 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 15 Jun 2024 11:58:39 +0100 Subject: [PATCH 083/109] clean up deps.yaml for python template --- pyproject.toml | 2 +- python_template.deps.yaml | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e9f7bd2..2eb887e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,7 @@ build-backend = "setuptools.build_meta" default = {features = ["test"], solve-group = "default" } py310 = ["py310","test"] py311 = ["py311","test"] -devenv =["devenv"] +devenv ={features = ["devenv"], solve-group = "devenv" } [tool.pixi.feature.devenv.tasks] code = "scripts/launch_vscode.sh" diff --git a/python_template.deps.yaml b/python_template.deps.yaml index ef766bc..ac2cfad 100644 --- a/python_template.deps.yaml +++ b/python_template.deps.yaml @@ -1,17 +1,12 @@ apt_sources: - curl + - ca-certificates apt_tools: - git - git-lfs - - python3-pip - apt-utils - jq -pip_language-toolchain: - - flit - - pip #updates to latest pip - - script_pixi-user: - scripts/install_pixi.sh \ No newline at end of file From 2750fbd8cf9b3726c6917819409f94d8a9c683b0 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 15 Jun 2024 11:59:27 +0100 Subject: [PATCH 084/109] rename deps.yaml as well --- scripts/rename_project.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/rename_project.sh b/scripts/rename_project.sh index d89c353..493a619 100755 --- a/scripts/rename_project.sh +++ b/scripts/rename_project.sh @@ -1,5 +1,6 @@ #!/bin/bash mv python_template $1 +mv python_template.deps.yaml $1.deps.yaml find . \( -type d -name .git -prune \) -o \( -type f -not -name 'tasks.json' -not -name 'update_from_template.sh' -not -name 'update_from_template_ours.sh' \) -print0 | xargs -0 sed -i "s/python_template/$1/g" From 27c486b7aec41c8cf429a4a58e2762201cc771c6 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 15 Jun 2024 14:14:09 +0100 Subject: [PATCH 085/109] also rename the pyproject.toml --- scripts/rename_project.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/rename_project.sh b/scripts/rename_project.sh index 493a619..23594cd 100755 --- a/scripts/rename_project.sh +++ b/scripts/rename_project.sh @@ -1,6 +1,6 @@ #!/bin/bash -mv python_template $1 -mv python_template.deps.yaml $1.deps.yaml +mv python_template "$1" +mv python_template.deps.yaml "$1".deps.yaml find . \( -type d -name .git -prune \) -o \( -type f -not -name 'tasks.json' -not -name 'update_from_template.sh' -not -name 'update_from_template_ours.sh' \) -print0 | xargs -0 sed -i "s/python_template/$1/g" From 23fb607e89db1cf63fdea006353624f1b8ebf2d9 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 15 Jun 2024 14:14:23 +0100 Subject: [PATCH 086/109] remove fixed pixi version --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 016eaa1..930af95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,6 @@ jobs: uses: actions/checkout@v4 - uses: prefix-dev/setup-pixi@v0.8.1 with: - pixi-version: v0.23.0 cache: true frozen: true environments: ${{ matrix.environment }} From f4031c8551cb511a571f967d1f9ffa599cf3d04f Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 15 Jun 2024 17:49:28 +0100 Subject: [PATCH 087/109] try renaming container instead of stopping it --- scripts/launch_vscode.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/launch_vscode.sh b/scripts/launch_vscode.sh index 0f65723..132f29e 100755 --- a/scripts/launch_vscode.sh +++ b/scripts/launch_vscode.sh @@ -12,16 +12,16 @@ cd "$SCRIPT_DIR"/.. git submodule update --init --recursive CONTAINER_NAME=${PWD##*/} +# CONTAINER_NAME="${PWD##*/}_$(date +%Y-%m-%d_%H-%M-%S)" echo "stopping existing container" "$CONTAINER_NAME" -docker stop "$CONTAINER_NAME" || true +# docker stop "$CONTAINER_NAME" || true +docker rename "$CONTAINER_NAME" "${CONTAINER_NAME}_$(date +%Y-%m-%d_%H-%M-%S)" || true + CONTAINER_HEX=$(printf $CONTAINER_NAME | xxd -p | tr '\n' ' ' | sed 's/\\s//g' | tr -d ' '); rocker --nvidia --x11 --user --pull --git --image-name "$CONTAINER_NAME" --name "$CONTAINER_NAME" --volume "${PWD}":/workspaces/"${CONTAINER_NAME}":Z --deps --oyr-run-arg " --detach" ubuntu:22.04 -# docker pull ghcr.io/red5d/docker-autocompose:latest -# docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/red5d/docker-autocompose $CONTAINER_NAME > .devcontainer/docker-compose.yaml - #this follows the same convention as if it were opened by a vscode devcontainer code --folder-uri vscode-remote://attached-container+"$CONTAINER_HEX"/workspaces/"${CONTAINER_NAME}" \ No newline at end of file From f2ec370d314dbb5d58c298bf8185f41d2b6a9b24 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sat, 15 Jun 2024 17:50:09 +0100 Subject: [PATCH 088/109] update pixi.lock --- pixi.lock | 75 ++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/pixi.lock b/pixi.lock index 69e9bf0..0157814 100644 --- a/pixi.lock +++ b/pixi.lock @@ -11,11 +11,11 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_4.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_9.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_9.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda @@ -61,11 +61,11 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_4.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_9.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_9.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda @@ -105,10 +105,10 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_4.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_9.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_9.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda @@ -157,11 +157,11 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_4.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_9.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_9.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda @@ -526,19 +526,18 @@ packages: - kind: conda name: ld_impl_linux-64 version: '2.40' - build: hf3520f5_3 - build_number: 3 + build: hf3520f5_4 + build_number: 4 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_3.conda - sha256: 002d48084157a23c7e40a9b225bab95ea02ac6cb9267aa7739da2a3491bb0220 - md5: 7c1062eaa78dec4ea8a9a988dbda6045 + url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_4.conda + sha256: 5f1638202f19cac8ede2800c31eb0b2b206f0c4a2c4ff12ab6592115ad128748 + md5: 02d936b69ab683fc6755c236996f8b51 constrains: - binutils_impl_linux-64 2.40 license: GPL-3.0-only - license_family: GPL purls: [] - size: 713873 - timestamp: 1717997303330 + size: 711051 + timestamp: 1718387155980 - kind: conda name: libexpat version: 2.6.2 @@ -575,38 +574,36 @@ packages: - kind: conda name: libgcc-ng version: 13.2.0 - build: h77fa898_8 - build_number: 8 + build: h77fa898_9 + build_number: 9 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_8.conda - sha256: 849ed1de90ee9d668c5d80e6728dca3d97e10d05b365d212b84197cf1874a7ca - md5: a579489cacbe7775680d40704a537553 + url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_9.conda + sha256: 99766cf453f4d5ed78b8446d81de99a5fe243dea0d73cf402454f81c136c7d7d + md5: f23bc130bc3d2bbd9d9d6892609546ea depends: - _libgcc_mutex 0.1 conda_forge - _openmp_mutex >=4.5 constrains: - - libgomp 13.2.0 h77fa898_8 + - libgomp 13.2.0 h77fa898_9 license: GPL-3.0-only WITH GCC-exception-3.1 - license_family: GPL purls: [] - size: 795760 - timestamp: 1718209341553 + size: 802398 + timestamp: 1718351812596 - kind: conda name: libgomp version: 13.2.0 - build: h77fa898_8 - build_number: 8 + build: h77fa898_9 + build_number: 9 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_8.conda - sha256: 9ef0f93d87e12a8bc93b950801789a856497d7b3f5ed1476b9b465db24f3047e - md5: 43820d2a9bac31b9c84ecbeef32375b3 + url: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_9.conda + sha256: 6f32059e844348ef090e3c1727017cc3c277ebd16038c6dcf7098057b385591a + md5: 0d0ad0fdee21442a479005ef5f3a02e8 depends: - _libgcc_mutex 0.1 conda_forge license: GPL-3.0-only WITH GCC-exception-3.1 - license_family: GPL purls: [] - size: 444169 - timestamp: 1718209252805 + size: 444496 + timestamp: 1718351734049 - kind: conda name: libnsl version: 2.0.1 @@ -939,7 +936,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 5f6b1959b85a85f1634735091b4355f6bae89d280eb5edfaf6890088d82a697c + sha256: 6d8c62393091f75399313afd9f91e3befe2f38eaead4ff2623c9bfad2636db88 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.3 ; extra == 'test' @@ -983,7 +980,7 @@ packages: - urllib3<3,>=1.21.1 - certifi>=2017.4.17 - pysocks!=1.5.7,>=1.5.6 ; extra == 'socks' - - chardet<6,>=3.0.2 ; extra == 'use_chardet_on_py3' + - chardet<6,>=3.0.2 ; extra == 'use-chardet-on-py3' requires_python: '>=3.8' - kind: pypi name: rocker From e3c54acb0ac2db3e4a1f8de27ccbce74d61231a3 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 16 Jun 2024 11:57:47 +0100 Subject: [PATCH 089/109] clean up deps.yaml for python template --- python_template.deps.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python_template.deps.yaml b/python_template.deps.yaml index ac2cfad..5c2cee8 100644 --- a/python_template.deps.yaml +++ b/python_template.deps.yaml @@ -1,12 +1,16 @@ apt_sources: - curl - - ca-certificates apt_tools: - git - git-lfs + - python3-pip - apt-utils - jq +pip_language-toolchain: + - flit #pixi autocomplete does not work with this removed, #TODO fix + - pip #updates to latest pip + script_pixi-user: - scripts/install_pixi.sh \ No newline at end of file From 38a00f21b3c283c88ef26c87abe3124e3100f909 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 16 Jun 2024 12:33:41 +0100 Subject: [PATCH 090/109] remove devenv --- pyproject.toml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2eb887e..9272698 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,9 +22,6 @@ python = "3.11.*" [tool.pixi.pypi-dependencies] python_template = { path = ".", editable = true } -[tool.pixi.feature.devenv.pypi-dependencies] -deps-rocker = ">=0.2" - [project.optional-dependencies] test = [ "black>=23,<=24.4.2", @@ -49,10 +46,6 @@ build-backend = "setuptools.build_meta" default = {features = ["test"], solve-group = "default" } py310 = ["py310","test"] py311 = ["py311","test"] -devenv ={features = ["devenv"], solve-group = "devenv" } - -[tool.pixi.feature.devenv.tasks] -code = "scripts/launch_vscode.sh" [tool.pixi.tasks] format = "black ." From d0fa7036d5292d1550a0dc19e6e1c48227f5ce04 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Sun, 16 Jun 2024 12:35:33 +0100 Subject: [PATCH 091/109] update pixi.lock --- pixi.lock | 239 ++++++++---------------------------------------------- 1 file changed, 32 insertions(+), 207 deletions(-) diff --git a/pixi.lock b/pixi.lock index 0157814..6f804cd 100644 --- a/pixi.lock +++ b/pixi.lock @@ -11,11 +11,11 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_4.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_6.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_9.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_9.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_10.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_10.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda @@ -50,50 +50,6 @@ environments: - pypi: https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/73/6d/b5406752c4e4ba86692b22fab0afed8b48f16bdde8f92e1d852976b61dc6/tomlkit-0.12.5-py3-none-any.whl - pypi: . - devenv: - channels: - - url: https://conda.anaconda.org/conda-forge/ - indexes: - - https://pypi.org/simple - packages: - linux-64: - - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_4.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_9.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_9.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4ab18f5_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2 - - pypi: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/ee/fb/14d30eb4956408ee3ae09ad34299131fb383c47df355ddb428a7331cfa1e/charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz - - pypi: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/b4/33/720548182ffa8344418126017aa1d4ab4aeec9a2275f04ce3f3573d8ace8/PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/58/de/793f52c3a91a39f7d40a10818aaaecf052ebdd73ef64455a8c79362931b0/rocker-0.2.16-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - - pypi: . py310: channels: - url: https://conda.anaconda.org/conda-forge/ @@ -105,10 +61,10 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_4.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_6.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_9.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_9.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_10.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_10.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda @@ -157,11 +113,11 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_4.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_6.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_9.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_9.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_10.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_10.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.46.0-hde9e2c9_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda @@ -353,18 +309,6 @@ packages: purls: [] size: 156035 timestamp: 1717311767102 -- kind: pypi - name: certifi - version: 2024.6.2 - url: https://files.pythonhosted.org/packages/5b/11/1e78951465b4a225519b8c3ad29769c49e0d8d157a070f681d5b6d64737f/certifi-2024.6.2-py3-none-any.whl - sha256: ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56 - requires_python: '>=3.6' -- kind: pypi - name: charset-normalizer - version: 3.3.2 - url: https://files.pythonhosted.org/packages/ee/fb/14d30eb4956408ee3ae09ad34299131fb383c47df355ddb428a7331cfa1e/charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b - requires_python: '>=3.7.0' - kind: pypi name: click version: 8.1.7 @@ -398,24 +342,6 @@ packages: requires_dist: - tomli ; python_full_version <= '3.11.0a6' and extra == 'toml' requires_python: '>=3.8' -- kind: pypi - name: deps-rocker - version: 0.2.0 - url: https://files.pythonhosted.org/packages/57/56/0a94b673aadaad03167d6849bbd92b0c8d2b0524f9c0b436279f578fec0e/deps_rocker-0.2.0-py3-none-any.whl - sha256: 72e831c44ef11e2094f987576f571f014a7f33bd39079c62bf122025b6deae9e - requires_dist: - - rocker - - pyyaml - - off-your-rocker - - toml - - black>=23,<=24.4.2 ; extra == 'test' - - pylint>=2.16,<=3.2.0 ; extra == 'test' - - pytest-cov>=4.1,<=5.0.0 ; extra == 'test' - - pytest>=7.4,<=8.2.0 ; extra == 'test' - - hypothesis>=6.82,<=6.102.4 ; extra == 'test' - - ruff>=0.0.280,<=0.4.4 ; extra == 'test' - - coverage>=7.2.7,<=7.5.1 ; extra == 'test' - requires_python: '>=3.10' - kind: pypi name: dill version: 0.3.8 @@ -425,31 +351,6 @@ packages: - objgraph>=1.7.2 ; extra == 'graph' - gprof2dot>=2022.7.29 ; extra == 'profile' requires_python: '>=3.8' -- kind: pypi - name: docker - version: 7.1.0 - url: https://files.pythonhosted.org/packages/e3/26/57c6fb270950d476074c087527a558ccb6f4436657314bfb6cdf484114c4/docker-7.1.0-py3-none-any.whl - sha256: c96b93b7f0a746f9e77d325bcfb87422a3d8bd4f03136ae8a85b37f1898d5fc0 - requires_dist: - - pywin32>=304 ; sys_platform == 'win32' - - requests>=2.26.0 - - urllib3>=1.26.0 - - coverage==7.2.7 ; extra == 'dev' - - pytest-cov==4.1.0 ; extra == 'dev' - - pytest-timeout==2.1.0 ; extra == 'dev' - - pytest==7.4.2 ; extra == 'dev' - - ruff==0.1.8 ; extra == 'dev' - - myst-parser==0.18.0 ; extra == 'docs' - - sphinx==5.1.1 ; extra == 'docs' - - paramiko>=2.4.3 ; extra == 'ssh' - - websocket-client>=1.3.0 ; extra == 'websockets' - requires_python: '>=3.8' -- kind: pypi - name: empy - version: '4.1' - url: https://files.pythonhosted.org/packages/b5/ca/97dc5fbc51daf1626c1a773aca86c058574a615b47cc47854e835e71e27a/empy-4.1.tar.gz - sha256: 9d712e97c1395859be13d2b45788c9186cd97f1c04dac510399130f328643367 - requires_python: '>=2.3' - kind: pypi name: exceptiongroup version: 1.2.1 @@ -503,12 +404,6 @@ packages: - backports-zoneinfo>=0.2.1 ; python_version < '3.9' and extra == 'zoneinfo' - tzdata>=2024.1 ; (sys_platform == 'win32' or sys_platform == 'emscripten') and extra == 'zoneinfo' requires_python: '>=3.8' -- kind: pypi - name: idna - version: '3.7' - url: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl - sha256: 82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0 - requires_python: '>=3.5' - kind: pypi name: iniconfig version: 2.0.0 @@ -526,18 +421,18 @@ packages: - kind: conda name: ld_impl_linux-64 version: '2.40' - build: hf3520f5_4 - build_number: 4 + build: hf3520f5_6 + build_number: 6 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_4.conda - sha256: 5f1638202f19cac8ede2800c31eb0b2b206f0c4a2c4ff12ab6592115ad128748 - md5: 02d936b69ab683fc6755c236996f8b51 + url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_6.conda + sha256: f3ed562d9b21ad01cba3de368ee869b3424ed7fd93b550a7d4c57ae219d243ee + md5: deae631c9a587b4cfd33aa082491329b constrains: - binutils_impl_linux-64 2.40 license: GPL-3.0-only purls: [] - size: 711051 - timestamp: 1718387155980 + size: 708001 + timestamp: 1718519178402 - kind: conda name: libexpat version: 2.6.2 @@ -574,36 +469,36 @@ packages: - kind: conda name: libgcc-ng version: 13.2.0 - build: h77fa898_9 - build_number: 9 + build: h77fa898_10 + build_number: 10 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_9.conda - sha256: 99766cf453f4d5ed78b8446d81de99a5fe243dea0d73cf402454f81c136c7d7d - md5: f23bc130bc3d2bbd9d9d6892609546ea + url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_10.conda + sha256: 78931358d83ff585d0cd448632366a5cbe6bcf41a66c07e8178200008127c2b5 + md5: bbb96c5e7a11ef8ca2b666fe9fe3d199 depends: - _libgcc_mutex 0.1 conda_forge - _openmp_mutex >=4.5 constrains: - - libgomp 13.2.0 h77fa898_9 + - libgomp 13.2.0 h77fa898_10 license: GPL-3.0-only WITH GCC-exception-3.1 purls: [] - size: 802398 - timestamp: 1718351812596 + size: 802677 + timestamp: 1718485010755 - kind: conda name: libgomp version: 13.2.0 - build: h77fa898_9 - build_number: 9 + build: h77fa898_10 + build_number: 10 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_9.conda - sha256: 6f32059e844348ef090e3c1727017cc3c277ebd16038c6dcf7098057b385591a - md5: 0d0ad0fdee21442a479005ef5f3a02e8 + url: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_10.conda + sha256: bcea6ddfea86f0e6a1a831d1d2c3f36f7613b5e447229e19f978ded0d184cf5a + md5: 9404d1686e63142d41acc72ef876a588 depends: - _libgcc_mutex 0.1 conda_forge license: GPL-3.0-only WITH GCC-exception-3.1 purls: [] - size: 444496 - timestamp: 1718351734049 + size: 444719 + timestamp: 1718484940121 - kind: conda name: libnsl version: 2.0.1 @@ -708,13 +603,6 @@ packages: purls: [] size: 887465 timestamp: 1715194722503 -- kind: pypi - name: off-your-rocker - version: 0.1.0 - url: https://files.pythonhosted.org/packages/d6/5a/d984ea60fe2bb01abee5cd353a2dd63106c53f27d7dc3ad9f2c1a8cbbc98/off_your_rocker-0.1.0-py3-none-any.whl - sha256: d59930ae0ae66e3a4618e0432a2406f22ca6a896198d74efa480592082174858 - requires_dist: - - rocker - kind: conda name: openssl version: 3.3.1 @@ -745,13 +633,6 @@ packages: url: https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl sha256: a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08 requires_python: '>=3.8' -- kind: pypi - name: pexpect - version: 4.9.0 - url: https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl - sha256: 7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523 - requires_dist: - - ptyprocess>=0.5 - kind: pypi name: platformdirs version: 4.2.2 @@ -780,11 +661,6 @@ packages: - pytest ; extra == 'testing' - pytest-benchmark ; extra == 'testing' requires_python: '>=3.8' -- kind: pypi - name: ptyprocess - version: 0.7.0 - url: https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl - sha256: 4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35 - kind: pypi name: pylint version: 3.2.3 @@ -936,7 +812,7 @@ packages: name: python-template version: 0.2.0 path: . - sha256: 6d8c62393091f75399313afd9f91e3befe2f38eaead4ff2623c9bfad2636db88 + sha256: 64221bae4539a9118606ec7c6a20463cb092576b0724b92eb8002553cd509611 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.3 ; extra == 'test' @@ -946,12 +822,6 @@ packages: - ruff>=0.0.280,<=0.4.8 ; extra == 'test' - coverage>=7.2.7,<=7.5.3 ; extra == 'test' editable: true -- kind: pypi - name: pyyaml - version: 6.0.1 - url: https://files.pythonhosted.org/packages/b4/33/720548182ffa8344418126017aa1d4ab4aeec9a2275f04ce3f3573d8ace8/PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256: 6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0 - requires_python: '>=3.6' - kind: conda name: readline version: '8.2' @@ -969,33 +839,6 @@ packages: purls: [] size: 281456 timestamp: 1679532220005 -- kind: pypi - name: requests - version: 2.32.3 - url: https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl - sha256: 70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6 - requires_dist: - - charset-normalizer<4,>=2 - - idna<4,>=2.5 - - urllib3<3,>=1.21.1 - - certifi>=2017.4.17 - - pysocks!=1.5.7,>=1.5.6 ; extra == 'socks' - - chardet<6,>=3.0.2 ; extra == 'use-chardet-on-py3' - requires_python: '>=3.8' -- kind: pypi - name: rocker - version: 0.2.16 - url: https://files.pythonhosted.org/packages/58/de/793f52c3a91a39f7d40a10818aaaecf052ebdd73ef64455a8c79362931b0/rocker-0.2.16-py3-none-any.whl - sha256: 75ab38a9ee37ce55ab8dbd71688b578e6f2e7ffc63852d5b10523ff764b28791 - requires_dist: - - empy - - pexpect - - packaging - - urllib3 - - docker - - importlib-metadata ; python_version < '3.8' - - pytest ; extra == 'test' - requires_python: '>=3.0' - kind: pypi name: ruff version: 0.4.8 @@ -1024,12 +867,6 @@ packages: purls: [] size: 3318875 timestamp: 1699202167581 -- kind: pypi - name: toml - version: 0.10.2 - url: https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl - sha256: 806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b - requires_python: '>=2.6,!=3.0.*,!=3.1.*,!=3.2.*' - kind: pypi name: tomli version: 2.0.1 @@ -1061,18 +898,6 @@ packages: purls: [] size: 119815 timestamp: 1706886945727 -- kind: pypi - name: urllib3 - version: 2.2.1 - url: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl - sha256: 450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d - requires_dist: - - brotli>=1.0.9 ; platform_python_implementation == 'CPython' and extra == 'brotli' - - brotlicffi>=0.8.0 ; platform_python_implementation != 'CPython' and extra == 'brotli' - - h2<5,>=4 ; extra == 'h2' - - pysocks!=1.5.7,<2.0,>=1.5.6 ; extra == 'socks' - - zstandard>=0.18.0 ; extra == 'zstd' - requires_python: '>=3.8' - kind: conda name: xz version: 5.2.6 From e86f60e74c8a1489ff1efa5642a053291364c038 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 19 Jun 2024 18:40:16 +0100 Subject: [PATCH 092/109] add logic for merging lock files --- .gitattributes | 5 ++++- pyproject.toml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 344f367..6e7527b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -42,5 +42,8 @@ # numpy file format *.npy filter=lfs diff=lfs merge=lfs -text # GitHub syntax highlighting -pixi.lock linguist-language=YAML +pixi.lock linguist-language=YAML merge=ourslock + + + diff --git a/pyproject.toml b/pyproject.toml index 9272698..37c9e71 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,6 +65,7 @@ ci-no-cover = { depends_on = ["style", "test"] } ci = { depends_on = ["format","ruff-lint","check-clean-workspace","pylint", "coverage", "coverage-report"] } ci-push = {depends_on=["format","ruff-lint","update-lock","ci","push"]} clear-pixi = "rm -rf .pixi pixi.lock" +setup-git-merge-driver = "git config merge.ourslock.driver true" [tool.setuptools.packages.find] From 712323eb95d46472dc6823373815b9cb3d0b33fa Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 19 Jun 2024 18:40:50 +0100 Subject: [PATCH 093/109] remove stray lines --- .gitattributes | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 6e7527b..d32e0e9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -42,8 +42,4 @@ # numpy file format *.npy filter=lfs diff=lfs merge=lfs -text # GitHub syntax highlighting -pixi.lock linguist-language=YAML merge=ourslock - - - - +pixi.lock linguist-language=YAML merge=ourslock \ No newline at end of file From cfd2e5be66089d7607e2f4cb05c42503a93b7f1f Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 19 Jun 2024 18:43:35 +0100 Subject: [PATCH 094/109] update scripts --- scripts/launch_vscode.sh | 32 +++++++++++++++++++++++++++- scripts/setup_host.sh | 3 +-- scripts/update_from_template_ours.sh | 10 --------- 3 files changed, 32 insertions(+), 13 deletions(-) delete mode 100755 scripts/update_from_template_ours.sh diff --git a/scripts/launch_vscode.sh b/scripts/launch_vscode.sh index 132f29e..22014e4 100755 --- a/scripts/launch_vscode.sh +++ b/scripts/launch_vscode.sh @@ -18,10 +18,40 @@ echo "stopping existing container" "$CONTAINER_NAME" # docker stop "$CONTAINER_NAME" || true docker rename "$CONTAINER_NAME" "${CONTAINER_NAME}_$(date +%Y-%m-%d_%H-%M-%S)" || true - CONTAINER_HEX=$(printf $CONTAINER_NAME | xxd -p | tr '\n' ' ' | sed 's/\\s//g' | tr -d ' '); +#!/bin/bash + +if ! dpkg -l | grep -q python3-venv; then + echo "python3-venv is not installed. Installing..." + sudo apt-get update + sudo apt-get install -y python3-venv +else + echo "python3-venv is already installed." +fi + +# Define the directory for the virtual environment +VENV_DIR="venv" + +# Check if the virtual environment directory exists +if [ ! -d "$VENV_DIR" ]; then + echo "Creating virtual environment in $VENV_DIR..." + python3 -m venv "$VENV_DIR" + echo "Activating the virtual environment..." + source "$VENV_DIR/bin/activate" + echo "Installing deps rocker..." + pip install deps_rocker + echo "Virtual environment setup and deps rocker installation complete." +else + echo "Virtual environment already exists in $VENV_DIR." + echo "Activating the existing virtual environment..." + source "$VENV_DIR/bin/activate" +fi + +# Run the rocker command with the specified parameters rocker --nvidia --x11 --user --pull --git --image-name "$CONTAINER_NAME" --name "$CONTAINER_NAME" --volume "${PWD}":/workspaces/"${CONTAINER_NAME}":Z --deps --oyr-run-arg " --detach" ubuntu:22.04 +deactivate + #this follows the same convention as if it were opened by a vscode devcontainer code --folder-uri vscode-remote://attached-container+"$CONTAINER_HEX"/workspaces/"${CONTAINER_NAME}" \ No newline at end of file diff --git a/scripts/setup_host.sh b/scripts/setup_host.sh index 6a7686e..75d6173 100755 --- a/scripts/setup_host.sh +++ b/scripts/setup_host.sh @@ -44,8 +44,7 @@ sudo systemctl restart docker sudo apt install git-lfs #Install rocker and rocker extensions which are used to launch the devcontainer -pip install rocker off-your-rocker git+https://github.com/blooop/deps_rocker - +# pip install rocker off-your-rocker git+https://github.com/blooop/deps_rocker echo "testing docker install" diff --git a/scripts/update_from_template_ours.sh b/scripts/update_from_template_ours.sh deleted file mode 100755 index 3cfb1ee..0000000 --- a/scripts/update_from_template_ours.sh +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/bash - -git config --global pull.rebase false -git remote add template https://github.com/blooop/python_template.git -git fetch --all -git checkout main && git pull origin main -git checkout -B feature/update_from_template; git pull -git merge template/main --strategy-option ours --allow-unrelated-histories -m 'feat: pull changes from remote template' -git remote remove template -git push origin feature/update_from_template \ No newline at end of file From 65b56800affa59099a21f320f60f8b2ec3ae3bfe Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 19 Jun 2024 18:44:22 +0100 Subject: [PATCH 095/109] update pixi.lock --- pixi.lock | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/pixi.lock b/pixi.lock index 6f804cd..fa243e4 100644 --- a/pixi.lock +++ b/pixi.lock @@ -11,7 +11,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_6.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_10.conda @@ -23,7 +23,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.3.1-h4ab18f5_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.1-h4ab18f5_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.4-h194c7f8_0_cpython.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.conda - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2024a-h0c530f3_0.conda @@ -61,7 +61,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_6.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_10.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h77fa898_10.conda @@ -113,7 +113,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.6.2-hbcca054_0.conda - - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_6.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_7.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.6.2-h59595ed_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h77fa898_10.conda @@ -421,18 +421,19 @@ packages: - kind: conda name: ld_impl_linux-64 version: '2.40' - build: hf3520f5_6 - build_number: 6 + build: hf3520f5_7 + build_number: 7 subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_6.conda - sha256: f3ed562d9b21ad01cba3de368ee869b3424ed7fd93b550a7d4c57ae219d243ee - md5: deae631c9a587b4cfd33aa082491329b + url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-hf3520f5_7.conda + sha256: 764b6950aceaaad0c67ef925417594dd14cd2e22fff864aeef455ac259263d15 + md5: b80f2f396ca2c28b8c14c437a4ed1e74 constrains: - binutils_impl_linux-64 2.40 license: GPL-3.0-only + license_family: GPL purls: [] - size: 708001 - timestamp: 1718519178402 + size: 707602 + timestamp: 1718625640445 - kind: conda name: libexpat version: 2.6.2 @@ -481,6 +482,7 @@ packages: constrains: - libgomp 13.2.0 h77fa898_10 license: GPL-3.0-only WITH GCC-exception-3.1 + license_family: GPL purls: [] size: 802677 timestamp: 1718485010755 @@ -496,6 +498,7 @@ packages: depends: - _libgcc_mutex 0.1 conda_forge license: GPL-3.0-only WITH GCC-exception-3.1 + license_family: GPL purls: [] size: 444719 timestamp: 1718484940121 @@ -779,12 +782,12 @@ packages: timestamp: 1713553104915 - kind: conda name: python - version: 3.12.3 - build: hab00c5b_0_cpython + version: 3.12.4 + build: h194c7f8_0_cpython subdir: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.3-hab00c5b_0_cpython.conda - sha256: f9865bcbff69f15fd89a33a2da12ad616e98d65ce7c83c644b92e66e5016b227 - md5: 2540b74d304f71d3e89c81209db4db84 + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.12.4-h194c7f8_0_cpython.conda + sha256: 97a78631e6c928bf7ad78d52f7f070fcf3bd37619fa48dc4394c21cf3058cdee + md5: d73490214f536cccb5819e9873048c92 depends: - bzip2 >=1.0.8,<2.0a0 - ld_impl_linux-64 >=2.36.1 @@ -792,12 +795,12 @@ packages: - libffi >=3.4,<4.0a0 - libgcc-ng >=12 - libnsl >=2.0.1,<2.1.0a0 - - libsqlite >=3.45.2,<4.0a0 + - libsqlite >=3.46.0,<4.0a0 - libuuid >=2.38.1,<3.0a0 - libxcrypt >=4.4.36 - - libzlib >=1.2.13,<2.0.0a0 - - ncurses >=6.4.20240210,<7.0a0 - - openssl >=3.2.1,<4.0a0 + - libzlib >=1.3.1,<2.0a0 + - ncurses >=6.5,<7.0a0 + - openssl >=3.3.1,<4.0a0 - readline >=8.2,<9.0a0 - tk >=8.6.13,<8.7.0a0 - tzdata @@ -806,13 +809,13 @@ packages: - python_abi 3.12.* *_cp312 license: Python-2.0 purls: [] - size: 31991381 - timestamp: 1713208036041 + size: 32073625 + timestamp: 1718621771849 - kind: pypi name: python-template version: 0.2.0 path: . - sha256: 64221bae4539a9118606ec7c6a20463cb092576b0724b92eb8002553cd509611 + sha256: 48050b24571ce4e2542d859c53d46805b1f2bc7cf1f376c04d866188bb0b8838 requires_dist: - black>=23,<=24.4.2 ; extra == 'test' - pylint>=2.17.7,<=3.2.3 ; extra == 'test' From b16b044e835f711cde19f04a79ade594a79e17dc Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 19 Jun 2024 18:48:41 +0100 Subject: [PATCH 096/109] remove task --- .vscode/tasks.json | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6c133bf..93f4784 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -97,30 +97,13 @@ "detail": "Pull any changes from the template repo into this repo by adding it as a remote. The remote is removed at the end of the command. You may need to resolve merge conflicts", "type": "shell", "command": "scripts/update_from_template.sh" - }, - { - "label": "update from template repo keep ours", - "detail": "Pull any changes from the template repo into this repo by adding it as a remote. The remote is removed at the end of the command. You may need to resolve merge conflicts", - "type": "shell", - "command": "scripts/update_from_template_ours.sh" - }, + }, { "label": "rename template project", "detail": "Replaces all instances of the template project name with a new name. ", "type": "shell", "command": "scripts/rename_project.sh ${input:new_project_name}" - }, - { - "label": "first time setup of project", - "detail": "Pulls updates from the template repo and replaces all instances of the template project name with a new name.", - "type": "shell", - "dependsOn": [ - "update from template repo", - "rename template project name and commit", - "update from template repo keep ours" - ], - "dependsOrder": "sequence", - }, + }, { "label": "flit install", "type": "shell", From 6840f4e590fc7380457e8af62f4c7346ec88a991 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 19 Jun 2024 18:50:03 +0100 Subject: [PATCH 097/109] add script for updating from repo template --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 37c9e71..181d0f3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,6 +66,7 @@ ci = { depends_on = ["format","ruff-lint","check-clean-workspace","pylint", "cov ci-push = {depends_on=["format","ruff-lint","update-lock","ci","push"]} clear-pixi = "rm -rf .pixi pixi.lock" setup-git-merge-driver = "git config merge.ourslock.driver true" +update-from-repo-template = "./scripts/update_from_template" [tool.setuptools.packages.find] From 006da820cf65d843f4bd254f89c18819ee1df513 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 19 Jun 2024 18:50:28 +0100 Subject: [PATCH 098/109] update task name --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 181d0f3..0e29794 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,7 +66,7 @@ ci = { depends_on = ["format","ruff-lint","check-clean-workspace","pylint", "cov ci-push = {depends_on=["format","ruff-lint","update-lock","ci","push"]} clear-pixi = "rm -rf .pixi pixi.lock" setup-git-merge-driver = "git config merge.ourslock.driver true" -update-from-repo-template = "./scripts/update_from_template" +update-from-template-repo = "./scripts/update_from_template" [tool.setuptools.packages.find] From defa985c08f4514529f888d0c4470887b1be1f1b Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 19 Jun 2024 18:51:05 +0100 Subject: [PATCH 099/109] fix cmd --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0e29794..4a5c427 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,7 +66,7 @@ ci = { depends_on = ["format","ruff-lint","check-clean-workspace","pylint", "cov ci-push = {depends_on=["format","ruff-lint","update-lock","ci","push"]} clear-pixi = "rm -rf .pixi pixi.lock" setup-git-merge-driver = "git config merge.ourslock.driver true" -update-from-template-repo = "./scripts/update_from_template" +update-from-template-repo = "./scripts/update_from_template.sh" [tool.setuptools.packages.find] From f23d435f08fff1ea6d27c6d9091bf5f579cffe4d Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 19 Jun 2024 19:41:15 +0100 Subject: [PATCH 100/109] alwasy pass update lock --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4a5c427..840b84f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ commit-format = "git commit -a -m'autoformat code'" test = "pytest" coverage = "coverage run -m pytest && coverage xml -o coverage.xml" coverage-report = "coverage report -m" -update-lock = "pixi update && git commit -a -m'update pixi.lock'" +update-lock = "pixi update && git commit -a -m'update pixi.lock' || true" push = "git push" update-lock-push = { depends_on = ["update-lock", "push"] } ci-no-cover = { depends_on = ["style", "test"] } From e98bdbb115ea3f37ba3d109fec693686f6dfd189 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 19 Jun 2024 19:49:25 +0100 Subject: [PATCH 101/109] move setuptools.package.find --- pyproject.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 840b84f..b84c9fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,6 +41,9 @@ Home = "https://github.com/blooop/python_template" requires = ["setuptools"] build-backend = "setuptools.build_meta" +[tool.setuptools.packages.find] +include= ["python_template"] + # Environments [tool.pixi.environments] default = {features = ["test"], solve-group = "default" } @@ -61,6 +64,7 @@ coverage-report = "coverage report -m" update-lock = "pixi update && git commit -a -m'update pixi.lock' || true" push = "git push" update-lock-push = { depends_on = ["update-lock", "push"] } +fix = { depends_on = ["update-lock", "format", "ruff-lint"] } ci-no-cover = { depends_on = ["style", "test"] } ci = { depends_on = ["format","ruff-lint","check-clean-workspace","pylint", "coverage", "coverage-report"] } ci-push = {depends_on=["format","ruff-lint","update-lock","ci","push"]} @@ -69,8 +73,7 @@ setup-git-merge-driver = "git config merge.ourslock.driver true" update-from-template-repo = "./scripts/update_from_template.sh" -[tool.setuptools.packages.find] -include= ["python_template"] + [tool.pylint] extension-pkg-whitelist = ["numpy"] From 0a3155f46ec1d256b6802c4dfd01a0039cca0646 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 19 Jun 2024 19:51:46 +0100 Subject: [PATCH 102/109] add fix-commit-push --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index b84c9fc..ec40644 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,6 +65,7 @@ update-lock = "pixi update && git commit -a -m'update pixi.lock' || true" push = "git push" update-lock-push = { depends_on = ["update-lock", "push"] } fix = { depends_on = ["update-lock", "format", "ruff-lint"] } +fix-commit-push = { depends_on = ["fix", "commit-format", "update-lock-push"] } ci-no-cover = { depends_on = ["style", "test"] } ci = { depends_on = ["format","ruff-lint","check-clean-workspace","pylint", "coverage", "coverage-report"] } ci-push = {depends_on=["format","ruff-lint","update-lock","ci","push"]} From 104feb5e151073af80daea1a5e9d2593d03b8e90 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 19 Jun 2024 19:53:34 +0100 Subject: [PATCH 103/109] always pass git push --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ec40644..68d14e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,7 +57,7 @@ ruff-lint = "ruff check . --fix" pylint = "pylint --version && echo 'running pylint...' && pylint $(git ls-files '*.py')" lint = { depends_on = ["ruff-lint", "pylint"] } style = { depends_on = ["format","lint"]} -commit-format = "git commit -a -m'autoformat code'" +commit-format = "git commit -a -m'autoformat code' || true" test = "pytest" coverage = "coverage run -m pytest && coverage xml -o coverage.xml" coverage-report = "coverage report -m" From a19c8ce0cbd3f2e282992379cd76cb9fb955d3df Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Mon, 24 Jun 2024 10:00:59 +0100 Subject: [PATCH 104/109] Update tasks.json --- .vscode/tasks.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 93f4784..58283ad 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -130,6 +130,12 @@ "type": "shell", "command": "scripts/launch_vscode.sh" }, + { + "label": "launch container no cache", + "detail": "Uses rocker to launch a container and spawns a new vscode window attached to the container", + "type": "shell", + "command": "scripts/launch_vscode.sh --nocache" + }, { "label": "Install All Recommended Extensions", "type": "shell", @@ -165,4 +171,4 @@ "default": "python_template" } ] -} \ No newline at end of file +} From 2407d6b517b59441eab2fb0f011f58bf53fe24c9 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Mon, 24 Jun 2024 10:01:37 +0100 Subject: [PATCH 105/109] Update launch_vscode.sh --- scripts/launch_vscode.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/launch_vscode.sh b/scripts/launch_vscode.sh index 22014e4..e850433 100755 --- a/scripts/launch_vscode.sh +++ b/scripts/launch_vscode.sh @@ -49,9 +49,9 @@ else fi # Run the rocker command with the specified parameters -rocker --nvidia --x11 --user --pull --git --image-name "$CONTAINER_NAME" --name "$CONTAINER_NAME" --volume "${PWD}":/workspaces/"${CONTAINER_NAME}":Z --deps --oyr-run-arg " --detach" ubuntu:22.04 +rocker --nvidia --x11 --user --pull --git --image-name "$CONTAINER_NAME" --name "$CONTAINER_NAME" --volume "${PWD}":/workspaces/"${CONTAINER_NAME}":Z --deps --oyr-run-arg " --detach" ubuntu:22.04 "$@" deactivate #this follows the same convention as if it were opened by a vscode devcontainer -code --folder-uri vscode-remote://attached-container+"$CONTAINER_HEX"/workspaces/"${CONTAINER_NAME}" \ No newline at end of file +code --folder-uri vscode-remote://attached-container+"$CONTAINER_HEX"/workspaces/"${CONTAINER_NAME}" From 8ece0ecac8cab56b573e85b00197105adc451ab2 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Mon, 24 Jun 2024 10:06:45 +0100 Subject: [PATCH 106/109] Update launch_vscode.sh --- scripts/launch_vscode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/launch_vscode.sh b/scripts/launch_vscode.sh index e850433..25a50d9 100755 --- a/scripts/launch_vscode.sh +++ b/scripts/launch_vscode.sh @@ -40,7 +40,7 @@ if [ ! -d "$VENV_DIR" ]; then echo "Activating the virtual environment..." source "$VENV_DIR/bin/activate" echo "Installing deps rocker..." - pip install deps_rocker + pip install deps-rocker echo "Virtual environment setup and deps rocker installation complete." else echo "Virtual environment already exists in $VENV_DIR." From 9ddc06dcb8a4e5122607098747d4acb3afe9062e Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Mon, 24 Jun 2024 10:21:52 +0100 Subject: [PATCH 107/109] Update launch_vscode.sh --- scripts/launch_vscode.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/launch_vscode.sh b/scripts/launch_vscode.sh index 25a50d9..be5a332 100755 --- a/scripts/launch_vscode.sh +++ b/scripts/launch_vscode.sh @@ -38,14 +38,14 @@ if [ ! -d "$VENV_DIR" ]; then echo "Creating virtual environment in $VENV_DIR..." python3 -m venv "$VENV_DIR" echo "Activating the virtual environment..." - source "$VENV_DIR/bin/activate" + source $VENV_DIR/bin/activate echo "Installing deps rocker..." pip install deps-rocker echo "Virtual environment setup and deps rocker installation complete." else echo "Virtual environment already exists in $VENV_DIR." echo "Activating the existing virtual environment..." - source "$VENV_DIR/bin/activate" + source $VENV_DIR/bin/activate fi # Run the rocker command with the specified parameters From e3b50a407adc8b88e639b247d60bcf769513a8f2 Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Wed, 3 Jul 2024 13:37:34 +0100 Subject: [PATCH 108/109] add back devenv --- pyproject.toml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 68d14e4..6c30e85 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,6 +19,12 @@ python = "3.10.*" [tool.pixi.feature.py311.dependencies] python = "3.11.*" +#an environment for launching vscode with rocker and deps_rocker +[tool.pixi.feature.devenv] +dependencies = { python = "3.10" } +pypi-dependencies = { deps-rocker = ">=0.2" } +tasks = { code = "scripts/launch_vscode.sh" } + [tool.pixi.pypi-dependencies] python_template = { path = ".", editable = true } @@ -49,6 +55,9 @@ include= ["python_template"] default = {features = ["test"], solve-group = "default" } py310 = ["py310","test"] py311 = ["py311","test"] +devenv = { features = [ + "devenv", +], solve-group = "devenv", no-default-feature = true } [tool.pixi.tasks] format = "black ." From d494479db9903ea1fcbcba15562f4d5e7aa5c3ca Mon Sep 17 00:00:00 2001 From: Austin Gregg-Smith Date: Thu, 4 Jul 2024 10:26:07 +0100 Subject: [PATCH 109/109] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6c30e85..1b5418f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ python = "3.11.*" [tool.pixi.feature.devenv] dependencies = { python = "3.10" } pypi-dependencies = { deps-rocker = ">=0.2" } -tasks = { code = "scripts/launch_vscode.sh" } +tasks = { code = "scripts/launch_vscode.sh",code-nocache = "scripts/launch_vscode.sh --nocache" } [tool.pixi.pypi-dependencies] python_template = { path = ".", editable = true }