Skip to content

Commit 6d36fd4

Browse files
authored
Merge branch 'main' into fix_action_server
2 parents b1c57b0 + 0ee3205 commit 6d36fd4

File tree

4 files changed

+48
-34
lines changed

4 files changed

+48
-34
lines changed

.bumpversion.cfg

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[bumpversion]
2-
current_version = 1.3.0
2+
current_version = 1.4.0
33
message = Bump version to {new_version}
44
commit = True
55
tag = True
66

77
[bumpversion:file:docs/conf.py]
8-
search = version = release = '{current_version}'
9-
replace = version = release = '{new_version}'
8+
search = version = release = "{current_version}"
9+
replace = version = release = "{new_version}"
1010

1111
[bumpversion:file:CHANGELOG.rst]
1212
search = Unreleased
1313
replace = {new_version}
1414

1515
[bumpversion:file:src/roslibpy/__version__.py]
16-
search = __version__ = '{current_version}'
17-
replace = __version__ = '{new_version}'
16+
search = __version__ = "{current_version}"
17+
replace = __version__ = "{new_version}"

CHANGELOG.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,21 @@ Unreleased
1414

1515
**Changed**
1616

17+
**Fixed**
18+
1719
* Fixed bug with action client/server and now they work as expected.
20+
21+
**Deprecated**
22+
23+
**Removed**
24+
25+
1.4.0
26+
----------
27+
28+
**Added**
29+
30+
**Changed**
31+
1832
* Switched to ``black`` for python code formatting.
1933
* Fix incompatible settings between ``black`` and ``flake8``.
2034
* Updated Github Actions workflows to remove python 3.6 builds.

docs/conf.py

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,38 @@
44
import os
55

66
extensions = [
7-
'sphinx.ext.autodoc',
8-
'sphinx.ext.autosummary',
9-
'sphinx.ext.coverage',
10-
'sphinx.ext.doctest',
11-
'sphinx.ext.extlinks',
12-
'sphinx.ext.ifconfig',
13-
'sphinx.ext.napoleon',
14-
'sphinx.ext.todo',
15-
'sphinx.ext.viewcode',
7+
"sphinx.ext.autodoc",
8+
"sphinx.ext.autosummary",
9+
"sphinx.ext.coverage",
10+
"sphinx.ext.doctest",
11+
"sphinx.ext.extlinks",
12+
"sphinx.ext.ifconfig",
13+
"sphinx.ext.napoleon",
14+
"sphinx.ext.todo",
15+
"sphinx.ext.viewcode",
1616
]
17-
if os.getenv('SPELLCHECK'):
18-
extensions += 'sphinxcontrib.spelling',
17+
if os.getenv("SPELLCHECK"):
18+
extensions += ("sphinxcontrib.spelling",)
1919
spelling_show_suggestions = True
20-
spelling_lang = 'en_US'
20+
spelling_lang = "en_US"
2121

22-
source_suffix = '.rst'
23-
master_doc = 'index'
24-
project = 'roslibpy'
25-
year = '2019'
26-
author = 'Gramazio Kohler Research'
27-
copyright = '{0}, {1}'.format(year, author)
28-
version = release = '1.3.0'
22+
source_suffix = ".rst"
23+
master_doc = "index"
24+
project = "roslibpy"
25+
year = "2019"
26+
author = "Gramazio Kohler Research"
27+
copyright = "{0}, {1}".format(year, author)
28+
version = release = "1.4.0"
2929

30-
pygments_style = 'trac' # Perhaps change to sphinx
31-
templates_path = ['.']
30+
pygments_style = "trac" # Perhaps change to sphinx
31+
templates_path = ["."]
3232
extlinks = {
33-
'issue': ('https://github.com/gramaziokohler/roslibpy/issues/%s', '#'),
34-
'pr': ('https://github.com/gramaziokohler/roslibpy/pull/%s', 'PR #'),
33+
"issue": ("https://github.com/gramaziokohler/roslibpy/issues/%s", "#"),
34+
"pr": ("https://github.com/gramaziokohler/roslibpy/pull/%s", "PR #"),
3535
}
3636
# on_rtd is whether we are on readthedocs.org
37-
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
38-
html_theme = 'alabaster'
37+
on_rtd = os.environ.get("READTHEDOCS", None) == "True"
38+
html_theme = "alabaster"
3939
html_theme_options = {
4040
"description": "Python ROS Bridge library",
4141
"github_user": "gramaziokohler",
@@ -44,12 +44,12 @@
4444
}
4545

4646
html_use_smartypants = True
47-
html_last_updated_fmt = '%b %d, %Y'
47+
html_last_updated_fmt = "%b %d, %Y"
4848
html_split_index = False
4949
html_sidebars = {
50-
'**': ['about.html', 'navigation.html', 'searchbox.html'],
50+
"**": ["about.html", "navigation.html", "searchbox.html"],
5151
}
52-
html_short_title = '%s-%s' % (project, version)
52+
html_short_title = "%s-%s" % (project, version)
5353

5454
napoleon_use_ivar = True
5555
napoleon_use_rtype = False

src/roslibpy/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
__title__ = "roslibpy"
55
__description__ = "Python ROS Bridge library."
66
__url__ = "https://github.com/gramaziokohler/roslibpy"
7-
__version__ = "1.3.0"
7+
__version__ = "1.4.0"
88
__author__ = "Gramazio Kohler Research"
99
__author_email__ = "[email protected]"
1010
__license__ = "MIT license"

0 commit comments

Comments
 (0)