old_contents: #!/usr/bin/env python
  # 
  # Copyright 2011 Google Inc. All Rights Reserved.
  # 
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  # 
  #     http://www.apache.org/licenses/LICENSE-2.0
  # 
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS-IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  # # Do NOT change the above sha-bang line unless if you know what you are doing.
  #
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  #
  #     http://www.apache.org/licenses/LICENSE-2.0
  #
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS-IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  # #
  
  try:
    from setuptools import setup, find_packages
  except ImportError:
    print 'required Python setuptools is missing.'
    print 'install from http://pypi.python.org/pypi/setuptools'
    raise SystemExit(1)
  
  
  REQUIRE_BASE = [
      'setuptools>=0.6c9',     # fix bugs with old version on Leopard
      'pyasn1==0.1.2',
      'tlslite==0.3.8',
      'pyyaml>=3.10',
      'icalendar==1.2',
      'WebOb==1.1.1',
  ]
  
  REQUIRE_SETUP = REQUIRE_BASE + [
      'google_apputils>=0.2',
      'python-dateutil>=1.4,<2',  # because of google_apputils
      'unittest2==0.5.1',
      'M2Crypto==0.21.1',
  ]
  
  REQUIRE_TEST = REQUIRE_BASE + REQUIRE_SETUP + [
      'mox>=0.5.3',
      'webapp2',
      'django',
  ]
  
  REQUIRE_INSTALL = REQUIRE_BASE
  
  SIMIAN_STUBS = [
      ('simianadmin', 'RunSimianAdmin'),
      ('simianauth', 'RunSimianAuth'),
  ]
  SIMIAN_ENTRY_POINTS = ['%s = simian.stubs:%s' % s for s in SIMIAN_STUBS]
  
  setup(
    name = 'simian',
    version = '2.2.1',
    url = 'http://code.google.com/p/simian',
    license = 'Apache 2.0',
    description = 'An App Engine-based client & server component for Munki',
    author = 'Google',
    author_email = 'simian-eng@googlegroups.com',
  
    packages = find_packages('src', exclude=['tests']),
    package_dir = {'': 'src'},
    package_data = {
        '': ['*.zip'],
    },
    include_package_data = True,
  
    entry_points = {
        'console_scripts': SIMIAN_ENTRY_POINTS,
    },
  
    setup_requires = REQUIRE_SETUP,
    install_requires = REQUIRE_INSTALL,
    tests_require = REQUIRE_TEST,
  
    google_test_dir = 'src/tests',
  )
new_contents: #!/usr/bin/env python
  # 
  # Copyright 2011 Google Inc. All Rights Reserved.
  # 
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  # 
  #     http://www.apache.org/licenses/LICENSE-2.0
  # 
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS-IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  # # Do NOT change the above sha-bang line unless if you know what you are doing.
  #
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  #
  #     http://www.apache.org/licenses/LICENSE-2.0
  #
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS-IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  # #
  
  try:
    from setuptools import setup, find_packages
  except ImportError:
    print 'required Python setuptools is missing.'
    print 'install from http://pypi.python.org/pypi/setuptools'
    raise SystemExit(1)
  
  
  REQUIRE_BASE = [
      'setuptools>=0.6c9',     # fix bugs with old version on Leopard
      'pyasn1==0.1.2',
      'tlslite==0.3.8',
      'pyyaml>=3.10',
  ]
  
  REQUIRE_SETUP = REQUIRE_BASE + [
      'google_apputils>=0.2',
      'icalendar==1.2',
      'python-dateutil>=1.4,<2',  # because of google_apputils
      'unittest2==0.5.1',
      'M2Crypto==0.21.1',
      'WebOb==1.1.1',
  ]
  
  REQUIRE_TEST = REQUIRE_BASE + REQUIRE_SETUP + [
      'mox>=0.5.3',
      'webapp2',
      'django',
  ]
  
  REQUIRE_INSTALL = REQUIRE_BASE
  
  SIMIAN_STUBS = [
      ('simianadmin', 'RunSimianAdmin'),
      ('simianauth', 'RunSimianAuth'),
  ]
  SIMIAN_ENTRY_POINTS = ['%s = simian.stubs:%s' % s for s in SIMIAN_STUBS]
  
  setup(
    name = 'simian',
    version = '2.2.1',
    url = 'http://code.google.com/p/simian',
    license = 'Apache 2.0',
    description = 'An App Engine-based client & server component for Munki',
    author = 'Google',
    author_email = 'simian-eng@googlegroups.com',
  
    packages = find_packages('src', exclude=['tests']),
    package_dir = {'': 'src'},
    package_data = {
        '': ['*.zip'],
    },
    include_package_data = True,
  
    entry_points = {
        'console_scripts': SIMIAN_ENTRY_POINTS,
    },
  
    setup_requires = REQUIRE_SETUP,
    install_requires = REQUIRE_INSTALL,
    tests_require = REQUIRE_TEST,
  
    google_test_dir = 'src/tests',
  )
subject: move icalendar and WebOb to REQUIRE_SETUP, as they're not needed in the client.