Skip to content
This repository has been archived by the owner on Apr 7, 2022. It is now read-only.

Commit

Permalink
Merge pull request #403 from tango-controls/prepare-v9.3.3
Browse files Browse the repository at this point in the history 
Update changelog and bump to v9.3.3
  • Loading branch information
@ajoubertza
ajoubertza authored Dec 23, 2020
2 parents e93e5df + 81cfd0f commit 2203f49
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 7 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 9.3.3.dev0.{build}
version: 9.3.3.{build}

image: Visual Studio 2015

Expand Down
2 changes: 1 addition & 1 deletion doc/how-to-contribute.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Create an issue in Github
Make a branch from ``develop`` to prepare the release
* Example branch name: ``prepare-v9.3.3``.
* Edit the changelog (in ``docs/revision.rst``). Include *all* pull requests
since the previous release.
since the version was bumped after the previous release.
* Bump the versions (``tango/release.py`` and ``appveyor.yml``).
E.g. ``version_info = (9, 3, 3)``, and ``version: 9.3.3.{build}``
* Create a pull request to get these changes reviewed before proceeding.
Expand Down
30 changes: 29 additions & 1 deletion doc/revision.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ Document revisions
+----------+----------------------------------------------------------------------------------+-----------------------------------------------------+--------------------------------+
| 08/08/19 | `9.3.1 <http://pytango.readthedocs.io/en/v9.3.1>`_ | 9.3.1 Release | A\. Joubert |
+----------+----------------------------------------------------------------------------------+-----------------------------------------------------+--------------------------------+
| 30/04/19 | `9.3.2 <http://pytango.readthedocs.io/en/v9.3.2>`_ | 9.3.2 Release | A\. Joubert |
| 30/04/20 | `9.3.2 <http://pytango.readthedocs.io/en/v9.3.2>`_ | 9.3.2 Release | A\. Joubert |
+----------+----------------------------------------------------------------------------------+-----------------------------------------------------+--------------------------------+
| 24/12/20 | `9.3.3 <http://pytango.readthedocs.io/en/v9.3.3>`_ | 9.3.3 Release | A\. Joubert |
+----------+----------------------------------------------------------------------------------+-----------------------------------------------------+--------------------------------+

.. _pytango-version-history:
Expand All @@ -118,6 +120,32 @@ Version history
+----------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Version | Changes |
+==========+=======================================================================================================================================================================+
| 9.3.3 | 9.3.3 release. |
| | |
| | Features: |
| | - `Pull Request #378: Add string support for MultiDeviceTestContext devices_info class field <https://github.com/tango-controls/pytango/pull/378>`_ |
| | - `Pull Request #384: Add test context support for memorized attributes <https://github.com/tango-controls/pytango/pull/384>`_ |
| | - `Pull Request #395: Fix Windows build and add CI test suite (#355, #368, #369) <https://github.com/tango-controls/pytango/pull/395>`_ |
| | |
| | Changes: |
| | - `Pull Request #365: Preserve cause of exception when getting/setting attribute in DeviceProxy (#364) <https://github.com/tango-controls/pytango/pull/365>`_ |
| | - `Pull Request #385: Improve mandatory + default device property error message (#380) <https://github.com/tango-controls/pytango/pull/385>`_ |
| | - `Pull Request #397: Add std namespace prefix in C++ code <https://github.com/tango-controls/pytango/pull/397>`_ |
| | |
| | Bug/doc fixes: |
| | - `Pull Request #360: Fix convert2array for Unicode to DevVarStringArray (Py3) (#361) <https://github.com/tango-controls/pytango/pull/360>`_ |
| | - `Pull Request #386: Fix DeviceProxy repr/str memory leak (#298) <https://github.com/tango-controls/pytango/pull/386>`_ |
| | - `Pull Request #352: Fix sphinx v3 warning <https://github.com/tango-controls/pytango/pull/352>`_ |
| | - `Pull Request #359: MultiDeviceTestContext example <https://github.com/tango-controls/pytango/pull/359>`_ |
| | - `Pull Request #363: Change old doc links from ESRF to RTD <https://github.com/tango-controls/pytango/pull/363>`_ |
| | - `Pull Request #370: Update CI to use cppTango 9.3.4rc6 <https://github.com/tango-controls/pytango/pull/370>`_ |
| | - `Pull Request #389: Update CI and dev Docker to cpptango 9.3.4 <https://github.com/tango-controls/pytango/pull/389>`_ |
| | - `Pull Request #376: Update Windows CI and dev containers to boost 1.73.0 <https://github.com/tango-controls/pytango/pull/376>`_ |
| | - `Pull Request #377: VScode remote development container support <https://github.com/tango-controls/pytango/pull/377>`_ |
| | - `Pull Request #391: Add documentation about testing <https://github.com/tango-controls/pytango/pull/391>`_ |
| | - `Pull Request #393: Fix a typo in get_server_info documentation (#392) <https://github.com/tango-controls/pytango/pull/393>`_ |
| | |
+----------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 9.3.2 | 9.3.2 release. |
| | |
| | Features: |
Expand Down
6 changes: 3 additions & 3 deletions examples/interfacechangeEvents/IfchangeServer.py
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import logging

import tango
from tango.server import Device
from tango.server import DispLevel

from tango.server import Device
from tango.server import attribute, command


Expand Down Expand Up @@ -53,7 +52,8 @@ def add_dyn_cmd(self):
cmd = command(f=self.start, dtype_in=str, dtype_out=int,
doc_in='description of input',
doc_out='description of output',
display_level=DispLevel.EXPERT, polling_period=5.1)
display_level=tango.DispLevel.EXPERT,
polling_period=5100)
self.add_command(cmd, device_level)

@command(dtype_in=str, doc_in='name of dynamic command to delete')
Expand Down
2 changes: 1 addition & 1 deletion tango/release.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Release:
- license: (str) the license
"""
name = 'pytango'
version_info = (9, 3, 3, 'dev', 0)
version_info = (9, 3, 3)
version = '.'.join(map(str, version_info[:3]))
release = ''.join(map(str, version_info[3:]))
separator = '.' if 'dev' in release or 'post' in release else ''
Expand Down

0 comments on commit 2203f49

Please sign in to comment.