Skip to content

build: Makefile pyenv fixes#18

Merged
chrisk314 merged 11 commits intomainfrom
build/makefile-pyenv-alt
Sep 17, 2024
Merged

build: Makefile pyenv fixes#18
chrisk314 merged 11 commits intomainfrom
build/makefile-pyenv-alt

Conversation

@chrisk314
Copy link
Contributor

Summary

Fixes Makefile commands to work correctly for both with and without pyenv cases

Changes

  • Fixes and improvements for Makefile with and without pyenv

@chrisk314 chrisk314 changed the title Build/makefile pyenv alt build: Makefile pyenv fixes Sep 17, 2024
@toby-coleman
Copy link
Contributor

Just ran this in Codespaces (which has no pyenv installed). Looks like it ran fine:

/bin/bash: line 1: pyenv: command not found
/workspaces/plugboard/.venv/bin/python -m pip install --upgrade pip setuptools poetry poetry-dynamic-versioning[plugin]
Requirement already satisfied: pip in ./.venv/lib/python3.12/site-packages (24.2)
Requirement already satisfied: setuptools in ./.venv/lib/python3.12/site-packages (74.0.0)
Collecting setuptools
  Downloading setuptools-75.1.0-py3-none-any.whl.metadata (6.9 kB)
Requirement already satisfied: poetry in ./.venv/lib/python3.12/site-packages (1.8.3)
Requirement already satisfied: poetry-dynamic-versioning[plugin] in ./.venv/lib/python3.12/site-packages (1.4.0)
Collecting poetry-dynamic-versioning[plugin]
  Downloading poetry_dynamic_versioning-1.4.1-py3-none-any.whl.metadata (19 kB)
