pants: upgrade Pants to 2.18.0

.github/workflows/pants.yaml

@@ -16,18 +16,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Tell Pants to use Python ${{ matrix.python-version }}
-        # https://docs.github.com/en/actions/using-workflows/
-        # workflow-commands-for-github-actions#setting-an-environment-variable
-        run: |
-          CONSTRAINTS="['==${{ matrix.python-version }}.*']"
-          echo "PY=python${{ matrix.python-version }}" >> $GITHUB_ENV &&
-          echo "PANTS_PYTHON_INTERPRETER_CONSTRAINTS=${CONSTRAINTS}" \
-            >> $GITHUB_ENV
+      - uses: pantsbuild/actions/init-pants@v5-scie-pants
+        # This action bootstraps pants and manages 2-3 GHA caches.
+        # See: github.com/pantsbuild/actions/tree/main/init-pants/
 
       - name: List environment variables
         run: |
@@ -36,32 +31,34 @@ jobs:
 
       - name: Bootstrap Pants
         run: |
-          ./pants version
+          pants version
 
       - name: Run tailor check
         run: |
-          ./pants tailor --check ::
+          pants tailor --check ::
 
       - name: Run tests
         run: |
-          ./pants test ::
+          pants test ::
 
       - name: Run linters
         run: |
-          ./pants update-build-files --check ::
-          ./pants lint ::
+          pants update-build-files --check ::
+          pants lint ::
 
       - name: Run type checkers
         run: |
-          ./pants check ::
+          pants check ::
 
       - name: Get project version from Pants plugin
         run: |
-          ./pants project-version ::
+          pants project-version ::
+          pants project-version --as-json cheeseshop:
+          pants project-version --no-as-json cheeseshop:
 
       - name: Package and check Python wheel
         run: |
-          ./pants package //:cheeseshop-query-wheel
+          pants package //:cheeseshop-query-wheel
           python3 -m venv .venv
           source .venv/bin/activate
           pip install dist/*.whl
@@ -70,5 +67,5 @@ jobs:
 
       - name: Package and check PEX file
         run: |
-          ./pants package cheeseshop/cli:cheeseshop-query
+          pants package cheeseshop/cli:cheeseshop-query
           dist/**/*.pex --help

Makefile

@@ -1,7 +1,9 @@
 check:
-	./pants update-build-files fmt lint test check ::
-	./pants project-version --as-json cheeseshop:
-	./pants project-version --no-as-json cheeseshop:
+	pants update-build-files fmt lint ::
+	pants test ::
+	pants check ::
+	pants project-version --as-json cheeseshop:
+	pants project-version --no-as-json cheeseshop:
 	yamllint .github --no-warnings
 package:
-	./pants package cheeseshop/cli:cheeseshop-query
+	pants package cheeseshop/cli:cheeseshop-query

cheeseshop/repository/parsing/BUILD

@@ -5,6 +5,7 @@ __dependencies_rules__(
         "*",  # applies to everything in this BUILD file
         "/**",  # allow all dependencies in this subtree
         "//requirements#*",
-        "!*",  # nothing else
+        "requirements-dev#types-python-dateutil",
+        "?*",  # nothing else
     )
 )

pants-plugins/BUILD

@@ -1,4 +1,7 @@
-pants_requirements(name="pants", resolve="pants-plugins")
+pants_requirements(
+    name="pants",
+    resolve="pants-plugins",
+)
 python_requirement(
     name="packaging",
     requirements=["packaging==21.3"],

pants.toml

@@ -1,5 +1,5 @@
 [GLOBAL]
-pants_version = "2.17.0"
+pants_version = "2.18.0"
 ignore_warnings = [
   '$regex$DEPRECATED',
 ]
@@ -33,6 +33,8 @@ interpreter_constraints = ["CPython>=3.9.*,<=3.10.*"]
 [python.resolves]
 pants-plugins = "pants-plugins/requirements-pants-plugins.lock"
 python-default = "requirements/requirements.lock"
+devtools = "requirements/devtools.lock"
+testtools = "requirements/testtools.lock"
 
 [python.resolves_to_interpreter_constraints]
 # must use '<3.10' because Pants doesn't publish Python wheels for 3.10
@@ -53,41 +55,33 @@ root_patterns = [
     "/", "/pants-plugins"
 ]
 
-[flake8]
-version = "flake8==5.0.4"
-lockfile = "requirements/flake8.lock"
-
 [mypy]
-version = "mypy==0.971"
-lockfile = "requirements/mypy.lock"
-extra_type_stubs = [
-    "types-requests==2.28.9",
-    "types-python-dateutil==2.8.19",
-    "types-setuptools==65.1.0",
+install_from_resolve = "devtools"
+requirements = [
+    "//requirements:requirements-dev#mypy",
+    "types-requests",
+    "types-python-dateutil",
+    "types-setuptools",
 ]
 
 [black]
-version = "black==22.6.0"
-lockfile = "requirements/black.lock"
+install_from_resolve = "devtools"
+requirements = ["//requirements:requirements-dev#black"]
 
 [docformatter]
-version = "docformatter>=1.4,<1.5"
-lockfile = "requirements/docformatter.lock"
+install_from_resolve = "devtools"
+requirements = ["//requirements:requirements-dev#docformatter"]
 
 [isort]
-version = "isort==5.10.1"
-lockfile = "requirements/isort.lock"
-extra_requirements.add = [
-    "setuptools"
-]
+install_from_resolve = "devtools"
 
 [pytest]
 # https://www.pantsbuild.org/docs/reference-pytest#section-extra-requirements
-extra_requirements.add = [
-  "pytest-vcr",
-  "pydevd-pycharm==223.8617.48",
+install_from_resolve = "testtools"
+requirements = [
+    "//requirements:requirements-test#pytest",
+    "//requirements:requirements-test#pytest-vcr",
 ]
-lockfile = "requirements/pytest.lock"
 args = ["-v", "--vcr-record=none"]
 
 [tailor]

requirements/BUILD

@@ -1,9 +1,17 @@
 python_requirements(
     name="requirements",
     source="requirements.txt",
+    resolve="python-default",
 )
 
 python_requirements(
     name="requirements-test",
     source="requirements-test.txt",
+    resolve="testtools",
+)
+
+python_requirements(
+    name="requirements-dev",
+    source="requirements-dev.txt",
+    resolve="devtools",
 )