Skip to content

Commit

Permalink
Making core directory a proper package.
Browse files Browse the repository at this point in the history
Also changing the version from 0.19.0 to 0.20.0dev.

Done by adding new setup.py, MANIFEST and README to core subdirectory,
adding core to the list of packages in verify_included_modules,
updating the umbrella setup to depend on core and adding the local
core package to the umbrella tox config.
  • Loading branch information
dhermes committed Sep 22, 2016
1 parent 746ce66 commit a57b173
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 6 deletions.
4 changes: 4 additions & 0 deletions core/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
include README.rst
graft google
graft unit_tests
global-exclude *.pyc
20 changes: 20 additions & 0 deletions core/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Core Helpers for Google Cloud Python Client Library
===================================================

This library is not meant to stand-alone. Instead it defines
common helpers (e.g. base ``Client`` and ``Connection`` classes)
used by all of the ``google-cloud-*``.


- `Homepage`_
- `API Documentation`_

.. _Homepage: https://googlecloudplatform.github.io/google-cloud-python/
.. _API Documentation: http://googlecloudplatform.github.io/google-cloud-python/

Quick Start
-----------

::

$ pip install --upgrade google-cloud-core
72 changes: 72 additions & 0 deletions core/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Copyright 2016 Google Inc.
#
# 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.

import os

from setuptools import find_packages
from setuptools import setup


PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))

with open(os.path.join(PACKAGE_ROOT, 'README.rst')) as file_obj:
README = file_obj.read()

# NOTE: This is duplicated throughout and we should try to
# consolidate.
SETUP_BASE = {
'author': 'Google Cloud Platform',
'author_email': 'jjg+google-cloud-python@google.com',
'scripts': [],
'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
'license': 'Apache 2.0',
'platforms': 'Posix; MacOS X; Windows',
'include_package_data': True,
'zip_safe': False,
'classifiers': [
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Topic :: Internet',
],
}


REQUIREMENTS = [
'httplib2 >= 0.9.1',
'googleapis-common-protos',
'oauth2client >= 2.0.1, < 3.0.0dev',
'protobuf >= 3.0.0',
'six',
]

setup(
name='google-cloud-core',
version='0.20.0dev',
description='API Client library for Google Cloud: Core Helpers',
long_description=README,
namespace_packages=[
'google',
'google.cloud',
],
packages=find_packages(),
install_requires=REQUIREMENTS,
**SETUP_BASE
)
1 change: 1 addition & 0 deletions scripts/verify_included_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
])
PACKAGES = (
'',
'core',
)


Expand Down
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@


REQUIREMENTS = [
'httplib2 >= 0.9.1',
'googleapis-common-protos',
'oauth2client >= 2.0.1',
'protobuf >= 3.0.0',
'six',
'google-cloud-core',
]

GRPC_PACKAGES = [
Expand All @@ -72,7 +68,7 @@

setup(
name='google-cloud',
version='0.19.0',
version='0.20.0dev',
description='API Client library for Google Cloud',
long_description=README,
namespace_packages=[
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ envlist =

[testing]
deps =
{toxinidir}/core
pytest
covercmd =
py.test --quiet \
Expand Down

0 comments on commit a57b173

Please sign in to comment.