Requirement already satisfied: build<2.0.0,>=1.0.3 in ./.venv/lib/python3.12/site-packages (from poetry) (1.2.1)
Requirement already satisfied: cachecontrol<0.15.0,>=0.14.0 in ./.venv/lib/python3.12/site-packages (from cachecontrol[filecache]<0.15.0,>=0.14.0->poetry) (0.14.0)
Requirement already satisfied: cleo<3.0.0,>=2.1.0 in ./.venv/lib/python3.12/site-packages (from poetry) (2.1.0)
Requirement already satisfied: crashtest<0.5.0,>=0.4.1 in ./.venv/lib/python3.12/site-packages (from poetry) (0.4.1)
Requirement already satisfied: dulwich<0.22.0,>=0.21.2 in ./.venv/lib/python3.12/site-packages (from poetry) (0.21.7)
Requirement already satisfied: fastjsonschema<3.0.0,>=2.18.0 in ./.venv/lib/python3.12/site-packages (from poetry) (2.20.0)
Requirement already satisfied: installer<0.8.0,>=0.7.0 in ./.venv/lib/python3.12/site-packages (from poetry) (0.7.0)
Requirement already satisfied: keyring<25.0.0,>=24.0.0 in ./.venv/lib/python3.12/site-packages (from poetry) (24.3.1)
Requirement already satisfied: packaging>=23.1 in ./.venv/lib/python3.12/site-packages (from poetry) (24.1)
Requirement already satisfied: pexpect<5.0.0,>=4.7.0 in ./.venv/lib/python3.12/site-packages (from poetry) (4.9.0)
Requirement already satisfied: pkginfo<2.0,>=1.10 in ./.venv/lib/python3.12/site-packages (from poetry) (1.11.1)
Requirement already satisfied: platformdirs<5,>=3.0.0 in ./.venv/lib/python3.12/site-packages (from poetry) (4.2.2)
Requirement already satisfied: poetry-core==1.9.0 in ./.venv/lib/python3.12/site-packages (from poetry) (1.9.0)
Requirement already satisfied: poetry-plugin-export<2.0.0,>=1.6.0 in ./.venv/lib/python3.12/site-packages (from poetry) (1.8.0)
Requirement already satisfied: pyproject-hooks<2.0.0,>=1.0.0 in ./.venv/lib/python3.12/site-packages (from poetry) (1.1.0)
Requirement already satisfied: requests<3.0,>=2.26 in ./.venv/lib/python3.12/site-packages (from poetry) (2.32.3)
Requirement already satisfied: requests-toolbelt<2.0.0,>=1.0.0 in ./.venv/lib/python3.12/site-packages (from poetry) (1.0.0)
Requirement already satisfied: shellingham<2.0,>=1.5 in ./.venv/lib/python3.12/site-packages (from poetry) (1.5.4)
Requirement already satisfied: tomlkit<1.0.0,>=0.11.4 in ./.venv/lib/python3.12/site-packages (from poetry) (0.13.2)
Requirement already satisfied: trove-classifiers>=2022.5.19 in ./.venv/lib/python3.12/site-packages (from poetry) (2024.7.2)
Requirement already satisfied: virtualenv<21.0.0,>=20.23.0 in ./.venv/lib/python3.12/site-packages (from poetry) (20.26.3)
Requirement already satisfied: dunamai<2.0.0,>=1.21.0 in ./.venv/lib/python3.12/site-packages (from poetry-dynamic-versioning[plugin]) (1.22.0)
Requirement already satisfied: jinja2<4,>=2.11.1 in ./.venv/lib/python3.12/site-packages (from poetry-dynamic-versioning[plugin]) (3.1.4)
Requirement already satisfied: msgpack<2.0.0,>=0.5.2 in ./.venv/lib/python3.12/site-packages (from cachecontrol<0.15.0,>=0.14.0->cachecontrol[filecache]<0.15.0,>=0.14.0->poetry) (1.0.8)
Requirement already satisfied: filelock>=3.8.0 in ./.venv/lib/python3.12/site-packages (from cachecontrol[filecache]<0.15.0,>=0.14.0->poetry) (3.15.4)
Requirement already satisfied: rapidfuzz<4.0.0,>=3.0.0 in ./.venv/lib/python3.12/site-packages (from cleo<3.0.0,>=2.1.0->poetry) (3.9.6)
Requirement already satisfied: urllib3>=1.25 in ./.venv/lib/python3.12/site-packages (from dulwich<0.22.0,>=0.21.2->poetry) (2.2.2)
Requirement already satisfied: MarkupSafe>=2.0 in ./.venv/lib/python3.12/site-packages (from jinja2<4,>=2.11.1->poetry-dynamic-versioning[plugin]) (2.1.5)
Requirement already satisfied: jaraco.classes in ./.venv/lib/python3.12/site-packages (from keyring<25.0.0,>=24.0.0->poetry) (3.4.0)
Requirement already satisfied: SecretStorage>=3.2 in ./.venv/lib/python3.12/site-packages (from keyring<25.0.0,>=24.0.0->poetry) (3.3.3)
Requirement already satisfied: jeepney>=0.4.2 in ./.venv/lib/python3.12/site-packages (from keyring<25.0.0,>=24.0.0->poetry) (0.8.0)
Requirement already satisfied: ptyprocess>=0.5 in ./.venv/lib/python3.12/site-packages (from pexpect<5.0.0,>=4.7.0->poetry) (0.7.0)
Requirement already satisfied: charset-normalizer<4,>=2 in ./.venv/lib/python3.12/site-packages (from requests<3.0,>=2.26->poetry) (3.3.2)
Requirement already satisfied: idna<4,>=2.5 in ./.venv/lib/python3.12/site-packages (from requests<3.0,>=2.26->poetry) (3.8)
Requirement already satisfied: certifi>=2017.4.17 in ./.venv/lib/python3.12/site-packages (from requests<3.0,>=2.26->poetry) (2024.8.30)
Requirement already satisfied: distlib<1,>=0.3.7 in ./.venv/lib/python3.12/site-packages (from virtualenv<21.0.0,>=20.23.0->poetry) (0.3.8)
Requirement already satisfied: cryptography>=2.0 in ./.venv/lib/python3.12/site-packages (from SecretStorage>=3.2->keyring<25.0.0,>=24.0.0->poetry) (43.0.0)
Requirement already satisfied: more-itertools in ./.venv/lib/python3.12/site-packages (from jaraco.classes->keyring<25.0.0,>=24.0.0->poetry) (10.4.0)
Requirement already satisfied: cffi>=1.12 in ./.venv/lib/python3.12/site-packages (from cryptography>=2.0->SecretStorage>=3.2->keyring<25.0.0,>=24.0.0->poetry) (1.17.0)
Requirement already satisfied: pycparser in ./.venv/lib/python3.12/site-packages (from cffi>=1.12->cryptography>=2.0->SecretStorage>=3.2->keyring<25.0.0,>=24.0.0->poetry) (2.22)
Downloading setuptools-75.1.0-py3-none-any.whl (1.2 MB)
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 1.2/1.2 MB 19.9 MB/s eta 0:00:00
Downloading poetry_dynamic_versioning-1.4.1-py3-none-any.whl (19 kB)
Installing collected packages: setuptools, poetry-dynamic-versioning
  Attempting uninstall: setuptools
    Found existing installation: setuptools 74.0.0
    Uninstalling setuptools-74.0.0:
      Successfully uninstalled setuptools-74.0.0
  Attempting uninstall: poetry-dynamic-versioning
    Found existing installation: poetry-dynamic-versioning 1.4.0
    Uninstalling poetry-dynamic-versioning-1.4.0:
      Successfully uninstalled poetry-dynamic-versioning-1.4.0
