CCF_100/relational
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Debian package can now be installed with pyside and not pyqt

Browse Source 
- Make dist makes a file for the debian format
- Make dist removes .svn from relational_pyside
- setup.py installs relational_pyside module



git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@326 014f5005-505e-4b48-8d0a-63407b615a7c
This commit is contained in:
LtWorf 2011-10-13 20:15:38 +00:00
parent 2f8e604d0d
commit 9d12667b11
11 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -38,6 +38,7 @@ dist: clean
rm -rf /tmp/relational/mac/.svn/
rm -rf /tmp/relational/relational/.svn/
rm -rf /tmp/relational/relational_gui/.svn/
rm -rf /tmp/relational/relational_pyside/.svn/
rm -rf /tmp/relational/mac
rm -rf /tmp/relational/debian/
rm -rf /tmp/relational/relational_curses/.svn/
@ -47,7 +48,7 @@ dist: clean
#mv /tmp/relational /tmp/relational-`./relational_gui.py -v | grep Relational | cut -d" " -f2`
#(cd /tmp; tar -zcf relational.tar.gz relational-*/)
(cd /tmp; tar -zcf relational.tar.gz relational/)
mv /tmp/relational.tar.gz ./relational_`./relational_gui.py -v | grep Relational | cut -d" " -f2`.tar.gz
mv /tmp/relational.tar.gz ./relational_`./relational_gui.py -v | grep Relational | cut -d" " -f2`.orig.tar.gz
clean:
rm -rf *~ || echo ok

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
relational (1.1-1) unstable; urgency=low
* New upstream release
* Can use either PyQt or PySide
-- Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it> Thu, 13 Oct 2011 21:41:57 +0200
relational (1.0-1) unstable; urgency=low
* New upstream release

12
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: math
Priority: optional
Maintainer: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>
Build-Depends: debhelper (>= 7.0.50~), python, python-support
Standards-Version: 3.9.1
Standards-Version: 3.9.2
Homepage: http://galileo.dmi.unict.it/wiki/relational/doku.php
Package: python-relational
@ -19,13 +19,13 @@ Description: Educational tool for relational algebra (standalone module)
Package: relational
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-relational (>= ${binary:Version}), python-qt4
Depends: ${misc:Depends}, ${python:Depends}, python-relational (>= ${binary:Version}), python-qt4 | python-pyside.qtgui, python-qt4 | python-pyside.qtcore, python-qt4 | python-pyside.qtwebkit
Description: Educational tool for relational algebra (graphical user interface)
Relational is primarily a tool to provide a workspace for experimenting with
relational algebra, an offshoot of first-order logic.
.
This package provides a graphical user interface that can be used for
executing relational queries.
This package provides a graphical user interface that can be used to
execute relational queries.
Package: relational-cli
Architecture: all
@ -34,5 +34,5 @@ Description: Educational tool for relational algebra (command line interface)
Relational is primarily a tool to provide a workspace for experimenting with
relational algebra, an offshoot of first-order logic.
.
This package provides a command line interface that can be used for
executing relational queries.
This package provides a command line interface that can be used to
execute relational queries.

2
relational.1
View File

@ -1,4 +1,4 @@
.TH "Relational" "1.1"
.TH "Relational" 1 "Oct 13, 2011" "Relational algebra learning tool"
.SH "NAME"
relational \(em Python implementation of Relational algebra.
.SH "SYNOPSIS"

9
relational_gui/creator.py
View File

@ -125,8 +125,11 @@ class creatorForm(QtGui.QDialog):
pass
def editRelation(rel=None):
def edit_relation(rel=None):
'''Opens the editor for the given relation and returns a _new_ relation
containing the new relation.
If the user cancels, it returns None'''
ui = rel_edit.Ui_Dialog()
Form = creatorForm(rel)
@ -141,4 +144,4 @@ if __name__ == '__main__':
import sys
app = QtGui.QApplication(sys.argv)
r=relation.relation("/home/salvo/dev/relational/trunk/samples/people.csv")
print editRelation(r)
print edit_relation(r)

4
relational_gui/guihandler.py
View File

@ -165,13 +165,13 @@ class relForm(QtGui.QMainWindow):
def editRelation(self):
import creator
for i in self.ui.lstRelations.selectedItems():
result=creator.editRelation(self.relations[compatibility.get_py_str(i.text())])
result=creator.edit_relation(self.relations[compatibility.get_py_str(i.text())])
if result!=None:
self.relations[compatibility.get_py_str(i.text())]=result
self.updateRelations()
def newRelation(self):
import creator
result=creator.editRelation()
result=creator.edit_relation()
if result==None:
return

2
relational_gui/maingui.py
View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'relational_gui/maingui.ui'
#
# Created: Thu Oct 13 20:42:44 2011
# Created: Thu Oct 13 21:38:18 2011
# by: PyQt4 UI code generator 4.8.3
#
# WARNING! All changes made in this file will be lost!

2
relational_gui/survey.py
View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'relational_gui/survey.ui'
#
# Created: Thu Oct 13 20:42:44 2011
# Created: Thu Oct 13 21:38:18 2011
# by: PyQt4 UI code generator 4.8.3
#
# WARNING! All changes made in this file will be lost!

2
relational_pyside/maingui.py
View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'relational_pyside/maingui.ui'
#
# Created: Thu Oct 13 20:42:44 2011
# Created: Thu Oct 13 21:38:18 2011
# by: pyside-uic 0.2.13 running on PySide 1.0.7
#
# WARNING! All changes made in this file will be lost!

2
relational_pyside/survey.py
View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'relational_pyside/survey.ui'
#
# Created: Thu Oct 13 20:42:44 2011
# Created: Thu Oct 13 21:38:18 2011
# by: pyside-uic 0.2.13 running on PySide 1.0.7
#
# WARNING! All changes made in this file will be lost!

3
setup/relational.setup.py
View File

@ -19,4 +19,5 @@
import installer_common
installer_common.c_setup('relational_gui')
installer_common.c_setup('relational_gui')
installer_common.c_setup('relational_pyside')