Remove BUILD Dictionary and Goals Reference from docs.

During the Big Merge the template system changed and the templates
have not yet been updated, so these doc pages are broken. Remove
them for now so we can publish the remainder of the site.

(sapling split of f89e63c6a02f4f7bffa662a15181399818fdd07d)

3rdparty/python/BUILD

@@ -31,9 +31,7 @@ def make_dep(name, version, dependency_name=None):
 make_dep('ansicolors', '1.0.2')
 make_dep('antlr-3.1.3', '3.1.3', 'antlr_python_runtime')
 make_dep('bottle', '0.11.6')
-make_dep('distribute', '0.6.28')
 make_dep('elementtree', '1.2.7_20070827_preview')
-make_dep('functional', '0.7.0')
 make_dep('futures', '2.1.2')
 make_dep('git-python', '0.3.2.RC1', 'GitPython')
 make_dep('kazoo', '1.3.1')
@@ -46,13 +44,12 @@ make_dep('psutil', '1.1.2')
 make_dep('pure-sasl', '0.1.4')
 make_dep('pyfakefs', '2.3')
 make_dep('pygments', '1.4', 'Pygments')
-make_dep('pylint', '1.1.0')
 make_dep('pystache', '0.5.3')
-make_dep('pytest', '2.5.2')
+make_dep('pytest', '2.3.5')
 make_dep('pytest-cov', '1.6')
 make_dep('python_daemon', '1.5.5')
 make_dep('requests', '2.0.0')
-make_dep('setuptools', '2.1')
+make_dep('setuptools', '2.1.2')
 make_dep('socksipy-branch', '1.01', 'SocksiPy-Branch')
 make_dep('thrift', '0.9.1')
 make_dep('zc-zookeeper-static', '3.4.4')

build-support/python/setup.sh

@@ -11,8 +11,10 @@ VENV_VERSION=1.10.1
 
 BOOTSTRAP_REQS=(
   pystache==0.5.3
-  setuptools==2.1
   python_daemon==1.5.5
+  requests==2.0.0
+  setuptools==2.1.2
+  psutil==1.1.2
 )
 
 mkdir -p $BOOTSTRAP_BIN

pants

@@ -265,5 +265,6 @@ def main():
   logger.debug('launching %s' % fetch_pants())
   os.execv(fetch_pants(), sys.argv)
 
+
 if __name__ == '__main__':
   main()

pants.bootstrap

@@ -40,6 +40,7 @@ function build_pants() {
 }
 
 function run_pants_bare() {
+  # TODO(John Sirois): Remove the --no-ng-daemons flag once we can run nailguns in dev mode.
   with_virtualenv python $PYTHON_ARGS $PANTS_EXE "$@"
 }
 

pants.ini

@@ -4,6 +4,8 @@
 # Look for these rcfiles - they need not exist on the system
 rcfiles: ['/etc/pantsrc', '~/.pants.new.rc']
 
+pants_bootstrapdir: %(homedir)s/.pants.d
+
 pants_workdir: %(buildroot)s/.pants.d
 pants_supportdir: %(buildroot)s/build-support
 
@@ -45,6 +47,8 @@ write_artifact_caches: []
 # read by all, change it to some other string, e.g., <number>-<your username>.
 cache_key_gen_version: '100'
 
+jvm_args: ['-Xmx1g', '-XX:MaxPermSize=256m']
+
 
 [reporting]
 reports_dir: %(pants_workdir)s/reports
@@ -65,26 +69,20 @@ build_invalidator: %(pants_workdir)s/build_invalidator
 workdir: %(pants_workdir)s/ng
 supportdir: %(pants_supportdir)s/ng
 bootstrap-tools: [':nailgun-server']
-args: ['-Xmx2g', '-XX:MaxPermSize=256m']
 
 
 [idl-extract]
 workdir: %(pants_workdir)s/idl
 
 
 [ivy]
-supportdir: %(pants_supportdir)s/ivy
-classpath: ['%(supportdir)s/lib/ivy-2.2.0.jar']
-ivy_settings: %(supportdir)s/ivysettings.xml
+ivy_settings: %(pants_supportdir)s/ivy/ivysettings.xml
 cache_dir: %(homedir)s/.ivy2/twitter-commons
 
 
 [ivy-resolve]
 workdir: %(pants_workdir)s/classpath
