Skip to content

Commit 6e6275d

Browse files
committed
Prepare 1.2.3 release
1 parent a229e59 commit 6e6275d

File tree

6 files changed

+45
-33
lines changed

6 files changed

+45
-33
lines changed

CHANGES.rst

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
Changes
22
=======
33

4-
1.2.3 (2014-??-??)
4+
1.2.3 (2015-10-12)
55
------------------
66

7-
Major changes
8-
~~~~~~~~~~~~~
7+
Complete list of changes and bug fixes
8+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9+
10+
PySide
11+
******
12+
13+
- Fix PYSIDE-164: Fix possible deadlock on signal connect/emit
14+
15+
Shiboken
16+
********
17+
18+
- Don't ignore classes in topology
19+
- Process global enums in declaration order
20+
- Return enums in declaration order (order added)
921

1022
PySide-setup
1123
************
1224

13-
- On Linux systems there is no more need to call the post-install script
25+
- On Linux and MacOS systems there is no more need to call the post-install script
1426

1527
1.2.2 (2014-04-24)
1628
------------------

docs/building/linux.rst

+8-8
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ Building PySide distribution
3737

3838
::
3939

40-
$ wget https://pypi.python.org/packages/source/P/PySide/PySide-1.2.2.tar.gz
40+
$ wget https://pypi.python.org/packages/source/P/PySide/PySide-1.2.3.tar.gz
4141

4242
#. Extract the source distribution:
4343

4444
::
4545

46-
$ tar -xvzf PySide-1.2.2.tar.gz
46+
$ tar -xvzf PySide-1.2.3.tar.gz
4747

4848
#. Switch to the distribution directory:
4949

5050
::
5151

52-
$ cd PySide-1.2.2
52+
$ cd PySide-1.2.3
5353

5454
#. Build the ``wheel`` binary distribution:
5555

@@ -83,13 +83,13 @@ Building PySide distribution from a Git repository
8383

8484
::
8585

86-
$ python2.7 setup.py bdist_wheel --qmake=/usr/bin/qmake-qt4 --version=1.2.2
86+
$ python2.7 setup.py bdist_wheel --qmake=/usr/bin/qmake-qt4 --version=1.2.3
8787

8888
#. Optionally you can build standalone version of distribution with embedded Qt libs:
8989

9090
::
9191

92-
$ python2.7 setup.py bdist_wheel --qmake=/usr/bin/qmake-qt4 --version=1.2.2 --standalone
92+
$ python2.7 setup.py bdist_wheel --qmake=/usr/bin/qmake-qt4 --version=1.2.3 --standalone
9393

9494
#. To build the development version of ``PySide`` distribution, ignore the --version parameter:
9595

@@ -106,8 +106,8 @@ Installing PySide distribution
106106
::
107107

108108
$ ls dist
109-
PySide-1.2.2-cp27-none-linux-x86_64.whl
110-
$ sudo pip2.7 install dist/PySide-1.2.2-cp27-none-linux-x86_64.whl
109+
PySide-1.2.3-cp27-none-linux-x86_64.whl
110+
$ sudo pip2.7 install dist/PySide-1.2.3-cp27-none-linux-x86_64.whl
111111

112112

113113
Installing PySide distribution into ``virtual`` Python environment
@@ -135,4 +135,4 @@ Installing PySide distribution into ``virtual`` Python environment
135135

136136
::
137137

138-
$ bin/pip2.7 install ../dist/PySide-1.2.2-cp27-none-linux-x86_64.whl
138+
$ bin/pip2.7 install ../dist/PySide-1.2.3-cp27-none-linux-x86_64.whl

docs/building/macosx.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -162,19 +162,19 @@ Building PySide distribution
162162

163163
::
164164

165-
$ wget https://pypi.python.org/packages/source/P/PySide/PySide-1.2.2.tar.gz
165+
$ wget https://pypi.python.org/packages/source/P/PySide/PySide-1.2.3.tar.gz
166166

167167
#. Extract the source distribution:
168168

169169
::
170170

171-
$ tar -xvzf PySide-1.2.2.tar.gz
171+
$ tar -xvzf PySide-1.2.3.tar.gz
172172

173173
#. Switch to the distribution directory:
174174

175175
::
176176

177-
$ cd PySide-1.2.2
177+
$ cd PySide-1.2.3
178178

179179
#. Build the ``wheel`` binary distribution:
180180

@@ -202,14 +202,14 @@ Building PySide distribution from a Git repository
202202

203203
::
204204

205-
$ python2.7 setup.py bdist_wheel --version=1.2.2
205+
$ python2.7 setup.py bdist_wheel --version=1.2.3
206206

207207
.. commented out, working on this
208208
#. Optionally you can build standalone version of distribution with embedded Qt libs:
209209
210210
::
211211
212-
$ python2.7 setup.py bdist_wheel --version=1.2.2 --standalone
212+
$ python2.7 setup.py bdist_wheel --version=1.2.3 --standalone
213213
214214
#. To build the development version of ``PySide`` distribution, ignore the --version parameter:
215215

