ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,250 Commits 2 Branches 22 Tags 13 MiB
e06fc101f5
Commit Graph

44 Commits

Author SHA1 Message Date
Luke Campagnola
6e01f74990 Merge pull request #414 from campagnola/canvas-fixes 
Fix canvas classes for PyQt5 and PySide
 2017-01-14 11:09:02 -08:00
Luke Campagnola
f612d845fc Fix canvas classes for PyQt5 and PySide 2016-11-10 18:24:47 -08:00
Luke Campagnola
09725dcb55 Fixes to --publish option in pg-release script 2016-11-07 17:57:23 -08:00
Luke Campagnola
15c58de5d6 py3 fix 2016-10-25 23:04:26 -07:00
Luke Campagnola
6ea2bce484 fixup rebuildUi script to allow selection of specific ui files to rebuild 2016-10-25 21:01:46 -07:00
Luke Campagnola
8fe58449c7 Merge remote-tracking branch 'pyqtgraph2/release-tools' into release-0.10.0 2016-10-17 09:22:04 -07:00
Luke Campagnola
a3d62b6bae correct amd64 exe build 
release doc updates
 2016-10-17 09:20:27 -07:00
Luke Campagnola
8d8fabdf74 cleanup 2016-10-06 09:08:29 -07:00
Luke Campagnola
81d0c64d80 rename 2016-10-06 09:07:52 -07:00
Luke Campagnola
076ffee8cc Add publishing option to release script 2016-10-06 09:07:22 -07:00
Luke Campagnola
5d0b6aa016 move release tools 2016-10-05 09:33:28 -07:00
Luke Campagnola
f4e7713a2e Switch to building .exe installers locally--this is now possible for 32- and 64-bit on linux 2016-10-05 09:24:24 -07:00
Luke Campagnola
ee46c15030 cleanup, script seems to be working 2016-10-04 17:51:08 -07:00
Luke Campagnola
10553b8150 add argument parsing to package build script 2016-10-04 08:56:39 -07:00
Luke Campagnola
1899fb0473 Make version strings PEP440 compliant 2016-09-21 17:40:40 -07:00
Luke Campagnola
62583359e7 Added tools for building and uploading release files 2016-09-10 00:04:55 -07:00
Luke Campagnola
1fe5976e19 Merge branch 'pyqt5' into develop 
Conflicts:
	examples/parametertree.py
	pyqtgraph/Qt.py
	pyqtgraph/graphicsItems/FillBetweenItem.py
	pyqtgraph/graphicsItems/InfiniteLine.py
	pyqtgraph/imageview/ImageView.py
 2015-02-28 11:46:41 -05:00
Luke Campagnola
1d7cbca64d minor cleanup 2015-02-04 08:13:56 -05:00
Luke Campagnola
9cce7a1da3 convert to string for py3 2015-02-04 08:06:56 -05:00
Luke Campagnola
d3c2ad874f Fix git version detection 2015-02-04 08:00:49 -05:00
Luke Campagnola
2357cb427f correction for setup version string detection 2014-12-24 11:00:00 -05:00
Jacob Welsh
490148fe5c Fix getGitVersion showing a clean repo as modified 2014-08-24 17:44:39 -05:00
Luke Campagnola
ebccf431bc Update merge test to auto-check against github repo 2014-04-03 17:20:01 -04:00
Luke Campagnola
2b9a8be01f Add test for repository size 2014-04-03 16:56:17 -04:00
Luke Campagnola
895a5145d8 Added line endings check to style test 2014-04-03 15:56:22 -04:00
Luke Campagnola
100308a33a Add pyuic5 script (missing on ubuntu) 2014-04-03 13:07:33 -04:00
Luke Campagnola
6b66edfd46 Added Travis CI support 
Fixed bugs / style issues to please Lord Travis

Squashed commit of the following:

commit f25048a1e1
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Sun Mar 30 02:40:47 2014 -0400

    syntax

commit cc8b69695a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Sun Mar 30 02:36:49 2014 -0400

    add size check, diff style check

commit 5d5ea065a4
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Sun Mar 30 02:16:05 2014 -0400

    travis fix

commit b154c6d997
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Sun Mar 30 02:09:41 2014 -0400

    travis, flake colored output

commit 46921dcd87
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Mar 26 12:37:54 2014 -0400

    fix pyside+py3 bugs to satisfy CI

commit 1d30f3c5c7
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Mar 26 11:13:18 2014 -0400

    fix py3 tests

commit 426578fa4c
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Mar 26 07:39:19 2014 -0400

    fix pytest install

commit 88a13c1a71
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Mar 26 00:29:29 2014 -0400

    qt5 updates

commit 51995488cc
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Mar 26 00:16:04 2014 -0400

    correct py.test command for py3

commit e2b02fbcbd
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 23:50:38 2014 -0400

    fix 2nd install test

commit 4b3e3ee04a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 23:31:31 2014 -0400

    syntax error

commit 250eabdb34
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 23:13:42 2014 -0400

    look for py.test3

commit 9f9bca47c1
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 22:54:19 2014 -0400

    fix syntax

