Remove buildbot-slave.

There have been no substantive changes to the slave in 0.9.x, and
buildbot-worker provides equivalent functionality, so get rid of the
duplication.

.travis.yml

@@ -51,9 +51,6 @@ env:
   # Configuration to run `python setup.py test` to check this test runner.
   # - TWISTED=latest SQLALCHEMY=latest TESTS=setuppy_test
 
-  # Configuration to run tests without installed buildbot-slave.
-  - TWISTED=latest SQLALCHEMY=latest TESTS=trial_worker_only
-
 cache:
   directories:
     - $HOME/.cache/pip
@@ -71,7 +68,7 @@ cache:
 matrix:
   fast_finish: true
   include:
-    # Tests of buildbot-worker and buildbot-slave on python 2.6
+    # Tests of buildbot-worker on python 2.6
     # Specify SQLALCHEMY=latest to avoid errors installing.
     - python: "2.6"
       env: TWISTED=14.0.2 TESTS=trial_worker SQLALCHEMY=latest
@@ -95,18 +92,14 @@ install:
       [ $TESTS != trial -a $TESTS != coverage -a $TESTS != lint -a $TESTS != js ] || \
       pip install -e pkg \
                   -e master[tls,test] \
-                  -e slave \
                   -e worker \
                   MySQL-python \
                   psycopg2 \
                   pg8000 \
 
   - |
       [ $TESTS != trial_worker ] || \
-      pip install -e slave \
-                  -e worker \
-
-  - "[ $TESTS != trial_worker_only ] || pip install -e pkg -e master[tls,test] -e worker"
+      pip install -e worker
 
   # install buildbot_www from pip in order to run the www tests
   - "[ $TESTS != trial -a $TESTS != coverage ] || pip install --pre buildbot_www"
@@ -115,8 +108,7 @@ install:
   # for python 3 we dont install everything yet..
   - |
       [ $TESTS != py3 ] || \
-      pip install -e slave \
-                  -e worker \
+      pip install -e worker \
                   future
 
   # Run additional tests only in latest configuration
@@ -147,13 +139,13 @@ before_script:
 # Tests running commands
 script:
   - "[ $TESTS != js ] || make frontend_install_tests"
-  - "[ $TESTS != trial ]   || trial  --reporter=text --rterrors buildbot.test buildslave.test buildbot_worker.test"
-  - "[ $TESTS != trial_worker ] || trial  --reporter=text --rterrors buildslave.test buildbot_worker.test"
+  - "[ $TESTS != trial ]   || trial  --reporter=text --rterrors buildbot.test buildbot_worker.test"
+  - "[ $TESTS != trial_worker ] || trial  --reporter=text --rterrors buildbot_worker.test"
   # run tests under coverage for latest only (it's slower..)
-  - "[ $TESTS != coverage ] || coverage run --rcfile=.coveragerc $(which trial) --reporter=text --rterrors buildbot.test buildslave.test buildbot_worker.test"
+  - "[ $TESTS != coverage ] || coverage run --rcfile=.coveragerc $(which trial) --reporter=text --rterrors buildbot.test buildbot_worker.test"
 
   # run tests that are know to work on py3
-  - "[ $TESTS != py3 ] || trial  --reporter=text --rterrors buildslave.test buildbot_worker.test"
+  - "[ $TESTS != py3 ] || trial  --reporter=text --rterrors buildbot_worker.test"
 
   # Run additional tests in their separate job
   - "[ $TESTS != lint ] || make pylint"
@@ -167,11 +159,8 @@ script:
   - "[ $TESTS != docs ] || make -C master/docs SPHINXOPTS=-q linkcheck"
 
   - "[ $TESTS != setuppy_test ] || (cd master; python setup.py test)"
-  - "[ $TESTS != setuppy_test ] || (cd slave;  python setup.py test)"
   - "[ $TESTS != setuppy_test ] || (cd worker; python setup.py test)"
 
-  - "[ $TESTS != trial_worker_only ] || trial --reporter=text --rterrors buildbot.test buildbot_worker.test"
-
 notifications:
   email: false
 

Makefile

@@ -11,14 +11,12 @@ docs:
 # pylint the whole sourcecode (validate.sh will do that as well, but only process the modified files)
 pylint:
 	$(MAKE) -C master pylint; master_res=$$?; \
-	$(MAKE) -C slave pylint; slave_res=$$?; \
 	$(MAKE) -C worker pylint; worker_res=$$?; \
-	if [ $$master_res != 0 ] || [ $$slave_res != 0 ] || [ $$worker_res != 0 ]; then exit 1; fi
+	if [ $$master_res != 0 ] || [ $$worker_res != 0 ]; then exit 1; fi
 
 # flake8 the whole sourcecode (validate.sh will do that as well, but only process the modified files)
 flake8:
 	$(MAKE) -C master flake8