@@ -225,7 +225,7 @@ Installing PySide distribution
225225

226226
::
227227

228-
$ sudo pip2.7 install dist/PySide-1.2.2-cp27-none-linux-x86_64.whl
228+
$ sudo pip2.7 install dist/PySide-1.2.3-cp27-none-linux-x86_64.whl
229229

230230

231231
Installing PySide distribution into ``virtual`` Python environment
@@ -253,7 +253,7 @@ Installing PySide distribution into ``virtual`` Python environment
253253

254254
::
255255

256-
(env) $ pip install ../dist/PySide-1.2.2-cp27-none-linux-x86_64.whl
256+
(env) $ pip install ../dist/PySide-1.2.3-cp27-none-linux-x86_64.whl
257257

258258
#. Leave the virtual environment (optional):
259259

docs/building/windows.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,19 @@ Building PySide distribution
6262
----------------------------
6363

6464
#. Download and extract `PySide source distribution
65-
<https://pypi.python.org/packages/source/P/PySide/PySide-1.2.2.tar.gz>`_
65+
<https://pypi.python.org/packages/source/P/PySide/PySide-1.2.3.tar.gz>`_
6666

6767
#. Switch to the distribution directory:
6868

6969
::
7070

71-
c:\> cd PySide-1.2.2
71+
c:\> cd PySide-1.2.3
7272

7373
#. Build the ``wheel`` binary distribution:
7474

7575
::
7676

77-
c:\> c:\Python27\python.exe setup.py bdist_wheel --qmake=c:\Qt\4.8.5\bin\qmake.exe --openssl=c:\OpenSSL32bit\bin
77+
c:\> c:\Python27\python.exe setup.py bdist_wheel --qmake=c:\Qt\4.8.7\bin\qmake.exe --openssl=c:\OpenSSL32bit\bin
7878

7979

8080
Building PySide distribution from a Git repository
@@ -96,13 +96,13 @@ Building PySide distribution from a Git repository
9696

9797
::
9898

99-
c:\> c:\Python27\python.exe setup.py bdist_wheel --version=1.2.2 --qmake=c:\Qt\4.8.5\bin\qmake.exe --openssl=c:\OpenSSL32bit\bin
99+
c:\> c:\Python27\python.exe setup.py bdist_wheel --version=1.2.3 --qmake=c:\Qt\4.8.7\bin\qmake.exe --openssl=c:\OpenSSL32bit\bin
100100

101101
#. To build the development version of ``PySide`` distribution, ignore the --version parameter:
102102

103103
::
104104

105-
c:\> c:\Python27\python.exe setup.py bdist_wheel --qmake=c:\Qt\4.8.5\bin\qmake.exe --openssl=c:\OpenSSL32bit\bin
105+
c:\> c:\Python27\python.exe setup.py bdist_wheel --qmake=c:\Qt\4.8.7\bin\qmake.exe --openssl=c:\OpenSSL32bit\bin
106106

107107

108108
Installing PySide distribution
@@ -112,7 +112,7 @@ Installing PySide distribution
112112

113113
::
114114

115-
c:\> c:\Python27\Scripts\pip install dist\PySide-1.2.2-cp27-none-win32.whl
115+
c:\> c:\Python27\Scripts\pip install dist\PySide-1.2.3-cp27-none-win32.whl
116116

117117

118118
Installing PySide distribution into ``virtual`` Python environment
@@ -140,4 +140,4 @@ Installing PySide distribution into ``virtual`` Python environment
140140

141141
::
142142

143-
c:\> Scripts\pip install ..\dist\PySide-1.2.2-cp27-none-win32.whl
143+
c:\> Scripts\pip install ..\dist\PySide-1.2.3-cp27-none-win32.whl

docs/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
# built documents.
5252
#
5353
# The short X.Y version.
54-
version = '1.2.2'
54+
version = '1.2.3'
5555
# The full version, including alpha/beta/rc tags.
56-
release = '1.2.2'
56+
release = '1.2.3'
5757

5858
# The language for content autogenerated by Sphinx. Refer to documentation
5959
# for a list of supported languages.

setup.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
You can download OpenSSL for windows here: http://slproweb.com/products/Win32OpenSSL.html
2727
"""
2828

29-
__version__ = "1.3.0dev"
29+
__version__ = "1.2.3"
3030

3131
submodules = {
32-
'1.3.0dev': [
33-
["shiboken", "master"],
34-
["pyside", "master"],
35-
["pyside-tools", "master"],
32+
'1.2.3': [
33+
["shiboken", "1.2.3"],
34+
["pyside", "1.2.3"],
35+
["pyside-tools", "0.2.15"],
3636
["pyside-examples", "master"],
3737
],
3838
'1.2.2': [

0 commit comments

Comments
 (0)