commit 0a871c6f36
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 22:47:58 2014 -0400

    output pip build log

commit dbce58d8cd
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 22:38:55 2014 -0400

    no comments allowed between shall lines

commit b79c06121d
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 20:56:35 2014 -0400

    another pip try

commit 09f4f5d82a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 13:36:09 2014 -0400

    pip correction

commit 0eedb5c18e
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 13:29:00 2014 -0400

    correct py version output

commit d9fd039be2
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 11:55:43 2014 -0400

    apt checks

commit cf95ccef86
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 10:23:10 2014 -0400

    alternate pip install method

commit bee0bcddfe
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:51:45 2014 -0400

    correct deps install

commit 963a4211fc
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:47:30 2014 -0400

    fixes

commit 0c86cd1dc2
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:31:06 2014 -0400

    permission fix

commit 5d04ef53b8
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:30:19 2014 -0400

    Fix py.test version selection

commit b0e6c7cb94
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:25:34 2014 -0400

    try another pyqt5 install method

commit 422a792866
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:12:36 2014 -0400

    syntax error

commit 533133905a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:04:37 2014 -0400

    fixes

commit 8d65211ba4
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 22:40:18 2014 -0400

    Add Qt5 test
    minor fixes

commit 4484efaefe
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 22:31:56 2014 -0400

    use correct py.test for python version

commit 5d2441a29b
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 22:24:27 2014 -0400

    add setup tests

commit 9291db64f2
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 21:48:43 2014 -0400

    fix py3-pyqt install

commit a7aa675c5a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 21:31:33 2014 -0400

    travis tests

commit e71cd2b23a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 21:17:15 2014 -0400

    more corrections

commit 527df3bca8
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 20:56:01 2014 -0400

    travis corrections

commit 87d65cac4a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 20:48:02 2014 -0400

    Add flake tests
    Correct style in a few files to please Lord Travis

commit 537028f88f
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 17:36:24 2014 -0400

    minimize pyside package install
    correct line endings to satisfy Lord Travis

commit 1e3cc95e37
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 17:23:03 2014 -0400

    enable pyside, line ending check
    fix test

commit d7df4517f9
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 17:12:06 2014 -0400

    syntax fix

commit 1ad77a2155
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 17:00:30 2014 -0400

    alt. pytest install

commit 5edcc02072
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 16:52:33 2014 -0400

    Added initial travis.yml
 2014-03-30 02:51:32 -04:00
Luke Campagnola
0bb300b7f2 Generated qt5 template files 2014-03-29 06:57:13 -04:00
Luke Campagnola
ba00ce530f remove print 2014-01-23 13:32:20 -05:00
Luke Campagnola
2f6bd8de37 quiet setup.py warning about install_requires 2014-01-23 13:28:30 -05:00
Luke Campagnola
529e9aaaff py2.6 fix in setupHelpers 2014-01-23 13:25:00 -05:00
Luke Campagnola
d81998461f copy setHelpers.py changes from debian/ branch 2014-01-22 14:23:10 -05:00
Luke Campagnola
2f1cb26549 remove tools/debian; will add a new branch with debian/ at the root. 2014-01-19 21:14:49 -05:00
Luke Campagnola
c8739e5425 Updated build system to use pybuild 
- now generates python-pyqtgraph, python3-pyqtgraph, and python-pyqtgraph-doc packages
- `python setup.py sdist deb` works
 2014-01-12 23:59:53 -05:00
Luke Campagnola
9a131f763b more reorganization to make setup-helpers code more generic 2014-01-12 11:50:52 -05:00
Luke Campagnola
7a45b9a0e2 Reorganized setup.py code 
Added "deb" setup command
 2014-01-12 10:35:31 -05:00
Luke Campagnola
9de3011556 minor setup corrections 2013-12-27 12:05:27 -05:00
Luke Campagnola
6ae0892ea0 Set version strings to 0.9.8 in source; these will be updated with major releases. 
Added tools/setVersion script
setup.py now auto-generates version string based on pyqtgraph/__init__ and git info, if available
 2013-12-01 10:23:45 -05:00
Luke Campagnola
475006f508 example loader allows editing code 
Workaround for PySide bug; fixes GradientEditorItem
 2013-02-25 13:03:21 -05:00
Luke Campagnola
53f727ab2c Bugfix: prevent adding invalid entry to sys.path when running examples 2012-12-29 21:53:20 -05:00
Luke Campagnola
30d33956fb examples fix -- prevent adding invalid entry to sys.path while searching for pyqtgraph 
added script for generating debian changelog from bzr log
 2012-12-29 21:51:29 -05:00
Luke Campagnola
927f032f19 MANIFEST.in includes some missing files: tools, README, LICENSE 
updated debian control structure for building source packages
 2012-12-29 01:40:41 -05:00
Luke Campagnola
b9822b1d10 Fixed doc version (again) 
Added debian control files
 2012-12-27 03:13:35 -05:00
Luke Campagnola
b96a0f1b39 Added example scripts used for bundling with py2exe 2012-10-11 11:57:51 -04:00