From 643e5e4a490516991849e4fc65a1433449f2de87 Mon Sep 17 00:00:00 2001 From: konsti Date: Tue, 9 Jan 2024 17:33:05 +0100 Subject: [PATCH] Use pdm for black editable as PEP 621 test case (#848) This gives us a PEP 621 test package in tree and increases the diversity for the editable tests a bit. --- crates/puffin-cli/tests/pip_install.rs | 4 +- crates/puffin-cli/tests/pip_sync.rs | 4 +- .../black_editable/.gitignore | 162 ++++++++++++++++++ .../black_editable/pyproject.toml | 22 ++- .../{black => src/black_editable}/__init__.py | 0 5 files changed, 180 insertions(+), 12 deletions(-) create mode 100644 scripts/editable-installs/black_editable/.gitignore rename scripts/editable-installs/black_editable/{black => src/black_editable}/__init__.py (100%) diff --git a/crates/puffin-cli/tests/pip_install.rs b/crates/puffin-cli/tests/pip_install.rs index c822db1cf..5255bc0e4 100644 --- a/crates/puffin-cli/tests/pip_install.rs +++ b/crates/puffin-cli/tests/pip_install.rs @@ -643,7 +643,7 @@ fn install_editable_and_registry() -> Result<()> { Resolved 1 package in [TIME] Installed 1 package in [TIME] - black==23.11.0 - + black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable/) + + black==0.1.0+editable (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable/) "###); }); @@ -693,7 +693,7 @@ fn install_editable_and_registry() -> Result<()> { Resolved 6 packages in [TIME] Downloaded 1 package in [TIME] Installed 1 package in [TIME] - - black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable/) + - black==0.1.0+editable (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable/) + black==23.10.0 "###); }); diff --git a/crates/puffin-cli/tests/pip_sync.rs b/crates/puffin-cli/tests/pip_sync.rs index 5cec3ea85..f23308d5b 100644 --- a/crates/puffin-cli/tests/pip_sync.rs +++ b/crates/puffin-cli/tests/pip_sync.rs @@ -2460,7 +2460,7 @@ fn sync_editable_and_registry() -> Result<()> { Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - black==24.1a1 - + black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable/) + + black==0.1.0+editable (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable/) "###); }); @@ -2537,7 +2537,7 @@ fn sync_editable_and_registry() -> Result<()> { Downloaded 1 package in [TIME] Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - - black==0.1.0 (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable/) + - black==0.1.0+editable (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable/) + black==23.10.0 warning: The package `black` requires `click >=8.0.0`, but it's not installed. warning: The package `black` requires `mypy-extensions >=0.4.3`, but it's not installed. diff --git a/scripts/editable-installs/black_editable/.gitignore b/scripts/editable-installs/black_editable/.gitignore new file mode 100644 index 000000000..3a8816c9e --- /dev/null +++ b/scripts/editable-installs/black_editable/.gitignore @@ -0,0 +1,162 @@ +# 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-project.org/#use-with-ide +.pdm.toml +.pdm-python +.pdm-build/ + +# 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/ diff --git a/scripts/editable-installs/black_editable/pyproject.toml b/scripts/editable-installs/black_editable/pyproject.toml index ff10712d5..ca17596ae 100644 --- a/scripts/editable-installs/black_editable/pyproject.toml +++ b/scripts/editable-installs/black_editable/pyproject.toml @@ -1,12 +1,18 @@ -[tool.poetry] +[project] name = "black" version = "0.1.0" -description = "" -authors = ["konstin "] - -[tool.poetry.dependencies] -python = "^3.10" +description = "Default template for PDM package" +authors = [ + {name = "konstin", email = "konstin@mailbox.org"}, +] +dependencies = [] +requires-python = ">=3.11,<3.13" +license = {text = "MIT"} [build-system] -requires = ["poetry-core"] -build-backend = "poetry.core.masonry.api" +requires = ["pdm-backend"] +build-backend = "pdm.backend" + + +[tool.pdm] +package-type = "library" diff --git a/scripts/editable-installs/black_editable/black/__init__.py b/scripts/editable-installs/black_editable/src/black_editable/__init__.py similarity index 100% rename from scripts/editable-installs/black_editable/black/__init__.py rename to scripts/editable-installs/black_editable/src/black_editable/__init__.py