Clarify PEP621 (#113)

* Clarify PEP621

* Add extra test to validate pip-dist works with pyproject.toml

* Use a newer python version on test

* Add new test folder

* Update pyproject

* Update pyproject

* Update pyproject.toml

* Update pyproject.toml

* Update pyproject.toml

---------

Co-authored-by: marboledacci <[email protected]>

.circleci/test-deploy.yml

@@ -252,6 +252,13 @@ workflows:
                 name: If another python version is loaded - its broken - this verifies that it's broken
                 when: on_fail
                 command: python --version
+      - python/test:
+          filters: *filters
+          version: 3.11.4
+          name: job-test-pip-dist-pyproject
+          pkg-manager: pip-dist
+          cache-version: pip-dist-pyproject-<< pipeline.parameters.cache-version >>
+          app-dir: ~/project/sample_pip_pyproject
       - orb-tools/pack:
           filters: *filters
       - orb-tools/publish:
@@ -270,6 +277,8 @@ workflows:
             - job-test-poetry
             - job-test-pipenv
             - job-test-pip
+            - job-test-pip-dist
+            - job-test-pip-dist-pyproject
             - job-auto-test-poetry
             - job-auto-test-pipenv
             - job-auto-test-pip

sample_pip_pyproject/pyproject.toml

@@ -0,0 +1,14 @@
+# Example toml for integration testing - this is not used by the orb in anyway
+[project]
+authors=[
+    {name="TEST", email="[email protected]"}
+]
+name="test"
+description="none"
+version = "0.0.1"
+requires-python=">3.11"
+dependencies=["pytest"]
+
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"

sample_pip_pyproject/requirements.txt

@@ -0,0 +1 @@
+pytest

sample_pip_pyproject/src/example.py

@@ -0,0 +1,5 @@
+
+
+def add_func(x,y):
+    z = x+y
+    return z

sample_pip_pyproject/tests/test_ex.py

@@ -0,0 +1,11 @@
+from src import example
+
+import unittest
+
+class TestCase(unittest.TestCase):
+
+    def test_add1(self):
+        assert example.add_func(5,5) == 10
+
+    def test_add2(self):
+        assert example.add_func(5,10) == 15

sample_pip_pyproject/tests/test_job.py

@@ -0,0 +1,7 @@
+
+import unittest
+
+class TestCase(unittest.TestCase):
+
+    def test_true(self):
+        assert True

src/commands/install-packages.yml

@@ -9,7 +9,7 @@ parameters:
     type: enum
     enum: [auto, poetry, pipenv, pip, pip-dist]
     default: auto
-    description: Which package management tool to use, pipenv, pip or poetry with dependency file. Use `pip-dist` to install with project setup.py.
+    description: Which package management tool to use, pipenv, pip or poetry with dependency file. Use `pip-dist` to install with project setup.py or PEP621 (pyproject.toml).
   path-args:
     type: string
     default: "."
@@ -27,7 +27,7 @@ parameters:
     default: requirements.txt
     description: |
       Name of the requirements file that needs to be installed with pip. Prepended with `app-dir`. If using pipenv or poetry, this is ignored.
-      If using `pip-dist`, use this to use the cache checksum against the `setup.py` if desired.
+      If using `pip-dist`, use this to use the cache checksum against the `setup.py` or `pyproject.toml` if desired.
       If `pip-dependency-file` is set to an empty string, no dependency file is used in the `pip install` command.
   app-dir:
     type: string
@@ -164,7 +164,7 @@ steps:
         equal: [pip-dist, << parameters.pkg-manager >>]
       steps:
         - run:
-            name: "Install dependencies with pip using project setup.py"
+            name: "Install dependencies with pip using project setup.py or pyproject.toml"
             no_output_timeout: << parameters.no_output_timeout >>
             working_directory: <<parameters.app-dir>>
             command: |