switched to poetry and respect poetry's folder structure, version 0.3.7

jiri-one · Nov 9, 2021 · 8f30472 · 8f30472
1 parent 34d740e
commit 8f30472
Show file tree

Hide file tree

Showing 30 changed files with 122 additions and 52 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ easydict.glade~
 /easydict_gtk.egg-info/
 /easydict-gtk.egg-info/
 venv
+test_venv
 dist
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/README.md b/README.md
@@ -2,10 +2,6 @@
 The first open source translator which is completely open with dictionary data too. The homepage is http://easydict.jiri.one. On this page you can also try the search results, which will be the same as in the app (however, the web application does not use TinyDB+orjson as a backend, but uses RethinkDB - the source data is the same). 
 **The application is at an early stage of development, but the features and dictionaries that have already been implemented work very well.**
 
-## Table of Contents
-
-[TOC]
-
 ## What is it
 
 EasyDict is a simple translator that will translate, typically, one word in one language into another language. This translator has several, sometimes unique, features. 
@@ -44,8 +40,8 @@ To-Do-List
 - [X] get the homepage https://easydict.jiri.one back online
 - [ ] create tests for backend
 - [ ] add the possibility to use other dictionaries
-- [ ] optimize the application for touch control so that it can be run on Phosh - https://puri.sm/projects/phosh/ using libhanda - https://gitlab.gnome.org/GNOME/libhandy
-- [ ] ? maybe swith to poetry
+- [ ] optimize the application for touch control so that it can be run on Phosh - https://puri.sm/projects/phosh/ using libhandy - https://gitlab.gnome.org/GNOME/libhandy
+- [X] ? maybe swith to poetry
 - [ ] create FlatPak package and publish it on FlatHub
 - [ ] create ArchLinux package an publish it on AUR
 - [ ] ...
diff --git a/easydict/__init__.py b/easydict/__init__.py
diff --git a/easydict/__main__.py b/easydict/__main__.py
diff --git a/easydict_gtk/__init__.py b/easydict_gtk/__init__.py
@@ -0,0 +1,3 @@
+from easydict_gtk.easydict import EasyDict
+
+__all__ = ['EasyDict']
diff --git a/easydict_gtk/__main__.py b/easydict_gtk/__main__.py
@@ -0,0 +1,3 @@
+from easydict_gtk.easydict import main
+
+main()
diff --git a/easydict/data/eng-cze.json → easydict_gtk/data/eng-cze.json b/easydict/data/eng-cze.json → easydict_gtk/data/eng-cze.json
diff --git a/easydict/data/help_eng.txt → easydict_gtk/data/help_eng.txt b/easydict/data/help_eng.txt → easydict_gtk/data/help_eng.txt
diff --git a/easydict/data/settings.json → easydict_gtk/data/settings.json b/easydict/data/settings.json → easydict_gtk/data/settings.json
diff --git a/easydict/src/easydict.py → easydict_gtk/easydict.py b/easydict/src/easydict.py → easydict_gtk/easydict.py
diff --git a/easydict/garbage/easydict_backup.py → easydict_gtk/garbage/easydict_backup.py b/easydict/garbage/easydict_backup.py → easydict_gtk/garbage/easydict_backup.py
diff --git a/easydict/garbage/easydict_first.py → easydict_gtk/garbage/easydict_first.py b/easydict/garbage/easydict_first.py → easydict_gtk/garbage/easydict_first.py
diff --git a/easydict/garbage/easydict_run.py → easydict_gtk/garbage/easydict_run.py b/easydict/garbage/easydict_run.py → easydict_gtk/garbage/easydict_run.py
diff --git a/easydict/garbage/easydict_tray.py → easydict_gtk/garbage/easydict_tray.py b/easydict/garbage/easydict_tray.py → easydict_gtk/garbage/easydict_tray.py
diff --git a/easydict/garbage/tinydb_test.py → easydict_gtk/garbage/tinydb_test.py b/easydict/garbage/tinydb_test.py → easydict_gtk/garbage/tinydb_test.py
diff --git a/easydict/src/handlers.py → easydict_gtk/handlers.py b/easydict/src/handlers.py → easydict_gtk/handlers.py
diff --git a/easydict/src/html_generator.py → easydict_gtk/html_generator.py b/easydict/src/html_generator.py → easydict_gtk/html_generator.py
diff --git a/easydict/images/ed_icon.png → easydict_gtk/images/ed_icon.png b/easydict/images/ed_icon.png → easydict_gtk/images/ed_icon.png
diff --git a/easydict/images/ed_pref_icon.png → easydict_gtk/images/ed_pref_icon.png b/easydict/images/ed_pref_icon.png → easydict_gtk/images/ed_pref_icon.png
diff --git a/easydict/images/ed_tray_icon.png → easydict_gtk/images/ed_tray_icon.png b/easydict/images/ed_tray_icon.png → easydict_gtk/images/ed_tray_icon.png
diff --git a/easydict/images/flag_cze.svg → easydict_gtk/images/flag_cze.svg b/easydict/images/flag_cze.svg → easydict_gtk/images/flag_cze.svg
diff --git a/easydict/images/flag_eng.svg → easydict_gtk/images/flag_eng.svg b/easydict/images/flag_eng.svg → easydict_gtk/images/flag_eng.svg
diff --git a/easydict/src/orjson_storage.py → easydict_gtk/orjson_storage.py b/easydict/src/orjson_storage.py → easydict_gtk/orjson_storage.py
diff --git a/easydict/src/settings.py → easydict_gtk/settings.py b/easydict/src/settings.py → easydict_gtk/settings.py
@@ -7,7 +7,7 @@
 from pathlib import Path
 
 # set current working directory
-cwd = Path(__file__).parent.parent
+cwd = Path(__file__).parent
 cwd_images = cwd / "images"
 cfg_dir = Path.home() / ".config" / "easydict" # set user config directory
 cfg_dir.mkdir(exist_ok=True) # create the config directory if not exists

diff --git a/easydict/src/tray_menu.py → easydict_gtk/tray_menu.py b/easydict/src/tray_menu.py → easydict_gtk/tray_menu.py
diff --git a/easydict/ui/easydict.glade → easydict_gtk/ui/easydict.glade b/easydict/ui/easydict.glade → easydict_gtk/ui/easydict.glade
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,26 @@
+[tool.poetry]
+name = "easydict-gtk"
+version = "0.3.7"
+description = "The first open source translator which is completely open with dictionary data too."
+authors = ["jiri.one <[email protected]>"]
+license = "GPL-3.0-only"
+readme = "README.md"
+exclude = ["easydict_gtk/garbage"]
+
+
+[tool.poetry.dependencies]
+python = "^3.9"
+PyGObject = "^3.42.0"
+pycairo = "^1.20.1"
+tinydb = "^4.5.2"
+orjson = "^3.6.4"
+
+[tool.poetry.dev-dependencies]
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry.scripts]
+easydict-gtk = 'easydict_gtk.easydict:main'
+
diff --git a/setup.py b/setup.py