diff options
| author | Max Illfelder <illfelder@users.noreply.github.com> | 2016-06-15 10:49:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 10:49:03 -0700 |
| commit | 8e97ca75c32f4b1445218ba1b76583bac8e41f1f (patch) | |
| tree | 9362bddbecfed1bc977d60b7c269d73134a71c7e | |
| parent | 919826648fc2c9ef821650bdfc94bdf06da8bdd0 (diff) | |
| parent | 86ce7530cb40966db3257306e42c36af76fb5f1a (diff) | |
| download | google-compute-image-packages-8e97ca75c32f4b1445218ba1b76583bac8e41f1f.tar.gz | |
Merge pull request #265 from illfelder/development
Modify package configuration for PyPI packaging.
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | MANIFEST.in | 4 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rwxr-xr-x | setup.py | 5 |
4 files changed, 19 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index cc5b132..0b38796 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,3 +24,13 @@ install: # nosetests will run all tests within the current directory. script: - nosetests + +deploy: + provider: pypi + user: gc-team + password: + secure: ljO08Dm8MnVZLse68cxe/o85x20C3JseBupESr2hXK/3axRYbW3o6TbRwAlHDCrOrDjg+NzmEjZojxg9A2+5DuWcWJLvKcCG4NbheoMAbs38IGou5mAbLhcj+GBdM03wKHqEDPEyMT5s/LuMlpOcxtDnF+oJ0Wm8czGnyi06IM4= + on: + tags: true + distributions: sdist bdist_wheel + repo: GoogleCloudPlatform/compute-image-packages diff --git a/MANIFEST.in b/MANIFEST.in index dc046f4..040f2fa 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,5 @@ +# Include the license file. +include LICENSE + +# Include init configuration files. graft package diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..7c964b4 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[wheel] +universal=1 @@ -44,6 +44,7 @@ data_files = [ # Data files specific to the various Linux init systems. data_files_dict = { + None: [], 'systemd': [('/usr/lib/systemd/system', GetInitFiles('package/systemd'))], 'sysvinit': [('/etc/init.d', GetInitFiles('package/sysvinit'))], 'upstart': [('/etc/init', GetInitFiles('package/upstart'))], @@ -51,14 +52,14 @@ data_files_dict = { if os.environ.get('CONFIG') not in data_files_dict.keys(): - keys = ', '.join(data_files_dict.keys()) + keys = ', '.join([key for key in data_files_dict.keys() if key]) sys.exit('Expected "CONFIG" environment variable set to one of [%s].' % keys) setuptools.setup( author='Google Compute Engine Team', author_email='gc-team@google.com', - data_files=data_files + data_files_dict.get(os.environ['CONFIG']), + data_files=data_files + data_files_dict.get(os.environ.get('CONFIG')), description='Google Compute Engine', include_package_data=True, install_requires=['boto'], |