diff --git a/CHANGES.md b/CHANGES.md index 64a4ade..f115c75 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,7 @@ ## Unreleased - ngr: For invoking Elixir, use `mix test --trace` +- ngr: Added as dedicated install extra, `pip install pueblo[ngr]` - Testing: Unlocked compatibility with pytest version 8 - SFA: Added a subsystem for loading single-file applications diff --git a/pueblo/sfa/README.md b/pueblo/sfa/README.md index 003a545..8a459ad 100644 --- a/pueblo/sfa/README.md +++ b/pueblo/sfa/README.md @@ -25,7 +25,7 @@ not be used together. # Invoke Python entrypoint with given specification. PYTHONPATH=$(pwd) sfa run tests.testdata.entrypoint:main sfa run tests/testdata/entrypoint.py:main -sfa run https://github.com/pyveci/pueblo/raw/refs/heads/sfa/tests/testdata/entrypoint.py#main +sfa run https://github.com/pyveci/pueblo/raw/refs/heads/main/tests/sfa/basic.py#main sfa run github://pyveci:pueblo@/tests/testdata/entrypoint.py#main ``` diff --git a/pyproject.toml b/pyproject.toml index 728aae9..898176d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ dependencies = [ ] optional-dependencies.all = [ - "pueblo[cli,dataframe,fileio,nlp,notebook,proc,sfa-full,testing,web]", + "pueblo[cli,dataframe,fileio,ngr,nlp,notebook,proc,sfa-full,testing,web]", ] optional-dependencies.cli = [ "click<9", @@ -97,6 +97,10 @@ optional-dependencies.fileio = [ "s3fs>=2021", "yarl<1.19", ] +optional-dependencies.ngr = [ + "pip", + "pueblo[cli]", +] optional-dependencies.nlp = [ "aiohttp<3.12", "langchain>=0.1,<0.4", @@ -118,13 +122,11 @@ optional-dependencies.release = [ ] optional-dependencies.sfa = [ "pueblo[cli]", - "tomli<3", ] optional-dependencies.sfa-full = [ "fsspec[github,http,libarchive,s3]<2024.11", "instld<0.1", "pueblo[sfa]", - "tomli<3", ] optional-dependencies.test = [ "pueblo[testing]", diff --git a/tests/test_sfa.py b/tests/test_sfa.py index a9a96c9..660c0ba 100644 --- a/tests/test_sfa.py +++ b/tests/test_sfa.py @@ -37,7 +37,7 @@ def test_address_url(): [ "tests.sfa.basic:main", "tests/sfa/basic.py:main", - "https://github.com/pyveci/pueblo/raw/refs/heads/sfa/tests/sfa/basic.py#main", + "https://github.com/pyveci/pueblo/raw/refs/heads/main/tests/sfa/basic.py#main", ], ) def test_application_api_success(capsys, spec): @@ -73,7 +73,7 @@ def test_application_api_not_callable(capsys, spec): [ "tests.sfa.basic:main", "tests/sfa/basic.py:main", - "https://github.com/pyveci/pueblo/raw/refs/heads/sfa/tests/sfa/basic.py#main", + "https://github.com/pyveci/pueblo/raw/refs/heads/main/tests/sfa/basic.py#main", ], ) def test_application_cli(mocker, capfd, spec):