Update dependencies and drop python <3.11

Use pyproject.toml via uv for dependency management

Freezing dependencies does so for a single platform (e.g. linux) and
Python version (3.12). Because a dependency can include environment
markers to specify transitive dependencies a requirements.txt file
generated on one platform/version can fail to install on another.

This commit modifies our feature test workflow to use pip's local project
installs to provide the correct dependency resolutions for each platform
and python version.

- Adjusted the Python version matrix in GitHub workflows to include
    Python 3.11, 3.12, and 3.13, removing older versions.
- Simplified the GitHub workflows to use uv

Author: jstvz

.github/workflows/feature_test.yml

@@ -22,17 +22,22 @@ jobs:
               uses: actions/checkout@v4
               with:
                   fetch-depth: 1
-            - name: Set up Python 3.8
+            - name: Set up Python 3.11
               id: py
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.8
-                  cache: pip
-                  cache-dependency-path: "requirements/*.txt"
+                  python-version: 3.11
+            - name: Set up uv
+              uses: SFDO-Tooling/setup-uv@main
+              with:
+                  version: "0.5.0"
+                  enable-cache: true
             - name: Install dependencies
-              run: pip install -r requirements_dev.txt
+              run: uv sync --group docs
             - name: Build Docs
-              run: make docs
+              run: |
+                cd docs
+                uv run sphinx-build -b html . ./_build
 
     unit_tests:
         name: "Unit tests: ${{ matrix.os }}-${{ matrix.python-version }}"
@@ -41,39 +46,39 @@ jobs:
             fail-fast: false
             matrix:
                 os: [macos-latest, SFDO-Tooling-Ubuntu, SFDO-Tooling-Windows]
-                python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-                exclude:
-                    - os: macos-latest
-                      python-version: 3.8
-                include:
-                    - os: macos-13
-                      python-version: 3.8
+                python-version: ["3.11", "3.12", "3.13"]
         steps:
             - uses: actions/checkout@v4
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
                   python-version: "${{ matrix.python-version }}"
-                  cache: pip
-                  cache-dependency-path: "requirements/*.txt"
+            - name: Set up uv
+              uses: SFDO-Tooling/setup-uv@main
+              with:
+                  version: "0.5.0"
+                  enable-cache: true
             - name: Install dependencies
-              run: pip install -r requirements_dev.txt
+              run: uv sync -p ${{ matrix.python-version }}
             - name: Run Pytest
-              run: pytest --cov-report= --cov=cumulusci
+              run: uv run pytest --cov-report= --cov=cumulusci
 
     robot_api:
         name: "Robot: No browser"
         runs-on: SFDO-Tooling-Ubuntu
         steps:
             - uses: actions/checkout@v4
-            - name: Set up Python 3.8
+            - name: Set up Python 3.11
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.8
-                  cache: pip
-                  cache-dependency-path: "requirements/*.txt"
-            - name: Install Python dependencies
-              run: pip install -r requirements_dev.txt
+                  python-version: 3.11
+            - name: Set up uv
+              uses: SFDO-Tooling/setup-uv@main
+              with:
+                  version: "0.5.0"
+                  enable-cache: true
+            - name: Install dependencies
+              run: uv sync -p 3.11
             - name: Install sfdx
               run: |
                   mkdir sfdx
@@ -90,15 +95,15 @@ jobs:
                   SFDX_HUB_USERNAME: ${{ secrets.SFDX_HUB_USERNAME }}
             - name: Run robot tests
               run: |
-                  coverage run --append $(which cci) task run robot \
+                  uv run coverage run --append $(which cci) task run robot \
                     --org dev \
                     -o name "CumulusCI" \
                     -o suites cumulusci/robotframework/tests \
                     -o include no-browser
             - name: Delete scratch org
               if: always()
               run: |
-                  cci org scratch_delete dev
+                  uv run cci org scratch_delete dev
             - name: Store robot results
               if: failure()
               uses: actions/upload-artifact@v4

.github/workflows/pre-release.yml

@@ -22,10 +22,10 @@ jobs:
         runs-on: SFDO-Tooling-Ubuntu
         steps:
             - uses: actions/checkout@main
-            - name: Set up Python 3.8
+            - name: Set up Python 3.11
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.8
+                  python-version: 3.11
                   cache: pip
             - name: Install build tool
               run: python -m pip install hatch

.github/workflows/release.yml

