diff options
author | Lars Wirzenius <liw@liw.fi> | 2017-10-14 11:50:51 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2017-10-14 11:50:51 +0300 |
commit | 8c34972274efdc291839a2609330ce5e7b54be76 (patch) | |
tree | 0cec3891fad823536e8d01c1b7ebdeb9b65ce820 | |
parent | d485239e28d5b1e8f06898836cb36f7fcc1ee723 (diff) | |
parent | ff843600260439bb7ee7c0e5db15fab53c71cca2 (diff) | |
download | ick2-8c34972274efdc291839a2609330ce5e7b54be76.tar.gz |
Merge: ick2version into ick2, add copyright to start_ick
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | copyright-exceptions | 2 | ||||
-rw-r--r-- | ick2/__init__.py | 1 | ||||
-rw-r--r-- | ick2/controllerapi.py | 3 | ||||
-rw-r--r-- | ick2/controllerapi_tests.py | 3 | ||||
-rw-r--r-- | ick2/version.py (renamed from ick2version/version.py) | 0 | ||||
-rw-r--r-- | ick2version/__init__.py | 17 | ||||
-rw-r--r-- | setup.py | 9 | ||||
-rw-r--r-- | start_ick | 14 | ||||
-rwxr-xr-x | worker_manager | 4 |
10 files changed, 26 insertions, 29 deletions
@@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. Version 0.6+git, not yet released --------------------------------- +* `ick2version` has been removed, the canonical location for the + version is not `ick2.__version__`. Version 0.6, released 2017-10-13 --------------------------------- diff --git a/copyright-exceptions b/copyright-exceptions index 74c7d98..fc157b8 100644 --- a/copyright-exceptions +++ b/copyright-exceptions @@ -7,6 +7,6 @@ debian/copyright debian/ick2.dirs debian/ick2.install debian/source/format -ick2version/version.py +ick2/version.py pylint.conf without-tests diff --git a/ick2/__init__.py b/ick2/__init__.py index 244ca88..e24092e 100644 --- a/ick2/__init__.py +++ b/ick2/__init__.py @@ -13,6 +13,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. +from .version import __version__, __version_info__ from .logging import setup_logging, log from .state import ControllerState, NotFound from .controllerapi import ControllerAPI diff --git a/ick2/controllerapi.py b/ick2/controllerapi.py index ef93f54..7d43fda 100644 --- a/ick2/controllerapi.py +++ b/ick2/controllerapi.py @@ -17,7 +17,6 @@ import apifw import ick2 -import ick2version class ControllerAPI: @@ -72,7 +71,7 @@ class ControllerAPI: return apifw.Response({ 'status': apifw.HTTP_OK, 'body': { - 'version': ick2version.__version__, + 'version': ick2.__version__, }, 'headers': { 'Content-Type': 'application/json', diff --git a/ick2/controllerapi_tests.py b/ick2/controllerapi_tests.py index 8a914a3..f8f6941 100644 --- a/ick2/controllerapi_tests.py +++ b/ick2/controllerapi_tests.py @@ -20,7 +20,6 @@ import unittest import ick2 -import ick2version class ControllerAPITests(unittest.TestCase): @@ -54,7 +53,7 @@ class ControllerAPITests(unittest.TestCase): self.assertEqual( response['body'], { - 'version': ick2version.__version__, + 'version': ick2.__version__, } ) diff --git a/ick2version/version.py b/ick2/version.py index ed54455..ed54455 100644 --- a/ick2version/version.py +++ b/ick2/version.py diff --git a/ick2version/__init__.py b/ick2version/__init__.py deleted file mode 100644 index 7a73a9e..0000000 --- a/ick2version/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2017 Lars Wirzenius -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - - -from .version import __version__, __version_info__ @@ -14,20 +14,19 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from distutils.core import setup, Extension -import glob +from distutils.core import setup -import ick2version +import ick2 setup( name='ick2', - version=ick2version.__version__, + version=ick2.__version__, description='CI server', author='Lars Wirzenius', author_email='liw@liw.fi', url='http://liw.fi/ick/', py_modules=['ick_controller'], - packages=['ick2', 'ick2version'], + packages=['ick2'], scripts=['create-token', 'start_ick'], data_files=[], ) @@ -1,4 +1,18 @@ #!/bin/sh +# Copyright (C) 2017 Lars Wirzenius +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. set -eux diff --git a/worker_manager b/worker_manager index 6204392..bddc7a6 100755 --- a/worker_manager +++ b/worker_manager @@ -22,7 +22,7 @@ import time import cliapp import requests -import ick2version +import ick2 class WorkerManager(cliapp.Application): @@ -133,4 +133,4 @@ class WorkerManager(cliapp.Application): r.status_code, r.text)) -WorkerManager(version=ick2version.__version__).run() +WorkerManager(version=ick2.__version__).run() |