From bdd3d974efca34327b6107c3bc67bfaea2227fd7 Mon Sep 17 00:00:00 2001 From: geigi Date: Fri, 8 Dec 2017 01:13:06 +0100 Subject: [PATCH] version bump --- .gitignore | 3 +- .vscode/launch.json | 210 +++++++++++++++++++++++++ .vscode/settings.json | 3 + .vscode/tasks.json | 21 +++ data/com.github.geigi.cozy.appdata.xml | 10 +- debian/changelog | 7 + main.py | 2 +- meson.build | 2 +- 8 files changed, 254 insertions(+), 4 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json create mode 100644 .vscode/tasks.json diff --git a/.gitignore b/.gitignore index d565dd6e..8d34aca7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ peewee/ # Ignore sublime files *.sublime-workspace -.vscode \ No newline at end of file +.vscode/.ropeproject +.vscode/tags \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..06159113 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,210 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + + { + "name": "Python", + "type": "python", + "request": "launch", + "stopOnEntry": false, + "pythonPath": "${config:python.pythonPath}", + "program": "${workspaceRoot}/app/bin/com.github.geigi.cozy", + "cwd": "${workspaceRoot}", + "env": {"XDG_DATA_DIRS":"${workspaceFolder}/app/share:/usr/share", "PYTHONPATH":"${workspaceFolder}/app/lib/python3.6/site-packages"}, + "envFile": "${workspaceRoot}/.env", + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput" + ], + "preLaunchTask": "ninja" + }, + { + "name": "Python: Attach", + "type": "python", + "request": "attach", + "localRoot": "${workspaceRoot}", + "remoteRoot": "${workspaceRoot}", + "port": 3000, + "secret": "my_secret", + "host": "localhost" + }, + { + "name": "Python: Terminal (integrated)", + "type": "python", + "request": "launch", + "stopOnEntry": true, + "pythonPath": "${config:python.pythonPath}", + "program": "${file}", + "cwd": "", + "console": "integratedTerminal", + "env": {}, + "envFile": "${workspaceRoot}/.env", + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit" + ] + }, + { + "name": "Python: Terminal (external)", + "type": "python", + "request": "launch", + "stopOnEntry": true, + "pythonPath": "${config:python.pythonPath}", + "program": "${file}", + "cwd": "", + "console": "externalTerminal", + "env": {}, + "envFile": "${workspaceRoot}/.env", + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit" + ] + }, + { + "name": "Python: Django", + "type": "python", + "request": "launch", + "stopOnEntry": true, + "pythonPath": "${config:python.pythonPath}", + "program": "${workspaceRoot}/manage.py", + "cwd": "${workspaceRoot}", + "args": [ + "runserver", + "--noreload", + "--nothreading" + ], + "env": {}, + "envFile": "${workspaceRoot}/.env", + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput", + "DjangoDebugging" + ] + }, + { + "name": "Python: Flask (0.11.x or later)", + "type": "python", + "request": "launch", + "stopOnEntry": false, + "pythonPath": "${config:python.pythonPath}", + "program": "fully qualified path fo 'flask' executable. Generally located along with python interpreter", + "cwd": "${workspaceRoot}", + "env": { + "FLASK_APP": "${workspaceRoot}/quickstart/app.py" + }, + "args": [ + "run", + "--no-debugger", + "--no-reload" + ], + "envFile": "${workspaceRoot}/.env", + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput" + ] + }, + { + "name": "Python: Flask (0.10.x or earlier)", + "type": "python", + "request": "launch", + "stopOnEntry": false, + "pythonPath": "${config:python.pythonPath}", + "program": "${workspaceRoot}/run.py", + "cwd": "${workspaceRoot}", + "args": [], + "env": {}, + "envFile": "${workspaceRoot}/.env", + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput" + ] + }, + { + "name": "Python: PySpark", + "type": "python", + "request": "launch", + "stopOnEntry": true, + "osx": { + "pythonPath": "${env:SPARK_HOME}/bin/spark-submit" + }, + "windows": { + "pythonPath": "${env:SPARK_HOME}/bin/spark-submit.cmd" + }, + "linux": { + "pythonPath": "${env:SPARK_HOME}/bin/spark-submit" + }, + "program": "${file}", + "cwd": "${workspaceRoot}", + "env": {}, + "envFile": "${workspaceRoot}/.env", + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput" + ] + }, + { + "name": "Python: Module", + "type": "python", + "request": "launch", + "stopOnEntry": true, + "pythonPath": "${config:python.pythonPath}", + "module": "module.name", + "cwd": "${workspaceRoot}", + "env": {}, + "envFile": "${workspaceRoot}/.env", + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput" + ] + }, + { + "name": "Python: Pyramid", + "type": "python", + "request": "launch", + "stopOnEntry": true, + "pythonPath": "${config:python.pythonPath}", + "cwd": "${workspaceRoot}", + "env": {}, + "envFile": "${workspaceRoot}/.env", + "args": [ + "${workspaceRoot}/development.ini" + ], + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput", + "Pyramid" + ] + }, + { + "name": "Python: Watson", + "type": "python", + "request": "launch", + "stopOnEntry": true, + "pythonPath": "${config:python.pythonPath}", + "program": "${workspaceRoot}/console.py", + "cwd": "${workspaceRoot}", + "args": [ + "dev", + "runserver", + "--noreload=True" + ], + "env": {}, + "envFile": "${workspaceRoot}/.env", + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput" + ] + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..615aafb0 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.pythonPath": "/usr/bin/python3" +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..f33796f2 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,21 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "meson", + "type": "shell", + "command": "meson ${workspaceFolder} ${workspaceFolder}/bin --prefix=${workspaceFolder}/app/ && ninja -C ${workspaceFolder}/bin install", + "group": "build", + "problemMatcher": [] + }, + { + "label": "ninja", + "type": "shell", + "command": "ninja -C ${workspaceFolder}/bin install", + "group": "build", + "problemMatcher": [] + } + ] +} \ No newline at end of file diff --git a/data/com.github.geigi.cozy.appdata.xml b/data/com.github.geigi.cozy.appdata.xml index 2607d1ac..f158eeaf 100644 --- a/data/com.github.geigi.cozy.appdata.xml +++ b/data/com.github.geigi.cozy.appdata.xml @@ -48,7 +48,7 @@ https://raw.githubusercontent.com/geigi/cozy/img/img/screenshot3.png - https://raw.githubusercontent.com/geigi/cozy/img/img/screenshot5.png + https://raw.githubusercontent.com/geigi/cozy/img/img/screenshot4.png Julian Geywitz @@ -58,6 +58,14 @@ https://www.patreon.com/geigi cozy@geigi.de + + +
    +
  • Cozy now looks a lot nicer!
    • +
  • Lots of bug fixes
    • +
+ +
    diff --git a/debian/changelog b/debian/changelog index 222202f5..66064df6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +com.github.geigi.cozy (0.4.4) UNSTABLE; urgency=low + + * Cozy now looks a lot nicer! + * Lots of bug fixes + + -- Julian Geywitz Wed, 08 Dec 2017 01:05:14 +0200 + com.github.geigi.cozy (0.4.3) UNSTABLE; urgency=low * Updated russian translation diff --git a/main.py b/main.py index 043a05ac..613dd486 100755 --- a/main.py +++ b/main.py @@ -9,7 +9,7 @@ # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# This program /home/ju/GitHub/Cozyis distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. diff --git a/meson.build b/meson.build index 5419ab73..3ddfc724 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cozy', - version: '0.4.3', + version: '0.4.4', meson_version: '>= 0.40.0') project_name = 'cozy'