From 3b6c7da7e28910beb5c482c2a2213b83db98b74c Mon Sep 17 00:00:00 2001 From: Stu Hood Date: Mon, 1 May 2017 19:54:46 -0700 Subject: [PATCH 1/2] Move scalastyle and javastyle into the core --- pants-plugins/src/python/internal_backend/BUILD | 1 - .../src/python/internal_backend/optional/BUILD | 13 ------------- .../python/internal_backend/optional/__init__.py | 0 .../python/internal_backend/optional/register.py | 15 --------------- pants.ini | 1 - src/python/pants/backend/jvm/register.py | 8 +++++++- 6 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 pants-plugins/src/python/internal_backend/optional/BUILD delete mode 100644 pants-plugins/src/python/internal_backend/optional/__init__.py delete mode 100644 pants-plugins/src/python/internal_backend/optional/register.py diff --git a/pants-plugins/src/python/internal_backend/BUILD b/pants-plugins/src/python/internal_backend/BUILD index dd5a0db87a0..6114a29625b 100644 --- a/pants-plugins/src/python/internal_backend/BUILD +++ b/pants-plugins/src/python/internal_backend/BUILD @@ -4,7 +4,6 @@ target( name='plugins', dependencies = [ - 'pants-plugins/src/python/internal_backend/optional:plugin', 'pants-plugins/src/python/internal_backend/repositories:plugin', 'pants-plugins/src/python/internal_backend/sitegen:plugin', 'pants-plugins/src/python/internal_backend/utilities:plugin', diff --git a/pants-plugins/src/python/internal_backend/optional/BUILD b/pants-plugins/src/python/internal_backend/optional/BUILD deleted file mode 100644 index 1466bbc2a15..00000000000 --- a/pants-plugins/src/python/internal_backend/optional/BUILD +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2014 Pants project contributors (see CONTRIBUTORS.md). -# Licensed under the Apache License, Version 2.0 (see LICENSE). - -python_library( - name = 'plugin', - sources = ['__init__.py', 'register.py'], - dependencies = [ - 'src/python/pants/backend/jvm/tasks:checkstyle', - 'src/python/pants/backend/jvm/tasks:scalastyle', - 'src/python/pants/goal:task_registrar', - ] -) - diff --git a/pants-plugins/src/python/internal_backend/optional/__init__.py b/pants-plugins/src/python/internal_backend/optional/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/pants-plugins/src/python/internal_backend/optional/register.py b/pants-plugins/src/python/internal_backend/optional/register.py deleted file mode 100644 index 0602dac9c14..00000000000 --- a/pants-plugins/src/python/internal_backend/optional/register.py +++ /dev/null @@ -1,15 +0,0 @@ -# coding=utf-8 -# Copyright 2014 Pants project contributors (see CONTRIBUTORS.md). -# Licensed under the Apache License, Version 2.0 (see LICENSE). - -from __future__ import (absolute_import, division, generators, nested_scopes, print_function, - unicode_literals, with_statement) - -from pants.backend.jvm.tasks.checkstyle import Checkstyle -from pants.backend.jvm.tasks.scalastyle import Scalastyle -from pants.goal.task_registrar import TaskRegistrar as task - - -def register_goals(): - task(name='checkstyle', action=Checkstyle).install('lint') - task(name='scalastyle', action=Scalastyle).install('lint') diff --git a/pants.ini b/pants.ini index 1d671a9fb01..5f34788b372 100644 --- a/pants.ini +++ b/pants.ini @@ -40,7 +40,6 @@ pythonpath: [ backend_packages: +[ "pants.backend.docgen", - "internal_backend.optional", "internal_backend.repositories", "internal_backend.sitegen", "internal_backend.utilities", diff --git a/src/python/pants/backend/jvm/register.py b/src/python/pants/backend/jvm/register.py index 2fac5547784..d49004edc74 100644 --- a/src/python/pants/backend/jvm/register.py +++ b/src/python/pants/backend/jvm/register.py @@ -35,6 +35,7 @@ from pants.backend.jvm.tasks.bootstrap_jvm_tools import BootstrapJvmTools from pants.backend.jvm.tasks.bundle_create import BundleCreate from pants.backend.jvm.tasks.check_published_deps import CheckPublishedDeps +from pants.backend.jvm.tasks.checkstyle import Checkstyle from pants.backend.jvm.tasks.classmap import ClassmapTask from pants.backend.jvm.tasks.consolidate_classpath import ConsolidateClasspath from pants.backend.jvm.tasks.detect_duplicates import DuplicateDetector @@ -61,6 +62,7 @@ from pants.backend.jvm.tasks.scala_repl import ScalaRepl from pants.backend.jvm.tasks.scaladoc_gen import ScaladocGen from pants.backend.jvm.tasks.scalafmt import ScalaFmtCheckFormat, ScalaFmtFormat +from pants.backend.jvm.tasks.scalastyle import Scalastyle from pants.backend.jvm.tasks.unpack_jars import UnpackJars from pants.base.deprecated import warn_or_error from pants.build_graph.build_file_aliases import BuildFileAliases @@ -197,12 +199,16 @@ def register_goals(): task(name='junit', action=JUnitRun).install('test') task(name='bench', action=BenchmarkRun).install('bench') + # Linting. + task(name='scalafmt', action=ScalaFmtCheckFormat, serialize=False).install('lint') + task(name='scalastyle', action=Scalastyle, serialize=False).install('lint') + task(name='checkstyle', action=Checkstyle, serialize=False).install('lint') + # Running. task(name='jvm', action=JvmRun, serialize=False).install('run') task(name='jvm-dirty', action=JvmRun, serialize=False).install('run-dirty') task(name='scala', action=ScalaRepl, serialize=False).install('repl') task(name='scala-dirty', action=ScalaRepl, serialize=False).install('repl-dirty') - task(name='scalafmt', action=ScalaFmtCheckFormat, serialize=False).install('lint', first=True) task(name='scalafmt', action=ScalaFmtFormat, serialize=False).install('fmt') task(name='test-jvm-prep-command', action=RunTestJvmPrepCommand).install('test', first=True) task(name='binary-jvm-prep-command', action=RunBinaryJvmPrepCommand).install('binary', first=True) From 58c7ea957ed9369de169775f364d5edb992b48c7 Mon Sep 17 00:00:00 2001 From: Stu Hood Date: Tue, 2 May 2017 10:10:01 -0700 Subject: [PATCH 2/2] Remove stale optional references. --- build-support/bin/release.sh | 1 - contrib/README.md | 1 - 2 files changed, 2 deletions(-) diff --git a/build-support/bin/release.sh b/build-support/bin/release.sh index 6aa28631abf..20127195d5a 100755 --- a/build-support/bin/release.sh +++ b/build-support/bin/release.sh @@ -84,7 +84,6 @@ function execute_packaged_pants_with_internal_backends() { 'pants.backend.jvm',\ 'pants.backend.project_info',\ 'pants.backend.python',\ - 'internal_backend.optional',\ 'internal_backend.repositories',\ 'internal_backend.sitegen',\ 'internal_backend.utilities',\ diff --git a/contrib/README.md b/contrib/README.md index 707ec64670d..0db497b94d4 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -48,7 +48,6 @@ Contrib plugins should generally follow 3 basic setup steps: ] backend_packages: [ - "internal_backend.optional", "internal_backend.repositories", "internal_backend.sitegen", "internal_backend.utilities",