Commit 466bc33f authored by matograine's avatar matograine

Light chenges for packaging

* create gdon/silkaj/__init__.py
* add info in the README
* version 0.0.3
* comment import tabulate

* add a config file creation if not exists
parent 59623cd9
__pycache__/
qtcreator/
publish.sh
### from Silkaj
......
include objects/recto.png
include objects/Roboto-Medium.ttf
include objects/verso.png
include objects/wordlist.txt
......@@ -3,12 +3,6 @@ url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"
[packages]
duniterpy = ">=0.54.3"
Pillow = ">=6.0.0"
qrcode = ">=6.1"
reportlab = ">=3.5.23"
[dev-packages]
[requires]
......
{
"_meta": {
"hash": {
"sha256": "5dd7463a54a09602a48f57fc8c38ac09d05e3be94c5ba881d8df73a8603d7eb1"
"sha256": "05e2b695b3a9b4e54c8548c5d10b500e9eb76ad96a76cd0d52b628e8cac5fa2f"
},
"pipfile-spec": 6,
"requires": {
......@@ -40,13 +40,6 @@
],
"version": "==3.0.1"
},
"attr": {
"hashes": [
"sha256:0b1aaddb85bd9e9c4bd75092f4440d6616ff40b0df0437f00771871670f7c9fd",
"sha256:9091548058d17f132596e61fa7518e504f76b9a4c61ca7d86e1f96dbf7d4775d"
],
"version": "==0.3.1"
},
"attrs": {
"hashes": [
"sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c",
......@@ -103,11 +96,10 @@
},
"duniterpy": {
"hashes": [
"sha256:a0d4ee5928a17db2f101ba5ff7d179355305cc75c150cde439feec1cc22cdda8",
"sha256:c70f220ec324e4e566321f640b602d53a0c942cfbf3ba1ba30270ed7418f2aea"
"sha256:4027cf3820f479e0adad8d111e6d9e5745213c5736d91217aae8864ec6879e49",
"sha256:bf6852fbc15841f16910424c6a89ddf7374afc1728238f19e1ba4c932d430dc1"
],
"index": "pypi",
"version": "==0.55.1"
"version": "==0.56"
},
"e1839a8": {
"editable": true,
......@@ -197,7 +189,6 @@
"sha256:da737ab273f4d60ae552f82ad83f7cbd0e173ca30ca20b160f708c92742ee212",
"sha256:eb84e7e5b07ff3725ab05977ac56d5eeb0c510795aeb48e8b691491be3c5745b"
],
"index": "pypi",
"version": "==7.1.1"
},
"pyaes": {
......@@ -262,7 +253,6 @@
"sha256:3996ee560fc39532910603704c82980ff6d4d5d629f9c3f25f34174ce8606cf5",
"sha256:505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369"
],
"index": "pypi",
"version": "==6.1"
},
"reportlab": {
......@@ -308,7 +298,6 @@
"sha256:f18ad0212b7204f5fae37682ec4760a11e1130c294294cfcd900d202d90ed9d9",
"sha256:f7e4e8adc959dd65e127ae0865fb278d40b34ee2ae8e41e2c5fa8dc83cea273b"
],
"index": "pypi",
"version": "==3.5.42"
},
"six": {
......
......@@ -19,6 +19,8 @@ Le logiciel est empaqueté et référencé avec Pypi-test pour le moment.
```
$ sudo apt-get install python3 python3-pip
$ python3 -m pip install --index-url https://test.pypi.org/simple/ gdon # à tester
# ajouter .local/bin à votre PATH
$ echo 'export PATH="/home/$USER/.local/bin:$PATH"' >> .bash_aliases
```
......
......@@ -3,7 +3,7 @@ MAX_AMOUNT = 1000000000
SUGGESTED_DEV_PERCENT = 5
DATE_FORMAT = "[0-9]{2}/[0-9]{2}/[0-9]{4}"
PUBKEY_FORMAT = "[1-9A-HJ-NP-Za-km-z]{43,44}"
DEFAULT_FOLDER = "~/Documents/G1pourboire/"
DEFAULT_FOLDER = "~/Documents/G1dons/"
WALLETS_FOLDER = "Recuperation_ne_pas_supprimer/"
BACKUP_FOLDER = ".backup/"
PDF_BACKUP_FOLDER = "pdf/"
......
......@@ -20,7 +20,7 @@ import math
from time import sleep
#from click import command, option, FloatRange
from tabulate import tabulate
#from tabulate import tabulate
from gdon.silkaj.network_tools import ClientInstance, HeadBlock
from gdon.silkaj.crypto_tools import check_public_key
from gdon.silkaj.tools import message_exit, CurrencySymbol, coroutine
......
......@@ -20,7 +20,7 @@ import math
from time import sleep
#from click import command, option, FloatRange
from tabulate import tabulate
#from tabulate import tabulate
from gdon.silkaj.network_tools import ClientInstance, HeadBlock
from gdon.silkaj.crypto_tools import check_public_key
from gdon.silkaj.tools import message_exit, CurrencySymbol, coroutine
......
......@@ -4,6 +4,7 @@ import json
import re
from gdon.constants import DEFAULT_FOLDER, WALLETS_FOLDER, BACKUP_FOLDER, PDF_BACKUP_FOLDER, PDF_EXTENSION, SIGNED_EXTENSION, CONF_FILE
from gdon.silkaj.constants import G1_DEFAULT_ENDPOINT
def check_date(given_date):
"""
......@@ -50,8 +51,7 @@ class CheckConfig():
os.makedirs(self.wallets_folder)
if not os.path.exists(self.backup_folder):
os.makedirs(self.backup_folder)
if not os.path.exists(self.config_file):
self.write_node_conf(str(G1_DEFAULT_ENDPOINT[0]), int(G1_DEFAULT_ENDPOINT[1]))
self.write_node_conf(str(G1_DEFAULT_ENDPOINT[0]), int(G1_DEFAULT_ENDPOINT[1]))
def get_conf(self):
if not os.path.exists(self.config_file):
......@@ -63,6 +63,9 @@ class CheckConfig():
node = dict()
node["domain"] = str(given_node)
node["port"] = str(port)
if not os.path.exists(self.config_file):
f = open(self.config_file, "x")
f.close()
with open(self.config_file, "w") as f:
f.write(json.dumps(node, indent=4))
......
......@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
setuptools.setup(
name="gdon",
version="0.0.1",
version="0.0.3",
author="matograine",
author_email="matograine@zaclys.net",
description="gdon helps creating paper tips for the Ğ1 libre crypto-currency ; and retrieve them after expiry.",
......@@ -13,6 +13,7 @@ setuptools.setup(
long_description_content_type="text/markdown",
url="https://github.com/pypa/sampleproject",
packages=setuptools.find_packages(),
include_package_data=True,
classifiers=[
"Programming Language :: Python :: 3",
"License :: OSI Approved :: GNU Affero General Public License v3",
......@@ -27,7 +28,8 @@ setuptools.setup(
install_requires=[
# Silkaj packages
# "Click",
"duniterpy==0.55.1",
# "duniterpy==0.55.1",
"duniterpy==0.56",
"ipaddress",
"texttable",
# "tabulate",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment