Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ commit.
```

2. setup.cfg: Update the `current_version` key with `42.8.1`
3. scaleway.__init__.py: Update the `__version__` key with `42.8.1`
3. scaleway.apis.__init__.py: Update the `__version__` key with `42.8.1`

Then just checkout `develop` add you changes and create a new commit.

```bash
$> git checkout develop
$> git add ./scaleway/__init__.py
$> git add ./scaleway/apis/__init__.py
$> git add ./CHANGES.rst
$> git add ./setup.cfg
$> git commit -m "Post release version bump."
Expand Down
29 changes: 1 addition & 28 deletions scaleway/__init__.py
Original file line number Diff line number Diff line change
@@ -1,28 +1 @@
# -*- coding: utf-8 -*-
#
# Copyright (c) 2013-2016 Online SAS and Contributors. All Rights Reserved.
# Julien Castets <jcastets@scaleway.com>
#
# Licensed under the BSD 2-Clause License (the "License"); you may not use this
# file except in compliance with the License. You may obtain a copy of the
# License at https://opensource.org/licenses/BSD-2-Clause

import logging

# To enable logging, the client application needs to configure the logging std
# module, by calling for instance logging.basicConfig(level=logging.INFO) or
# preferably logging.config.dictConfig.

try: # Python 2.7+
from logging import NullHandler
except ImportError: # pragma no cover
class NullHandler(logging.Handler):
def emit(self, record):
pass

# Prevent message "No handlers could be found for logger "scaleway"" to be
# displayed.
logging.getLogger(__name__).addHandler(NullHandler())


__version__ = '1.10.0'
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
15 changes: 14 additions & 1 deletion scaleway/apis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,23 @@
import requests
import slumber

from .. import __version__
__version__ = '1.10.0'


# To enable logging, the client application needs to configure the logging std
# module, by calling for instance logging.basicConfig(level=logging.INFO) or
# preferably logging.config.dictConfig.
try: # Python 2.7+
from logging import NullHandler
except ImportError: # pragma no cover
class NullHandler(logging.Handler):
def emit(self, record):
pass

# Prevent message "No handlers could be found for logger "scaleway"" to be
# displayed.
logger = logging.getLogger(__name__)
logger.addHandler(NullHandler())


class _CustomHTTPAdapter(requests.adapters.HTTPAdapter):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def version():
global _version
if _version:
return _version
init_file = read_file(MODULE_NAME, '__init__.py')
init_file = read_file(MODULE_NAME, 'apis/__init__.py')
matches = re.search(
r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', init_file, re.M)
if not matches:
Expand Down