Skip to content

Commit

Permalink
Merge branch 'release/v3.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
centaurialpha committed Apr 11, 2021
2 parents 4103daa + 98e336e commit 7c993a3
Show file tree
Hide file tree
Showing 174 changed files with 18,294 additions and 9,122 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Linux Tests

on: [push]

jobs:
build:
name: Pruebitas en Linux
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Prepare Environment
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
pip install -r requirements-dev.txt
- name: Lint
run: |
make lint
- name: Tests
run: |
make test
31 changes: 31 additions & 0 deletions .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Windows Tests

on: [push]

jobs:
build:
name: Pruebitas en Win
runs-on: windows-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Prepare Environment
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
pip install -r requirements-dev.txt
- name: Lint
run: |
pycodestyle pireal
flake8 pireal
- name: Tests
run: |
pytest tests -v --cov pireal.core --cov-report term-missing
22 changes: 0 additions & 22 deletions .travis.yml

This file was deleted.

56 changes: 49 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,56 @@
PYTEST = pytest tests

help:
@echo "test -- run tests"
@echo "test-gui -- run tests for GUI"
@echo "test-integration -- run integration tests"
@echo "pep8 -- run pycodestyle"
@echo "flake8 -- run flake8"
@echo "lint -- run pycodestyle and flake8"
@echo "dist -- run python setup.py sdist"
@echo "deb -- build a .deb package"
@echo "rc -- buil resources"

rc:
pyrcc5 pireal/resources/resources.qrc -o pireal/resources.py

clean:
rm -rf `find -name "*pyc"`
rm -rf `find -name "*pyo"`
rm -rf `find -name "*qmlc"`
rm -rf .pybuild/
rm -rf debian/debhelper-build-stamp
rm -rf debian/.debhelper
rm -rf debian/files
rm -rf debian/pireal/
rm -rf debian/pireal.postinst.debhelper
rm -rf debian/pireal.prerm.debhelper
rm -rf debian/pireal.substvars
rm -rf pireal.egg-info
rm -rf build/

pep8:
pycodestyle pireal

flake8:
flake8 pireal

lint: pep8 flake8

test:
pytest -v tests --cov src.core.relation --cov src.core.interpreter --cov src.core.file_manager --cov src.core.cliparser --cov src.core.pfile --cov-report term-missing
@$(PYTEST) -v --cov pireal.core --cov pireal.interpreter --cov-report term-missing -m "not integration and not gui" --ignore=tests/gui

test-gui:
@$(PYTEST) -v -m gui

test-integration:
@$(PYTEST) -v -m integration --ignore=tests/gui

dist: clean
rm -rf /tmp/pireal/
mkdir /tmp/pireal/
cp -R * /tmp/pireal/
(cd /tmp; tar -zcf pireal.tar.gz pireal/)
mv /tmp/pireal.tar.gz ./pireal_`./pireal --version`.orig.tar.gz
python setup.py sdist
mv dist/* ../

deb:
debuild -b -uc -us

install:
python setup.py install
24 changes: 7 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@

[![Build Status](https://travis-ci.org/centaurialpha/pireal.svg?branch=master)](https://travis-ci.org/centaurialpha/pireal)
[![Linux Tests](https://github.com/centaurialpha/pireal/actions/workflows/test-linux.yml/badge.svg)](https://github.com/centaurialpha/pireal/actions/workflows/test-linux.yml)
[![Windows Tests](https://github.com/centaurialpha/pireal/actions/workflows/test-windows.yml/badge.svg)](https://github.com/centaurialpha/pireal/actions/workflows/test-windows.yml)
[![Coverage Status](https://coveralls.io/repos/github/centaurialpha/pireal/badge.svg)](https://coveralls.io/github/centaurialpha/pireal)
---

<p align="center">
<img src="https://github.com/centaurialpha/pireal/blob/master/src/gui/qml/pireal_logo.png?raw=true" >
<p>

**πireal** is a teaching tool for use in learning introduction to database. It allows the user to interactively experiment with Relational Algebra.

| Pireal running on Linux |
|:--------:|
| ![](https://github.com/centaurialpha/pireal/blob/gh-pages/pireal.png)
| Click image to enlarge |
| Home Page | In action |
|:--------:|:----------:|
| ![pireal-screenshot](https://user-images.githubusercontent.com/5894606/112898694-8b92ca00-90b7-11eb-8515-cf04649f11f9.png) | ![pireal-in-action](https://user-images.githubusercontent.com/5894606/112898688-89c90680-90b7-11eb-8ae1-372d406b33fd.png) |

#### Platforms
- GNU/Linux
Expand All @@ -22,7 +17,6 @@
### Requirements to run/install from source
- [Python 3](http://python.org/)
- [PyQt5](http://www.riverbankcomputing.co.uk/software/pyqt/intro)
- PyQt5 Qt Quick Module (package `python3-pyqt5.qtquick` in Debian)

### Implemented Operators
The operations are implemented in [relation.py](https://github.com/centaurialpha/pireal/blob/master/src/core/relation.py).
Expand All @@ -40,16 +34,12 @@ The operations are implemented in [relation.py](https://github.com/centaurialpha
| Left Outer Join | :heavy_check_mark: |
| Right Outer Join | :heavy_check_mark: |
| Full Outer Join | :heavy_check_mark: |
| Division | :x: |
| Division | :x: (Can be expressed using relational operators)|

### Donate

I have developed Pireal with a lot of :heart:, I hope it is useful.

You can donate any amount that you think Pireal deserves.

[![donar](https://www.paypalobjects.com/es_XC/AR/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=29STPF8BWWUTY)

| Author |
|---|
| [Gabriel Acosta](https://centaurialpha.github.io) |
[![Invitame un café en cafecito.app](https://cdn.cafecito.app/imgs/buttons/button_5.svg)](https://cafecito.app/gabox)
30 changes: 0 additions & 30 deletions __tests/test_file_manager.py

This file was deleted.

0 comments on commit 7c993a3

Please sign in to comment.