-	$(MAKE) -C slave flake8
 	$(MAKE) -C worker flake8
 	flake8 --config=common/flake8rc www/*/buildbot_*/
 	flake8 --config=common/flake8rc www/*/setup.py

appveyor.yml

@@ -23,14 +23,13 @@ install:
 
   - "%PYTHON%\\python.exe -m pip install -e pkg"
   - "%PYTHON%\\python.exe -m pip install -e master[tls,test]"
-  - "%PYTHON%\\python.exe -m pip install -e slave"
   - "%PYTHON%\\python.exe -m pip install -e worker"
   - "%PYTHON%\\python.exe -m pip list"
 
 build: false
 
 test_script:
-  - "%PYTHON%\\python.exe %PYTHON%\\Scripts\\trial.py --reporter=text --rterrors buildbot.test buildslave.test buildbot_worker.test"
+  - "%PYTHON%\\python.exe %PYTHON%\\Scripts\\trial.py --reporter=text --rterrors buildbot.test buildbot_worker.test"
 
 on_failure:
   # Store _trial_temp directory as artifact on build failure.

circle.yml

@@ -8,7 +8,7 @@ machine:
 dependencies:
   override:
     - pyenv global 2.7.11
-    - pip install -e pkg -e master[docs] -e slave -e worker
+    - pip install -e pkg -e master[docs] -e worker
 
 test:
   override:

common/coveragerc

@@ -25,7 +25,6 @@ exclude_lines =
 
 include =
     master/*
-    slave/*
     worker/*
 
 omit =

common/merge_and_pep8.sh

@@ -21,7 +21,7 @@ function unittests()
 {
     status run the whole test suite as a double check
     find . -name \*.pyc -exec rm {} \;
-    trial --reporter=text buildslave buildbot_worker buildbot
+    trial --reporter=text buildbot_worker buildbot
     if [[ $? != 0 ]]
     then
         echo "Oups.. the tests are failing, better resolve them now before the big autopep8 work"

common/validate.sh

@@ -1,5 +1,5 @@
 #! /bin/bash
-TEST='buildbot.test buildslave.test buildbot_worker.test'
+TEST='buildbot.test buildbot_worker.test'
 
 # if stdout is a terminal define some colors
 # validate.sh can be run as hook from GUI git clients, such as git-gui
@@ -162,7 +162,7 @@ if ! $quick; then
 elif [ -z `command -v cctrial` ]; then
     warning "Skipping Python Tests ('pip install cctrial' for quick tests)"
 else
-    cctrial -H buildbot buildslave buildbot_worker || not_ok "Python tests failed"
+    cctrial -H buildbot buildbot_worker || not_ok "Python tests failed"
 fi
 
 status "checking formatting"

master/docs/developer/tests.rst

@@ -1,7 +1,7 @@
 Buildbot's Test Suite
 =====================
 
-Buildbot's master tests are under ``buildbot.test``, ``buildbot-worker`` package tests are under ``buildbot_worker.test``, and ``buildbot-slave`` package tests are under ``buildslave.test``.
+Buildbot's master tests are under ``buildbot.test``, ``buildbot-worker`` package tests are under ``buildbot_worker.test``.
 Tests for the workers are similar to the master, although in some cases helpful functionality on the master is not re-implemented on the worker.
 
 Suites

master/docs/manual/installation/worker.rst

@@ -185,7 +185,7 @@ During project lifetime worker has transitioned over few states:
 
 1. Before Buildbot version 0.8.1 worker were integral part of ``buildbot`` package distribution.
 2. Starting from Buildbot version 0.8.1 worker were extracted from ``buildbot`` package to ``buildbot-slave`` package.
-3. Starting from Buildbot version 0.9.0 ``buildbot-slave`` were deprecated in favor of ``buildbot-worker`` package.
+3. Starting from Buildbot version 0.9.0 the ``buildbot-slave`` package was renamed to ``buildbot-worker``.
 
 Upgrading a Worker to buildbot-slave 0.8.1
 ''''''''''''''''''''''''''''''''''''''''''

master/docs/manual/worker-transition.rst

@@ -536,10 +536,10 @@ List of database-related changes in API (fallback for old API is provided):
 ``buildbot-worker``
 -------------------
 
-``buildbot-slave`` package has been deprecated in favor of ``buildbot-worker`` package.
+``buildbot-slave`` package has been renamed to ``buildbot-worker``.
 
 ``buildbot-worker`` has backward incompatible changes and requires buildmaster >= 0.9.0b8.
-``buildbot-slave`` will work with both 0.8.x and 0.9.x versions of buildmaster, so there is no need to upgrade currently deployed buildbot-slaves during switch from 0.8.x to 0.9.x.
+``buildbot-slave`` from 0.8.x will work with both 0.8.x and 0.9.x versions of buildmaster, so there is no need to upgrade currently deployed buildbot-slaves during switch from 0.8.x to 0.9.x.
 
 .. list-table:: Master/worker compatibility table
    :header-rows: 1

master/docs/relnotes/index.rst

@@ -68,10 +68,10 @@ Deprecations, Removals, and Non-Compatible Changes
 Buildslave
 ----------
 
-Fixes
-~~~~~
+Deprecations, Removals, and Non-Compatible Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-* ``buildslave`` script now outputs messages to the terminal.
+* The ``buildbot-slave`` package has finished being renamed to ``buildbot-worker``.
 
 
 Worker