Skip to content

Commit ea0e291

Browse files
dhermesdhermes
committed
Making core directory a proper package.
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.
1 parent 0379441 commit ea0e291

File tree

6 files changed

+100
-6
lines changed

6 files changed

+100
-6
lines changed

‎core/MANIFEST.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
include README.rst
2+
graft google
3+
graft unit_tests
4+
global-exclude *.pyc

‎core/README.rst‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Core Helpers for Google Cloud Python Client Library
2+
===================================================
3+
4+
This library is not meant to stand-alone. Instead it defines
5+
common helpers (e.g. base ``Client`` and ``Connection`` classes)
6+
used by all of the ``google-cloud-*``.
7+
8+
9+
- `Homepage`_
10+
- `API Documentation`_
11+
12+
.. _Homepage: https://googlecloudplatform.github.io/google-cloud-python/
13+
.. _API Documentation: http://googlecloudplatform.github.io/google-cloud-python/
14+
15+
Quick Start
16+
-----------
17+
18+
::
19+
20+
$ pip install --upgrade google-cloud-core

‎core/setup.py‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Copyright 2016 Google Inc.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import os
16+
17+
from setuptools import find_packages
18+
from setuptools import setup
19+
20+
21+
PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))
22+
23+
with open(os.path.join(PACKAGE_ROOT, 'README.rst')) as file_obj:
24+
README = file_obj.read()
25+
26+
# NOTE: This is duplicated throughout and we should try to
27+
# consolidate.
28+
SETUP_BASE = {
29+
'author': 'Google Cloud Platform',
30+
'author_email': 'jjg+google-cloud-python@google.com',
31+
'scripts': [],
32+
'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',
33+
'license': 'Apache 2.0',
34+
'platforms': 'Posix; MacOS X; Windows',
35+
'include_package_data': True,
36+
'zip_safe': False,
37+
'classifiers': [
38+
'Development Status :: 4 - Beta',
39+
'Intended Audience :: Developers',
40+
'License :: OSI Approved :: Apache Software License',
41+
'Operating System :: OS Independent',
42+
'Programming Language :: Python :: 2',
43+
'Programming Language :: Python :: 2.7',
44+
'Programming Language :: Python :: 3',
45+
'Programming Language :: Python :: 3.4',
46+
'Programming Language :: Python :: 3.5',
47+
'Topic :: Internet',
48+
],
49+
}
50+
51+
52+
REQUIREMENTS = [
53+
'httplib2 >= 0.9.1',
54+
'googleapis-common-protos',
55+
'oauth2client >= 2.0.1, < 3.0.0dev',
56+
'protobuf >= 3.0.0',
57+
'six',
58+
]
59+
60+
setup(
61+
name='google-cloud-core',
62+
version='0.20.0dev',
63+
description='API Client library for Google Cloud: Core Helpers',
64+
long_description=README,
65+
namespace_packages=[
66+
'google',
67+
'google.cloud',
68+
],
69+
packages=find_packages(),
70+
install_requires=REQUIREMENTS,
71+
**SETUP_BASE
72+
)

‎scripts/verify_included_modules.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
])
6060
PACKAGES = (
6161
'',
62+
'core',
6263
)
6364

6465

‎setup.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@
5050

5151

5252
REQUIREMENTS = [
53-
'httplib2 >= 0.9.1',
54-
'googleapis-common-protos',
55-
'oauth2client >= 2.0.1',
56-
'protobuf >= 3.0.0',
57-
'six',
53+
'google-cloud-core',
5854
]
5955

6056
GRPC_PACKAGES = [
@@ -72,7 +68,7 @@
7268

7369
setup(
7470
name='google-cloud',
75-
version='0.19.0',
71+
version='0.20.0dev',
7672
description='API Client library for Google Cloud',
7773
long_description=README,
7874
namespace_packages=[

‎tox.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ envlist =
44

55
[testing]
66
deps =
7+
{toxinidir}/core
78
pytest
89
covercmd =
910
py.test --quiet \

0 commit comments

Comments
 (0)