@@ -15,15 +15,13 @@ jobs:
         runs-on: SFDO-Tooling-Ubuntu
         steps:
             - uses: actions/checkout@main
-            - name: Set up Python 3.8
+            - name: Set up Python 3.11
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.8
+                  python-version: 3.11
                   cache: pip
             - name: Install build tools
               run: python -m pip install hatch tomli tomli-w
-            - name: Pin dependencies
-              run: python utility/pin_dependencies.py
             - name: Build source tarball and binary wheel
               run: hatch build -c
             - name: Upload to PyPI

.github/workflows/release_test.yml

@@ -37,12 +37,12 @@ jobs:
         runs-on: SFDO-Tooling-Ubuntu
         steps:
             - uses: actions/checkout@v3
-            - name: Set up Python 3.8
+            - name: Set up Python 3.11
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.8
+                  python-version: 3.11
                   cache: pip
-                  cache-dependency-path: "requirements/*.txt"
+                  cache-dependency-path: "pyproject.toml"
             - name: Install build tools
               run: pip install hatch
             - name: Test source tarball and binary wheel
@@ -71,14 +71,14 @@ jobs:
         concurrency: release
         steps:
             - uses: actions/checkout@v3
-            - name: Set up Python 3.8
+            - name: Set up Python 3.11
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.8
+                  python-version: 3.11
                   cache: pip
-                  cache-dependency-path: "requirements/*.txt"
+                  cache-dependency-path: "pyproject.toml"
             - name: Install Python dependencies
-              run: pip install -r requirements_dev.txt
+              run: pip install .[test]
             - name: Install sfdx
               run: |
                   mkdir sfdx

.github/workflows/slow_integration_tests.yml

@@ -25,16 +25,16 @@ jobs:
         runs-on: SFDO-Tooling-Ubuntu
         steps:
             - uses: actions/checkout@v2
-            - name: Set up Python 3.8
+            - name: Set up Python 3.11
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.8
+                  python-version: 3.11
                   cache: pip
-                  cache-dependency-path: "requirements/*.txt"
+                  cache-dependency-path: "pyproject.toml"
             - name: Install Python dependencies
               run: |
                   python -m pip install -U pip
-                  pip install -r requirements_dev.txt
+                  pip install .[test]
             - name: Install sfdx
               run: |
                   mkdir sfdx
@@ -73,14 +73,14 @@ jobs:
                     #   org-shape: "prerelease"
         steps:
             - uses: actions/checkout@v2
-            - name: Set up Python 3.8
+            - name: Set up Python 3.11
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.8
+                  python-version: 3.11
                   cache: pip
-                  cache-dependency-path: "requirements/*.txt"
+                  cache-dependency-path: "pyproject.toml"
             - name: Install Python dependencies
-              run: pip install -r requirements_dev.txt
+              run: pip install .[test]
             - name: Install sfdx
               run: |
                   mkdir sfdx

.github/workflows/update_dependencies.yml

@@ -7,4 +7,4 @@ jobs:
     update_python_dependencies:
         uses: SFDO-Tooling/.github/.github/workflows/update_python_dependencies.yml@main
         with:
-            python-version: 3.8
+            python-version: 3.11

cumulusci/tasks/robotframework/tests/test_robotframework.py

@@ -762,7 +762,7 @@ def test_pageobject_docstring(self):
 
 
 class TestRobotPerformanceKeywords:
-    def setup(self):
+    def setup_method(self):
         self.datadir = os.path.dirname(__file__)
 
     @contextmanager

cumulusci/utils/tests/test_fileutils.py

@@ -199,7 +199,7 @@ def test_resource_test_resource_doesnt_exist_pathlib_relpath(self):
 
 
 class TestFSResourceTempdir(_TestFSResourceShared):
-    def setup(self):
+    def setup_method(self):
         self.tempdir = TemporaryDirectory()
         self.file = Path(self.tempdir.name) / "testfile.txt"
         self.file.touch()

cumulusci/utils/yaml/model_parser.py

@@ -1,5 +1,5 @@
-from pathlib import Path, Sequence
-from typing import IO, Union
+from pathlib import Path
+from typing import IO, Sequence, Union
 
 from pydantic import BaseModel, ValidationError
 from pydantic.error_wrappers import ErrorWrapper

pyproject.toml

@@ -7,7 +7,7 @@ name = "cumulusci"
 dynamic = ["readme", "version"]
 description = "Build and release tools for Salesforce developers"
 license = { text = "BSD 3-Clause License" }