Successfully installed poetry-dynamic-versioning-1.4.1 setuptools-75.1.0
/workspaces/plugboard/.venv/bin/python -m poetry install --with docs
Installing dependencies from lock file

Package operations: 25 installs, 2 updates, 0 removals

  - Installing mergedeep (1.3.4)
  - Installing click (8.1.7)
  - Installing ghp-import (2.1.0)
  - Installing markdown (3.7)
  - Installing mkdocs-get-deps (0.2.0)
  - Installing pathspec (0.12.1)
  - Installing pyyaml-env-tag (0.1)
  - Installing watchdog (5.0.0)
  - Installing mkdocs (1.6.1)
  - Installing colorama (0.4.6)
  - Installing mkdocs-autorefs (1.1.0)
  - Installing pymdown-extensions (10.9)
  - Installing griffe (1.2.0)
  - Installing mkdocstrings (0.25.2)
  - Installing zipp (3.20.1)
  - Installing importlib-metadata (8.4.0)
  - Installing importlib-resources (6.4.4)
  - Installing mkdocs-material-extensions (1.3.1)
  - Installing mkdocstrings-python (1.10.9)
  - Installing paginate (0.5.7)
  - Installing pyparsing (3.1.4)
  - Installing regex (2024.7.24)
  - Downgrading setuptools (75.1.0 -> 74.0.0)
  - Installing verspec (0.1.0)
  - Installing mike (2.1.3)
  - Installing mkdocs-material (9.5.33)
  - Downgrading poetry-dynamic-versioning (1.4.1 -> 1.4.0)

Installing the current project: plugboard (0.0.1-post.17+73ee9ba)
/workspaces/plugboard/.venv/bin/python -m ruff check
All checks passed!
/workspaces/plugboard/.venv/bin/python -m mypy ./plugboard/ --explicit-package-bases
Success: no issues found in 14 source files
/workspaces/plugboard/.venv/bin/python -m mypy ./tests/
Success: no issues found in 5 source files
/workspaces/plugboard/.venv/bin/python -m pytest -rs ./tests/ --ignore=./tests/smoke
============================================================================================ test session starts =============================================================================================
platform linux -- Python 3.12.6, pytest-8.3.2, pluggy-1.5.0
rootdir: /workspaces/plugboard
configfile: pyproject.toml
plugins: cases-3.8.5, asyncio-0.23.8, rerunfailures-14.0, time-machine-2.15.0, env-1.1.3, anyio-4.3.0
asyncio: mode=Mode.STRICT
collected 2 items                                                                                                                                                                                            

tests/integration/test_process_with_components_run.py ..                                                                                                                                               [100%]

============================================================================================= 2 passed in 0.27s ==============================================================================================

@toby-coleman
Copy link
Contributor

Also tried deleting the .venv and recreating a blank one, also works.

Copy link
Contributor

@toby-coleman toby-coleman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on codespaces - looks good.

@chrisk314 chrisk314 merged commit 5503c0d into main Sep 17, 2024
@chrisk314 chrisk314 deleted the build/makefile-pyenv-alt branch September 17, 2024 20:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants