Skip to content
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

Pyside2 Refactor #315

Merged
merged 11 commits into from
Nov 4, 2019
Merged

Pyside2 Refactor #315

merged 11 commits into from
Nov 4, 2019

Conversation

dgdekoning
Copy link
Contributor

Resolves #184.

Replaces PyQt5 with PySide2 to allow for LGPL license.

Moving to a newer version of Qt might also resolve a number of Qt-related issues (#286, #288).

dgdekoning and others added 11 commits November 4, 2019 15:17
* Refactor code to use PySide signal/slot nomenclature

* Use button reference instead of integer

* Remove QVariant references
Change 'flags' to 'f' for compatibility
* Replace PyQt5 with PySide2

* Change `flags` to `f` for compatibility

* Change `exec` to `exec_` for compatibility

* Specify `setCheckState` for compatibility

* Change recipe files to use pyside2

* Update automation pipeline scripts

* Clean-up unused pyside2 imports
* Replace GPL3 license file with LGPL3

* Update references to the license

* Add myself as main developer

* Update texts for CONTRIBUTING.md to reflect previous pytest changes

* Update README create/install commands to prefer conda-forge channel
# Conflicts:
#	activity_browser/app/ui/menu_bar.py
#	activity_browser/app/ui/tables/activity.py
@dgdekoning dgdekoning added this to the Version 2.5.0 milestone Nov 4, 2019
@dgdekoning dgdekoning requested a review from bsteubing November 4, 2019 15:36
@coveralls
Copy link

coveralls commented Nov 4, 2019

Coverage Status

Coverage decreased (-0.06%) to 49.647% when pulling 0a5c096 on pyside2-refactor into dd81d2f on master.

@bsteubing
Copy link
Member

Nice job - thanks!!

@bsteubing bsteubing closed this Nov 4, 2019
@bsteubing bsteubing reopened this Nov 4, 2019
@bsteubing bsteubing merged commit 94ad5db into master Nov 4, 2019
@bsteubing bsteubing deleted the pyside2-refactor branch November 4, 2019 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AB inherits GNU GPL3, perhaps too restrictive
3 participants