-nailgun_dir: %(pants_workdir)s/ng/ivy
 bootstrap-tools: [':xalan']
-transitive: True
-args: []
 
 
 [scrooge-gen]
@@ -93,29 +91,33 @@ workdir: %(scrooge_workdir)s
 supportdir: %(pants_supportdir)s/bin/scrooge
 strict: False
 verbose: True
-version: 3.0.9
 java: {
     'gen': 'java',
     'deps': {
       'service': [
-                 '3rdparty:scrooge-runtime',
+                 '3rdparty:commons-lang',
                  '3rdparty:finagle-thrift',
-                 '3rdparty:finagle-commons-stats',
-                 '3rdparty:finagle-ostrich4',
+                 '3rdparty:slf4j-api',
+                 '3rdparty:util-core',
                  ],
-      'structs': []
+      'structs': [
+                 '3rdparty:commons-lang',
+                 '3rdparty:thrift',
+                 ]
     }
   }
 scala: {
     'gen': 'scala',
     'deps': {
       'service': [
-                 '3rdparty:scrooge-runtime',
+                 '3rdparty:scrooge-core',
                  '3rdparty:finagle-thrift',
-                 '3rdparty:finagle-commons-stats',
-                 '3rdparty:finagle-ostrich4',
+                 '3rdparty:util-core',
                  ],
-      'structs': []
+      'structs': [
+                 '3rdparty:scrooge-core',
+                 '3rdparty:thrift'
+                 ]
     }
   }
 
@@ -126,7 +128,6 @@ workdir: %(scrooge_legacy_workdir)s
 supportdir: %(pants_supportdir)s/bin/scrooge-legacy
 strict: False
 verbose: True