-requires-python = ">=3.8"
+requires-python = ">=3.11"
 authors = [
     { name = "Salesforce.org", email = "sfdo-mrbelvedere@salesforce.com" },
 ]
@@ -18,25 +18,21 @@ classifiers = [
     "License :: OSI Approved :: BSD License",
     "Natural Language :: English",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "click",
+    "click>=8.1",
     "cryptography",
     "python-dateutil",
-    "docutils<0.17",
     "Faker",
     "fs",
     "github3.py",
     "jinja2",
     "keyring<=23.0.1",
     "defusedxml",
     "lxml",
-    "markdown-it-py==2.2.0", # resolve dependency conflict between prod/dev
     "MarkupSafe",
     "psutil",
     "pydantic<2",
@@ -45,38 +41,46 @@ dependencies = [
     "pyyaml",
     "requests",
     "requests-futures",
-    "rich",
+    "rich>=13.9.4",
     "robotframework",
+    "SQLAlchemy<2",
     "robotframework-pabot",
     "robotframework-requests",
     "robotframework-seleniumlibrary<6",
-    "rst2ansi",
+    "rst2ansi>=0.1.5",
     "salesforce-bulk",
     "sarge",
     "selenium<4",
     "simple-salesforce==1.11.4",
-    "snowfakery",
-    "SQLAlchemy<2",
+    "snowfakery>=4.0.0",
     "xmltodict",
 ]
 
-[project.optional-dependencies]
-docs = ["myst-parser", "Sphinx"]
-lint = ["black", "flake8<4", "isort", "pre-commit"]
-test = [
-    "coverage[toml]",
-    "factory-boy",
-    "furo",
-    "jsonschema",
-    "pytest<7.1 ", # https://github.com/pytest-dev/pytest/issues/9765
-    "pytest-cov",
-    "pytest-random-order",
-    "pytest-vcr",
-    "responses",
-    "testfixtures",
-    "tox",
-    "typeguard<=2.13.3", # TODO: Lots of changes required for v4
-    "vcrpy"
+[dependency-groups]
+docs = [
+    "myst-parser>=1.0.0",
+    "sphinx>=5.3.0",
+]
+dev = [
+    "coverage[toml]>=7.6.1",
+    "factory-boy>=3.3.1",
+    "furo>=2023.3.27",
+    "jsonschema>=4.23.0",
+    "pytest>=7.0.1",
+    "pytest-cov>=5.0.0",
+    "pytest-random-order>=1.1.1",
+    "pytest-vcr>=1.0.2",
+    "responses>=0.23.1",
+    "testfixtures>=8.3.0",
+    "tox>=4.20.0",
+    "typeguard<=2.13.3",          # TODO: Lots of changes required for v4
+    "vcrpy>=6.0.2",
+]
+lint = [
+    "black>=24.8.0",
+    "flake8<4",
+    "isort>=5.13.2",
+    "pre-commit>=3.5.0",
 ]
 
 [project.scripts]
@@ -102,16 +106,13 @@ include = [
 include = [
     "/cumulusci",
     "/requirements/*", # Needed by tox
-    "README.md", # needed by hatch-fancy-pypi-readme
-    "docs/history.md"
+    "README.md",       # needed by hatch-fancy-pypi-readme
+    "docs/history.md",
     # ditto
 ]
 
 [tool.hatch.build.targets.wheel]
-exclude = [
-    "*.sql",
-    "*.zip"
-]
+exclude = ["*.sql", "*.zip"]
 
 [tool.hatch.metadata.hooks.fancy-pypi-readme]
 content-type = "text/markdown"
@@ -254,7 +255,7 @@ include = [
     'cumulusci/tests/util.py',
     'cumulusci/utils/waiting.py',
     'cumulusci/utils/xml/robot_xml.py',
-    'cumulusci/utils/ziputils.py'
+    'cumulusci/utils/ziputils.py',
 ]
 # Do not add to this list. Instead use
 # # pyright: strict
@@ -290,5 +291,5 @@ strict = [
     'cumulusci/tasks/release_notes/exceptions.py',
     'cumulusci/tasks/salesforce/BaseSalesforceTask.py',
     'cumulusci/tasks/vlocity/exceptions.py',
-    'cumulusci/utils/soql.py'
+    'cumulusci/utils/soql.py',
 ]