From ae5b0115fcce9378f398ac6d97099a35711d6d34 Mon Sep 17 00:00:00 2001 From: "M. Jirik" Date: Fri, 28 Aug 2015 14:29:27 +0200 Subject: [PATCH 01/41] use Qt4 QString with api version 1 fixed --- pyqtconfig/qt.py | 8 ++++++-- setup.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pyqtconfig/qt.py b/pyqtconfig/qt.py index 243a715..54a9eb9 100644 --- a/pyqtconfig/qt.py +++ b/pyqtconfig/qt.py @@ -56,8 +56,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 * diff --git a/setup.py b/setup.py index 148d8fe..b586e76 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.6", + version="0.8.7", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From a67693943a89b0136d2f4c051a68f065660b7a61 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Tue, 21 Nov 2017 14:30:09 +0100 Subject: [PATCH 02/41] py3 ready --- pyqtconfig/qt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyqtconfig/qt.py b/pyqtconfig/qt.py index 54a9eb9..4a53e05 100644 --- a/pyqtconfig/qt.py +++ b/pyqtconfig/qt.py @@ -60,7 +60,7 @@ sip.setapi('QString', 2) sip.setapi('QVariant', 2) except: - print "Using QVariant and QString version 1" + print("Using QVariant and QString version 1") pass from PyQt4.QtGui import * from PyQt4.QtCore import * From 06317a49e1b11901694844daaeab6dde39c78f0d Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Tue, 21 Nov 2017 14:31:41 +0100 Subject: [PATCH 03/41] version updated --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b586e76..d09bb0f 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.7", + version="0.8.8", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From ad4fe80ef1a650efdd99d5e6d970c82378eab427 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 4 Feb 2019 17:12:47 +0100 Subject: [PATCH 04/41] recipe --- conda-recipe/bld.bat | 2 ++ conda-recipe/build.sh | 3 ++ conda-recipe/meta.yaml | 74 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 conda-recipe/bld.bat create mode 100644 conda-recipe/build.sh create mode 100644 conda-recipe/meta.yaml diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat new file mode 100644 index 0000000..6021130 --- /dev/null +++ b/conda-recipe/bld.bat @@ -0,0 +1,2 @@ +"%PYTHON%" setup.py install +if errorlevel 1 exit 1 \ No newline at end of file diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh new file mode 100644 index 0000000..8e25a14 --- /dev/null +++ b/conda-recipe/build.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +$PYTHON setup.py install diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml new file mode 100644 index 0000000..b808633 --- /dev/null +++ b/conda-recipe/meta.yaml @@ -0,0 +1,74 @@ +package: + name: pyqtconfig + version: "0.8.8" + +source: +# this is used for build from git hub + git_rev: 0.8.8 + git_url: https://github.com/mjirik/scaffan.git + +# this is used for pypi + # fn: io3d-1.0.30.tar.gz + # url: https://pypi.python.org/packages/source/i/io3d/io3d-1.0.30.tar.gz + # md5: a3ce512c4c97ac2410e6dcc96a801bd8 +# patches: + # List any patch files here + # - fix.patch +build: + ignore_prefix_files: + - devel + - examples +# build: + # noarch_python: True + # preserve_egg_dir: True + # entry_points: + # Put any entry points (scripts to be generated automatically) here. The + # syntax is module:function. For example + # + # - scaffan = scaffan:main + # + # Would create an entry point called io3d that calls scaffan.main() + + + # If this is a new build for the same version, increment the build + # number. If you do not include this key, it defaults to 0. + # number: 1 + +requirements: + build: + - python + - setuptools +# - io3d + + run: + - python +# - io3d>=1.21 +# - {{ pin_compatible('io3d', max_pin='x') }} + # - numpy + # - pyqt 4.11.* + +test: + # Python imports + imports: + - pyqtconfig + + # commands: + # You can put test commands to be run here. Use this to test that the + # entry points work. + + + # You can also put a file called run_test.py in the recipe that will be run + # at test time. + + # requires: + # Put any additional test requirements here. For example + # - nose + +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 From 0e58b3c187724f5ba022529d40d797da23a93445 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 4 Feb 2019 17:17:56 +0100 Subject: [PATCH 05/41] fix git url --- conda-recipe/meta.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index b808633..17f3652 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -5,7 +5,7 @@ package: source: # this is used for build from git hub git_rev: 0.8.8 - git_url: https://github.com/mjirik/scaffan.git + git_url: https://github.com/mjirik/pyqtconfig.git # this is used for pypi # fn: io3d-1.0.30.tar.gz @@ -30,10 +30,6 @@ build: # Would create an entry point called io3d that calls scaffan.main() - # If this is a new build for the same version, increment the build - # number. If you do not include this key, it defaults to 0. - # number: 1 - requirements: build: - python From fa3ce5ad3fed1401b3059829a42ef288981f6691 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 4 Feb 2019 17:21:07 +0100 Subject: [PATCH 06/41] setup.cfg --- setup.cfg | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..01c5045 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,10 @@ +[bumpversion] +current_version = 0.8.8 +files = setup.py conda-recipe/meta.yaml scaffan/__init__.py +commit = True +tag = True +tag_name = {new_version} + +[nosetests] +attr = !interactive,!slow,!LAR + From c85c2fedf21701645ca98ae351e870819cd3c248 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 4 Feb 2019 17:26:58 +0100 Subject: [PATCH 07/41] renove white space --- conda-recipe/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 17f3652..c15cc03 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -28,14 +28,11 @@ build: # - scaffan = scaffan:main # # Would create an entry point called io3d that calls scaffan.main() - - requirements: build: - python - setuptools # - io3d - run: - python # - io3d>=1.21 From 95d7beead8d67b1c5870f40f2741c5a53d612d3e Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 4 Feb 2019 17:28:49 +0100 Subject: [PATCH 08/41] remove white space --- conda-recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index c15cc03..e872225 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -26,8 +26,6 @@ build: # syntax is module:function. For example # # - scaffan = scaffan:main - # - # Would create an entry point called io3d that calls scaffan.main() requirements: build: - python From 5b4196814046efa4c8a16b1282307c31078612b2 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 4 Feb 2019 17:31:10 +0100 Subject: [PATCH 09/41] remove white space --- conda-recipe/meta.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index e872225..921b8e9 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -11,13 +11,10 @@ source: # fn: io3d-1.0.30.tar.gz # url: https://pypi.python.org/packages/source/i/io3d/io3d-1.0.30.tar.gz # md5: a3ce512c4c97ac2410e6dcc96a801bd8 -# patches: - # List any patch files here - # - fix.patch -build: - ignore_prefix_files: - - devel - - examples +#build: +# ignore_prefix_files: +# - devel +# - examples # build: # noarch_python: True # preserve_egg_dir: True From 8db377f0671636b181f8e5f01cf4d5ded164df36 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 4 Feb 2019 17:35:16 +0100 Subject: [PATCH 10/41] remove white space --- conda-recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 921b8e9..59bcc15 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -23,6 +23,7 @@ source: # syntax is module:function. For example # # - scaffan = scaffan:main + requirements: build: - python From d6ca433c00dbe873b29be7b544df5e41b141c313 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 4 Feb 2019 17:42:42 +0100 Subject: [PATCH 11/41] remove white space --- conda-recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 59bcc15..16cd44c 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -7,7 +7,7 @@ source: git_rev: 0.8.8 git_url: https://github.com/mjirik/pyqtconfig.git -# this is used for pypi + # this is used for pypi # fn: io3d-1.0.30.tar.gz # url: https://pypi.python.org/packages/source/i/io3d/io3d-1.0.30.tar.gz # md5: a3ce512c4c97ac2410e6dcc96a801bd8 @@ -23,7 +23,7 @@ source: # syntax is module:function. For example # # - scaffan = scaffan:main - + requirements: build: - python From aea90124116a5e256ef2549c1b1a47b52b1d096d Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 4 Feb 2019 17:45:05 +0100 Subject: [PATCH 12/41] build added --- conda-recipe/meta.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 16cd44c..c61773b 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -23,6 +23,15 @@ source: # syntax is module:function. For example # # - scaffan = scaffan:main +build: + # noarch_python: True + # preserve_egg_dir: True + entry_points: + # Put any entry points (scripts to be generated automatically) here. The + # syntax is module:function. For example + # + # - lisa = lisa:main +# - lisa = lisa:lisa_main requirements: build: From 037fec2dfd06c0d785e943f6d73d8a9edec3faad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Ji=C5=99=C3=ADk?= Date: Wed, 28 Aug 2019 18:57:37 +0200 Subject: [PATCH 13/41] do not use webkit if it is not available --- pyqtconfig/qt.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyqtconfig/qt.py b/pyqtconfig/qt.py index 4a53e05..4879b9d 100644 --- a/pyqtconfig/qt.py +++ b/pyqtconfig/qt.py @@ -44,7 +44,10 @@ from PyQt5.QtWebKit import * from PyQt5.QtNetwork import * from PyQt5.QtWidgets import * - from PyQt5.QtWebKitWidgets import * + try: + from PyQt5.QtWebKitWidgets import * + except: + from PyQt5.QtWebEngine import * elif USE_QT_PY == PYSIDE: from PySide.QtGui import * From 041392ddfde183c3a92c46f1215991be479b12bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Ji=C5=99=C3=ADk?= Date: Wed, 28 Aug 2019 20:18:10 +0200 Subject: [PATCH 14/41] webkit removed from other place --- pyqtconfig/qt.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pyqtconfig/qt.py b/pyqtconfig/qt.py index 4879b9d..460b25c 100644 --- a/pyqtconfig/qt.py +++ b/pyqtconfig/qt.py @@ -41,13 +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 * try: from PyQt5.QtWebKitWidgets import * except: - from PyQt5.QtWebEngine import * + pass elif USE_QT_PY == PYSIDE: from PySide.QtGui import * From d57251fb55263d71d1c2491f7711987cd33ff355 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 21:52:51 +0200 Subject: [PATCH 15/41] removed noarch --- conda-recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index c61773b..c5a31d8 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -23,10 +23,10 @@ source: # syntax is module:function. For example # # - scaffan = scaffan:main -build: +# build: # noarch_python: True # preserve_egg_dir: True - entry_points: + # entry_points: # Put any entry points (scripts to be generated automatically) here. The # syntax is module:function. For example # From 14b30f86e391c08542f1fc50cf3f4db434c1dc06 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:00:45 +0200 Subject: [PATCH 16/41] removed unused lines --- conda-recipe/meta.yaml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index c5a31d8..3b5151d 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -11,28 +11,6 @@ source: # fn: io3d-1.0.30.tar.gz # url: https://pypi.python.org/packages/source/i/io3d/io3d-1.0.30.tar.gz # md5: a3ce512c4c97ac2410e6dcc96a801bd8 -#build: -# ignore_prefix_files: -# - devel -# - examples -# build: - # noarch_python: True - # preserve_egg_dir: True - # entry_points: - # Put any entry points (scripts to be generated automatically) here. The - # syntax is module:function. For example - # - # - scaffan = scaffan:main -# build: - # noarch_python: True - # preserve_egg_dir: True - # entry_points: - # Put any entry points (scripts to be generated automatically) here. The - # syntax is module:function. For example - # - # - lisa = lisa:main -# - lisa = lisa:lisa_main - requirements: build: - python From eb1c81da8c19e425abe8cda9aa7ca4624aa878f7 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:03:01 +0200 Subject: [PATCH 17/41] version info added --- pyqtconfig/__init__.py | 1 + setup.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index 27c9ec6..b682997 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1 +1,2 @@ from .config import * +__version__ = "0.8.8" diff --git a/setup.cfg b/setup.cfg index 01c5045..5cc1206 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [bumpversion] current_version = 0.8.8 -files = setup.py conda-recipe/meta.yaml scaffan/__init__.py +files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True tag_name = {new_version} From 6029886ccc309a36ec78ce007693c2d3883f530c Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:03:57 +0200 Subject: [PATCH 18/41] =?UTF-8?q?Bump=20version:=200.8.8=20=E2=86=92=200.8?= =?UTF-8?q?.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 3b5151d..56275e2 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.8" + version: "0.8.9" source: # this is used for build from git hub - git_rev: 0.8.8 + git_rev: 0.8.9 git_url: https://github.com/mjirik/pyqtconfig.git # this is used for pypi diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index b682997..e11402b 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.8" +__version__ = "0.8.9" diff --git a/setup.cfg b/setup.cfg index 5cc1206..7869cf5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.8 +current_version = 0.8.9 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index d09bb0f..f08b387 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.8", + version="0.8.9", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From 7780d62230da66c60c6a5c5aa32975051eea253a Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:05:45 +0200 Subject: [PATCH 19/41] pyqt added --- conda-recipe/meta.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 3b5151d..95d0a6f 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -15,13 +15,15 @@ requirements: build: - python - setuptools + - pyqt # - io3d +# # - io3d>=1.21 +# # - {{ pin_compatible('io3d', max_pin='x') }} +# # - numpy +# # - pyqt 4.11.* run: - python -# - io3d>=1.21 -# - {{ pin_compatible('io3d', max_pin='x') }} - # - numpy - # - pyqt 4.11.* + - pyqt test: # Python imports From 806718cb01fa88be0065c3b312645ab08f418e16 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:06:42 +0200 Subject: [PATCH 20/41] =?UTF-8?q?Bump=20version:=200.8.9=20=E2=86=92=200.8?= =?UTF-8?q?.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 0fc1b16..cb0c309 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.9" + version: "0.8.10" source: # this is used for build from git hub - git_rev: 0.8.9 + git_rev: 0.8.10 git_url: https://github.com/mjirik/pyqtconfig.git # this is used for pypi diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index e11402b..f856748 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.9" +__version__ = "0.8.10" diff --git a/setup.cfg b/setup.cfg index 7869cf5..342651f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.9 +current_version = 0.8.10 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index f08b387..7937735 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.9", + version="0.8.10", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From d6bf28ae2b377702f69792cf400daa93c1d7f0b7 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:08:14 +0200 Subject: [PATCH 21/41] hope removed strange strings --- conda-recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 0fc1b16..4066765 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -24,9 +24,7 @@ requirements: run: - python - pyqt - test: - # Python imports imports: - pyqtconfig From 24fc628dc17e888e6eb0fb1ee511160efe86c2df Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:08:41 +0200 Subject: [PATCH 22/41] =?UTF-8?q?Bump=20version:=200.8.10=20=E2=86=92=200.?= =?UTF-8?q?8.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 1811ec8..c2b8b1f 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.10" + version: "0.8.11" source: # this is used for build from git hub - git_rev: 0.8.10 + git_rev: 0.8.11 git_url: https://github.com/mjirik/pyqtconfig.git # this is used for pypi diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index f856748..a417e62 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.10" +__version__ = "0.8.11" diff --git a/setup.cfg b/setup.cfg index 342651f..b8244a6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.10 +current_version = 0.8.11 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index 7937735..e1df007 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.10", + version="0.8.11", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From a9ba17f80b85833fdf900bf0cefc10afe2f7a1f6 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:09:59 +0200 Subject: [PATCH 23/41] rewriten to remove unicode --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 1811ec8..eb51ec7 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -24,10 +24,10 @@ requirements: run: - python - pyqt + test: imports: - pyqtconfig - # commands: # You can put test commands to be run here. Use this to test that the # entry points work. From b8eaacd203a142b67ae7957ad7e618ad1a2d7d53 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:10:20 +0200 Subject: [PATCH 24/41] =?UTF-8?q?Bump=20version:=200.8.11=20=E2=86=92=200.?= =?UTF-8?q?8.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 7a759d9..d8bfd68 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.11" + version: "0.8.12" source: # this is used for build from git hub - git_rev: 0.8.11 + git_rev: 0.8.12 git_url: https://github.com/mjirik/pyqtconfig.git # this is used for pypi diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index a417e62..ac634ab 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.11" +__version__ = "0.8.12" diff --git a/setup.cfg b/setup.cfg index b8244a6..79661ff 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.11 +current_version = 0.8.12 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index e1df007..a4ff346 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.11", + version="0.8.12", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From 4eb2c07a7c50d8b66356f7a214551e647db89ca7 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:12:54 +0200 Subject: [PATCH 25/41] removed unused lines --- conda-recipe/meta.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 7a759d9..f70771b 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -16,11 +16,7 @@ requirements: - python - setuptools - pyqt -# - io3d -# # - io3d>=1.21 # # - {{ pin_compatible('io3d', max_pin='x') }} -# # - numpy -# # - pyqt 4.11.* run: - python - pyqt @@ -28,18 +24,6 @@ requirements: test: imports: - pyqtconfig - # commands: - # You can put test commands to be run here. Use this to test that the - # entry points work. - - - # You can also put a file called run_test.py in the recipe that will be run - # at test time. - - # requires: - # Put any additional test requirements here. For example - # - nose - about: home: https://github.com/mfitzp/pyqtconfig license: BSD License From 9fa64a6ea21b9214318003a9312842d5670056ca Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:13:29 +0200 Subject: [PATCH 26/41] =?UTF-8?q?Bump=20version:=200.8.12=20=E2=86=92=200.?= =?UTF-8?q?8.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 0ec54b7..4c408c7 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.12" + version: "0.8.13" source: # this is used for build from git hub - git_rev: 0.8.12 + git_rev: 0.8.13 git_url: https://github.com/mjirik/pyqtconfig.git # this is used for pypi diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index ac634ab..c2aaf32 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.12" +__version__ = "0.8.13" diff --git a/setup.cfg b/setup.cfg index 79661ff..e71284c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.12 +current_version = 0.8.13 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index a4ff346..992efae 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.12", + version="0.8.13", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From a98140de7d0b2acdeda3c3ce37e8e8dbfa98a92e Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:28:53 +0200 Subject: [PATCH 27/41] removed unused lines --- conda-recipe/meta.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 4c408c7..7d651f6 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -7,16 +7,11 @@ source: git_rev: 0.8.13 git_url: https://github.com/mjirik/pyqtconfig.git - # this is used for pypi - # fn: io3d-1.0.30.tar.gz - # url: https://pypi.python.org/packages/source/i/io3d/io3d-1.0.30.tar.gz - # md5: a3ce512c4c97ac2410e6dcc96a801bd8 requirements: build: - python - setuptools - pyqt -# # - {{ pin_compatible('io3d', max_pin='x') }} run: - python - pyqt From 5a24e7a6f15d796737ad273a73a316ef0ce8d231 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:29:07 +0200 Subject: [PATCH 28/41] =?UTF-8?q?Bump=20version:=200.8.13=20=E2=86=92=200.?= =?UTF-8?q?8.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 7d651f6..5e0090f 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.13" + version: "0.8.14" source: # this is used for build from git hub - git_rev: 0.8.13 + git_rev: 0.8.14 git_url: https://github.com/mjirik/pyqtconfig.git requirements: diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index c2aaf32..7d2ef22 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.13" +__version__ = "0.8.14" diff --git a/setup.cfg b/setup.cfg index e71284c..86a88b2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.13 +current_version = 0.8.14 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index 992efae..9ca57b3 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.13", + version="0.8.14", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From ac5ccfcd1de5661252002d63b67f1341a99f391d Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:33:57 +0200 Subject: [PATCH 29/41] noarch --- conda-recipe/meta.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 5e0090f..a8515da 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -7,6 +7,12 @@ source: git_rev: 0.8.14 git_url: https://github.com/mjirik/pyqtconfig.git +build: + noarch_python: True + ignore_prefix_files: + - devel + - examples + requirements: build: - python From 3ec9cd152dedc503f90dfdd5ed69dd482314dbf4 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:34:47 +0200 Subject: [PATCH 30/41] setuptools --- conda-recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index a8515da..1834226 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -20,6 +20,7 @@ requirements: - pyqt run: - python + - setuptools - pyqt test: From 17163437d245903e209e3182ad16e1f9cbc84f54 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:35:00 +0200 Subject: [PATCH 31/41] =?UTF-8?q?Bump=20version:=200.8.14=20=E2=86=92=200.?= =?UTF-8?q?8.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 1834226..a8ac9d1 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.14" + version: "0.8.15" source: # this is used for build from git hub - git_rev: 0.8.14 + git_rev: 0.8.15 git_url: https://github.com/mjirik/pyqtconfig.git build: diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index 7d2ef22..e3bb48a 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.14" +__version__ = "0.8.15" diff --git a/setup.cfg b/setup.cfg index 86a88b2..b2cadd5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.14 +current_version = 0.8.15 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index 9ca57b3..ec4cbe3 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.14", + version="0.8.15", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From 4529fecec791981d19aab5ee34e12d1b499b8bb2 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:37:43 +0200 Subject: [PATCH 32/41] rewriten to remove strange strings --- conda-recipe/meta.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 1834226..d9184a3 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -29,8 +29,11 @@ test: 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.', - + 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 From 3c4d6f0852d2fe1285b737ce85ddb2a0d4f5b6ec Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Mon, 9 Sep 2019 22:38:01 +0200 Subject: [PATCH 33/41] =?UTF-8?q?Bump=20version:=200.8.15=20=E2=86=92=200.?= =?UTF-8?q?8.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 4584e30..e44d49e 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.15" + version: "0.8.16" source: # this is used for build from git hub - git_rev: 0.8.15 + git_rev: 0.8.16 git_url: https://github.com/mjirik/pyqtconfig.git build: diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index e3bb48a..9993c36 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.15" +__version__ = "0.8.16" diff --git a/setup.cfg b/setup.cfg index b2cadd5..00390b7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.15 +current_version = 0.8.16 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index ec4cbe3..a92bc8d 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.15", + version="0.8.16", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From 216d64eb73ae6ebd9bd0e87e2fe568d8aa90b463 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Tue, 10 Sep 2019 08:10:21 +0200 Subject: [PATCH 34/41] =?UTF-8?q?Bump=20version:=200.8.16=20=E2=86=92=200.?= =?UTF-8?q?8.17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index e44d49e..5f02b4b 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.16" + version: "0.8.17" source: # this is used for build from git hub - git_rev: 0.8.16 + git_rev: 0.8.17 git_url: https://github.com/mjirik/pyqtconfig.git build: diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index 9993c36..600e23a 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.16" +__version__ = "0.8.17" diff --git a/setup.cfg b/setup.cfg index 00390b7..72eb8e5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.16 +current_version = 0.8.17 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index a92bc8d..d9fae31 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.16", + version="0.8.17", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From 1bd6a7b09a93c51371c84ef0ccb25e7c79de078e Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Tue, 10 Sep 2019 10:01:04 +0200 Subject: [PATCH 35/41] numpy and scipy added --- conda-recipe/meta.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 4584e30..6332a47 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -9,17 +9,21 @@ source: build: noarch_python: True - ignore_prefix_files: - - devel - - examples +# ignore_prefix_files: +# - devel +# - examples requirements: build: - python - setuptools + - numpy + - scipy - pyqt run: - python + - numpy + - scipy - setuptools - pyqt From f5b7afb7da619d154bb2e8e1e737c3661d3aec5b Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Tue, 10 Sep 2019 10:02:41 +0200 Subject: [PATCH 36/41] =?UTF-8?q?Bump=20version:=200.8.17=20=E2=86=92=200.?= =?UTF-8?q?8.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index d93e703..d64d23b 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.17" + version: "0.8.18" source: # this is used for build from git hub - git_rev: 0.8.17 + git_rev: 0.8.18 git_url: https://github.com/mjirik/pyqtconfig.git build: diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index 600e23a..03da4e3 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.17" +__version__ = "0.8.18" diff --git a/setup.cfg b/setup.cfg index 72eb8e5..2ce60bd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.17 +current_version = 0.8.18 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index d9fae31..fc29e2a 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.17", + version="0.8.18", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From 25fd482b63babf1ab3787a4a849abe84c899647c Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Tue, 10 Sep 2019 10:04:25 +0200 Subject: [PATCH 37/41] setuptools removed from run requirements --- conda-recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index d93e703..52b3766 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -24,7 +24,6 @@ requirements: - python - numpy - scipy - - setuptools - pyqt test: From 29d31dba21e3f9cad06d82c6a98d72f93023825f Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Tue, 10 Sep 2019 12:28:39 +0200 Subject: [PATCH 38/41] not noarch --- conda-recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 52b3766..3509a1e 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -7,8 +7,8 @@ source: git_rev: 0.8.17 git_url: https://github.com/mjirik/pyqtconfig.git -build: - noarch_python: True + # build: + # noarch_python: True # ignore_prefix_files: # - devel # - examples From 56ec7b6eae7cf841843b7306168887e387eaceaa Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Tue, 10 Sep 2019 12:49:46 +0200 Subject: [PATCH 39/41] new version --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 21a09c2..1d80253 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.18" + version: "0.8.19" source: # this is used for build from git hub - git_rev: 0.8.18 + git_rev: 0.8.19 git_url: https://github.com/mjirik/pyqtconfig.git # build: diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index 03da4e3..fe61d13 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.18" +__version__ = "0.8.19" diff --git a/setup.cfg b/setup.cfg index 2ce60bd..ed2f8f3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.18 +current_version = 0.8.19 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index fc29e2a..903a0c9 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.18", + version="0.8.19", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From a1f45dede54339338ca3a8317b858b0c2260ec27 Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Tue, 10 Sep 2019 13:35:21 +0200 Subject: [PATCH 40/41] new version --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 1d80253..04d70bd 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.19" + version: "0.8.20" source: # this is used for build from git hub - git_rev: 0.8.19 + git_rev: 0.8.20 git_url: https://github.com/mjirik/pyqtconfig.git # build: diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index fe61d13..3969e4b 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.19" +__version__ = "0.8.20" diff --git a/setup.cfg b/setup.cfg index ed2f8f3..66b41c1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.19 +current_version = 0.8.20 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index 903a0c9..157368f 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.19", + version="0.8.20", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig', From fcf7ac0d64456c0a114354e070c15dd642714a3f Mon Sep 17 00:00:00 2001 From: Miroslav Jirik Date: Tue, 10 Sep 2019 14:11:43 +0200 Subject: [PATCH 41/41] =?UTF-8?q?Bump=20version:=200.8.20=20=E2=86=92=200.?= =?UTF-8?q?8.21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conda-recipe/meta.yaml | 4 ++-- pyqtconfig/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 04d70bd..5957a3c 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: pyqtconfig - version: "0.8.20" + version: "0.8.21" source: # this is used for build from git hub - git_rev: 0.8.20 + git_rev: 0.8.21 git_url: https://github.com/mjirik/pyqtconfig.git # build: diff --git a/pyqtconfig/__init__.py b/pyqtconfig/__init__.py index 3969e4b..029e198 100644 --- a/pyqtconfig/__init__.py +++ b/pyqtconfig/__init__.py @@ -1,2 +1,2 @@ from .config import * -__version__ = "0.8.20" +__version__ = "0.8.21" diff --git a/setup.cfg b/setup.cfg index 66b41c1..321af72 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.20 +current_version = 0.8.21 files = setup.py conda-recipe/meta.yaml pyqtconfig/__init__.py commit = True tag = True diff --git a/setup.py b/setup.py index 157368f..cdb5faf 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='pyqtconfig', - version="0.8.20", + version="0.8.21", author='Martin Fitzpatrick', author_email='martin.fitzpatrick@gmail.com', url='https://github.com/mfitzp/pyqtconfig',