-version: 2.6.0-SNAPSHOT
 java: {
     'gen': 'java',
     'deps': {
@@ -187,22 +188,27 @@ javadeps: [':antlr4']
 [checkstyle]
 workdir: %(pants_workdir)s/checkstyle
 bootstrap-tools: [':twitter-checkstyle']
-nailgun_dir: %(pants_workdir)s/ng/checkstyle
 configuration: %(pants_supportdir)s/checkstyle/coding_style.xml
 properties: {
     'checkstyle.suppression.files': ','.join(%(checkstyle_suppression_files)s)
   }
 
 
+[scalastyle]
+config: %(buildroot)s/build-support/scalastyle/scalastyle_config.xml
+# TODO(John Sirois): The excludes are currently global for all scala files but
+# they should be trimmed back or eliminated when scalastyle is restricted to
+# non code-gen targets:  https://jira.twitter.biz/browse/AWESOME-6870
+excludes: %(buildroot)s/build-support/scalastyle/excludes.txt
+
+
 [java-compile]
 workdir: %(java_workdir)s
 
 # jmake setup
 #
 jmake-bootstrap-tools: [':jmake']
 default_to_flatten: True
-nailgun_dir: %(pants_workdir)s/ng/jmake
-
 partition_size_hint: 1000000000
 
 jvm_args: ['-Xmx2G']
@@ -249,19 +255,19 @@ scaladeps: [':scala-library']
 
 default_to_flatten: True
 
-nailgun_dir: %(pants_workdir)s/ng/scala-compile-2.9.3
 args: [
     '-S-encoding', '-SUTF-8',
     '-S-g:vars',
   ]
 warning_args: [
     '-S-deprecation',
+    '-S-unchecked',
   ]
 no_warning_args: [
     '-S-nowarn',
   ]
 
-jvm_args: [ '-Dzinc.analysis.cache.limit=0' ]
+jvm_args: ['-Xmx2g', '-XX:MaxPermSize=256m', '-Dzinc.analysis.cache.limit=0']
 
 
 [prepare-resources]
@@ -290,7 +296,7 @@ main: scala.tools.nsc.MainGenericRunner
 workdir: %(pants_workdir)s/junit
 junit-bootstrap-tools: [':junit']
 emma-bootstrap-tools: [':emma']
-args: [
+jvm_args: [
     '-Djava.awt.headless=true', '-Xmx1g', '-XX:MaxPermSize=256m',
 
     # Needed for emma instrumenter to work against classfiles generated by java 7 compilers
@@ -301,35 +307,23 @@ args: [
 [specs-run]
 workdir: %(pants_workdir)s/specs
 bootstrap-tools: [':scala-specs-2.9.3']
-args: ['-Xmx1g', '-XX:MaxPermSize=256m']
+jvm_args: ['-Xmx1g', '-XX:MaxPermSize=256m']
 
 
 [benchmark-run]
 bootstrap-tools: [':benchmark-caliper-0.5']
 agent-bootstrap-tools: [':benchmark-java-allocation-instrumenter-2.1']
-args: ['-Xmx1g', '-XX:MaxPermSize=256m']
-
-
-[markdown-to-html]
-workdir: %(pants_workdir)s/markdown
-code-style: friendly
-extensions: ['.md', '.markdown']
+jvm_args: ['-Xmx1g', '-XX:MaxPermSize=256m']
 
 
 [jar-create]
 workdir: %(pants_workdir)s/jars
 
 
-[binary-create]
-
-
 [args-resource-mapper]
 classdirs: [ '%(java_workdir)s/classes', '%(scala_workdir)s' ]
 
 
-[bundle-create]
-
-
 [ide]
 workdir: %(pants_workdir)s/ide
 classes_conf: default

src/python/twitter/pants/BUILD

@@ -38,7 +38,7 @@ python_library(
     pants('3rdparty/python:pytest-cov'),
     pants('3rdparty/python:python_daemon'),
     pants('3rdparty/python:requests'),
-    python_requirement('pylint==1.1.0', version_filter=pylint_build_filter),
+    python_requirement('pylint==1.1.0', version_filter=pylint_build_filter)
   ]
 )
 
@@ -52,7 +52,6 @@ python_library(
     pants('src/python/twitter/common/contextutil'),
     pants('src/python/twitter/common/decorators'),
     pants('src/python/twitter/common/dirutil'),
-    pants('src/python/twitter/common/java'),
     pants('src/python/twitter/common/lang'),
     pants('src/python/twitter/common/log'),
     pants('src/python/twitter/common/process'),
@@ -61,17 +60,7 @@ python_library(
     pants('src/python/twitter/common/rwbuf'),
     pants('src/python/twitter/common/threading'),
     pants('src/python/twitter/common/util'),
-    pants('src/python/twitter/thrift/text'),
   ],
-  provides = setup_py(
-    name = 'twitter.pants',
-    version = '0.0.3',
-    description = 'the pants build tool',
-    namespace_packages = [
-      'twitter',
-      'twitter.common',
-    ]
-  ),
   sources=PANTS_SOURCES,
   resources=PANTS_RESOURCES,
 )
@@ -89,31 +78,44 @@ python_binary(
   ]
 )
 
+python_library(
+  name='pants-packaged',
+  dependencies=[
+    pants(':pants-lib'),
+  ],
+  # TODO(wickman) This version should be automatically pulled in from twitter.pants.version
+  provides=setup_py(
+    name='twitter.pants',
+    version='0.0.14',
+    description="Twitter's pants build tool.",
+    url='https://github.com/twitter/commons',
+    license='Apache License, Version 2.0',
+    zip_safe=True,
+    namespace_packages=['twitter'],
+    classifiers=[
+      'Intended Audience :: Developers',
+      'License :: OSI Approved :: Apache Software License',
+      'Operating System :: OS Independent',
+      'Programming Language :: Python',
+    ]
+  ).with_binaries(
+    pants=pants(':pants'),
+  )
+)
+
 python_binary(
-  name = 'ng',
-  dependencies = [
-    'src/python/twitter/common/app',
-    'src/python/twitter/common/log',
+  name='ng',
+  dependencies=[
+    pants('src/python/twitter/common/app'),
+    pants('src/python/twitter/common/log'),
 
     # TODO(John Sirois): Break up pants src/ into proper libs - the ng client should not need all
     # of pants
-    ':pants-lib'
+    pants(':pants-lib')
   ],
-  source = NG_CLIENT,
-)
-
-# TODO(John Sirois): add a BUILD.commons github wiki goal to the 'publish' phase and publish these
-
-page(name = 'readme',
-  source = 'README.md',
-  dependencies = [
-    pants('src/python/twitter/pants/docs:migration'),
-    pants('src/python/twitter/pants/docs:internals'),
-    pants('src/python/twitter/pants/docs:setuprepo'),
-    pants(':install'),
-  ]
+  source=NG_CLIENT,
 )
 
-page(name = 'install',
-  source = 'INSTALL.md',
+page(name='readme',
+  source='README.md',
 )