Skip to content

use Qt4 QString with api version 1 if required #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 50 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
ae5b011
use Qt4 QString with api version 1 fixed
mjirik Aug 28, 2015
a676939
py3 ready
mjirik Nov 21, 2017
06317a4
version updated
mjirik Nov 21, 2017
ad4fe80
recipe
mjirik Feb 4, 2019
0e58b3c
fix git url
mjirik Feb 4, 2019
fa3ce5a
setup.cfg
mjirik Feb 4, 2019
c85c2fe
renove white space
mjirik Feb 4, 2019
95d7bee
remove white space
mjirik Feb 4, 2019
5b41968
remove white space
mjirik Feb 4, 2019
8db377f
remove white space
mjirik Feb 4, 2019
d6ca433
remove white space
mjirik Feb 4, 2019
aea9012
build added
mjirik Feb 4, 2019
037fec2
do not use webkit if it is not available
mjirik Aug 28, 2019
041392d
webkit removed from other place
mjirik Aug 28, 2019
d57251f
removed noarch
mjirik Sep 9, 2019
ff1674b
Merge remote-tracking branch 'origin/master'
mjirik Sep 9, 2019
14b30f8
removed unused lines
mjirik Sep 9, 2019
eb1c81d
version info added
mjirik Sep 9, 2019
6203fd1
Merge remote-tracking branch 'origin/master'
mjirik Sep 9, 2019
6029886
Bump version: 0.8.8 → 0.8.9
mjirik Sep 9, 2019
7780d62
pyqt added
mjirik Sep 9, 2019
181e548
Merge remote-tracking branch 'origin/master'
mjirik Sep 9, 2019
806718c
Bump version: 0.8.9 → 0.8.10
mjirik Sep 9, 2019
d6bf28a
hope removed strange strings
mjirik Sep 9, 2019
c86d6dd
Merge remote-tracking branch 'origin/master'
mjirik Sep 9, 2019
24fc628
Bump version: 0.8.10 → 0.8.11
mjirik Sep 9, 2019
a9ba17f
rewriten to remove unicode
mjirik Sep 9, 2019
69d6223
Merge remote-tracking branch 'origin/master'
mjirik Sep 9, 2019
b8eaacd
Bump version: 0.8.11 → 0.8.12
mjirik Sep 9, 2019
4eb2c07
removed unused lines
mjirik Sep 9, 2019
d218c83
Merge remote-tracking branch 'origin/master'
mjirik Sep 9, 2019
9fa64a6
Bump version: 0.8.12 → 0.8.13
mjirik Sep 9, 2019
a98140d
removed unused lines
mjirik Sep 9, 2019
5a24e7a
Bump version: 0.8.13 → 0.8.14
mjirik Sep 9, 2019
ac5ccfc
noarch
mjirik Sep 9, 2019
3ec9cd1
setuptools
mjirik Sep 9, 2019
1716343
Bump version: 0.8.14 → 0.8.15
mjirik Sep 9, 2019
4529fec
rewriten to remove strange strings
mjirik Sep 9, 2019
88cbc2b
Merge remote-tracking branch 'origin/master'
mjirik Sep 9, 2019
3c4d6f0
Bump version: 0.8.15 → 0.8.16
mjirik Sep 9, 2019
216d64e
Bump version: 0.8.16 → 0.8.17
mjirik Sep 10, 2019
1bd6a7b
numpy and scipy added
mjirik Sep 10, 2019
b50b0d1
Merge remote-tracking branch 'origin/master'
mjirik Sep 10, 2019
f5b7afb
Bump version: 0.8.17 → 0.8.18
mjirik Sep 10, 2019
25fd482
setuptools removed from run requirements
mjirik Sep 10, 2019
29d31db
not noarch
mjirik Sep 10, 2019
20233f9
Merge branch 'master' of github.com:mjirik/pyqtconfig
mjirik Sep 10, 2019
56ec7b6
new version
mjirik Sep 10, 2019
a1f45de
new version
mjirik Sep 10, 2019
fcf7ac0
Bump version: 0.8.20 → 0.8.21
mjirik Sep 10, 2019
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
2 changes: 2 additions & 0 deletions conda-recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"%PYTHON%" setup.py install
if errorlevel 1 exit 1
3 changes: 3 additions & 0 deletions conda-recipe/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

$PYTHON setup.py install
42 changes: 42 additions & 0 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package:
name: pyqtconfig
version: "0.8.21"

source:
# this is used for build from git hub
git_rev: 0.8.21
git_url: https://github.com/mjirik/pyqtconfig.git

# build:
# noarch_python: True
# ignore_prefix_files:
# - devel
# - examples

requirements:
build:
- python
- setuptools
- numpy
- scipy
- pyqt
run:
- python
- numpy
- scipy
- pyqt

test:
imports:
- pyqtconfig
about:
home: https://github.com/mfitzp/pyqtconfig
license: BSD License
summary: 'An API for keeping PyQT widgets in sync with a config dictionary or QSettings objects'
#about:
# home: https://github.com/mfitzp/pyqtconfig
# license: BSD License
# summary: 'An API for keeping PyQt widgets in sync with a config dictionary or QSettings object.'
# See
# http://docs.continuum.io/conda/build.html for
# more information about meta.yaml
1 change: 1 addition & 0 deletions pyqtconfig/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
from .config import *
__version__ = "0.8.21"
19 changes: 15 additions & 4 deletions pyqtconfig/qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,17 @@
if USE_QT_PY == PYQT5:
from PyQt5.QtGui import *
from PyQt5.QtCore import *
from PyQt5.QtWebKit import *
try:
from PyQt5.QtWebKit import *
except:
from PyQt5.QtWebEngine import *

from PyQt5.QtNetwork import *
from PyQt5.QtWidgets import *
from PyQt5.QtWebKitWidgets import *
try:
from PyQt5.QtWebKitWidgets import *
except:
pass

elif USE_QT_PY == PYSIDE:
from PySide.QtGui import *
Expand All @@ -56,8 +63,12 @@

elif USE_QT_PY == PYQT4:
import sip
sip.setapi('QString', 2)
sip.setapi('QVariant', 2)
try:
sip.setapi('QString', 2)
sip.setapi('QVariant', 2)
except:
print("Using QVariant and QString version 1")
pass
from PyQt4.QtGui import *
from PyQt4.QtCore import *
from PyQt4.QtWebKit import *
Expand Down
10 changes: 10 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[bumpversion]
current_version = 0.8.21
files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py
commit = True
tag = True
tag_name = {new_version}

[nosetests]
attr = !interactive,!slow,!LAR

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
setup(

name='pyqtconfig',
version="0.8.6",
version="0.8.21",
author='Martin Fitzpatrick',
author_email='[email protected]',
url='https://github.com/mfitzp/pyqtconfig',
Expand Down