Revert "[internal] add mark and fixture for lockfile generation (pant…

…sbuild#15190)" (pantsbuild#15267) This causes the build wheels job to fail, which blocks the release: https://github.com/pantsbuild/pants/runs/6181314347?check_suite_focus=true#step:10:1878 This reverts commit 0147029. [ci skip-rust]
tdyas · Apr 27, 2022 · 21f8a51 · 21f8a51
1 parent 4c49626
commit 21f8a51
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 439 deletions.
diff --git a/pants-plugins/internal_plugins/test_lockfile_fixtures/BUILD b/pants-plugins/internal_plugins/test_lockfile_fixtures/BUILD
diff --git a/pants-plugins/internal_plugins/test_lockfile_fixtures/__init__.py b/pants-plugins/internal_plugins/test_lockfile_fixtures/__init__.py
diff --git a/pants-plugins/internal_plugins/test_lockfile_fixtures/register.py b/pants-plugins/internal_plugins/test_lockfile_fixtures/register.py
diff --git a/pants-plugins/internal_plugins/test_lockfile_fixtures/rules.py b/pants-plugins/internal_plugins/test_lockfile_fixtures/rules.py
diff --git a/pants.toml b/pants.toml
@@ -27,7 +27,6 @@ backend_packages.add = [
   "pants.backend.experimental.scala.lint.scalafmt",
   "pants.backend.experimental.scala.debug_goals",
   "internal_plugins.releases",
-  "internal_plugins.test_lockfile_fixtures",
 ]
 plugins = [
   "hdrhistogram",  # For use with `--stats-log`.

diff --git a/src/python/pants/backend/scala/BUILD b/src/python/pants/backend/scala/BUILD
@@ -2,5 +2,3 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 python_sources()
-
-python_test_utils(name="test_utils")
diff --git a/src/python/pants/backend/scala/compile/BUILD b/src/python/pants/backend/scala/compile/BUILD
@@ -2,6 +2,4 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 python_sources()
-
-python_tests(name="tests", timeout=240, dependencies=[":test_resources"])
-resources(name="test_resources", sources=["*.test.lock"])
+python_tests(name="tests", timeout=240)
diff --git a/src/python/pants/backend/scala/compile/scala-library.test.lock b/src/python/pants/backend/scala/compile/scala-library.test.lock
diff --git a/src/python/pants/backend/scala/compile/scalac_test.py b/src/python/pants/backend/scala/compile/scalac_test.py
@@ -37,7 +37,6 @@
     maybe_skip_jdk_test,
 )
 from pants.jvm.util_rules import rules as util_rules
-from pants.testutil.lockfile_fixture import JVMLockfileFixture
 from pants.testutil.rule_runner import PYTHON_BOOTSTRAP_ENV, QueryRule, RuleRunner, logging
 
 
@@ -66,10 +65,6 @@ def rule_runner() -> RuleRunner:
     return rule_runner
 
 
-LOCKFILE_REQUIREMENTS = pytest.mark.jvm_lockfile(
-    path="scala-library.test.lock", requirements=["org.scala-lang:scala-library:2.13.6"]
-)
-
 DEFAULT_LOCKFILE = TestCoursierWrapper(
     CoursierResolvedLockfile(
         (
@@ -147,8 +142,7 @@ def main(args: Array[String]): Unit = {
 
 
 @maybe_skip_jdk_test
-@LOCKFILE_REQUIREMENTS
-def test_compile_no_deps(rule_runner: RuleRunner, jvm_lockfile: JVMLockfileFixture) -> None:
+def test_compile_no_deps(rule_runner: RuleRunner) -> None:
     rule_runner.write_files(
         {
             "BUILD": dedent(
@@ -159,7 +153,7 @@ def test_compile_no_deps(rule_runner: RuleRunner, jvm_lockfile: JVMLockfileFixtu
                 """
             ),
             "3rdparty/jvm/BUILD": DEFAULT_SCALA_LIBRARY_TARGET,
-            "3rdparty/jvm/default.lock": jvm_lockfile.serialized_lockfile,
+            "3rdparty/jvm/default.lock": DEFAULT_LOCKFILE,
             "ExampleLib.scala": SCALA_LIB_SOURCE,
         }
     )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,5 +2,3 @@
		# Licensed under the Apache License, Version 2.0 (see LICENSE).

		python_sources()

		python_test_utils(name="test_utils")