Overview
| Comment: | [build] move bottle.py in 3rd part folder and copy it into Grammalecte package | 
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive | 
| Timelines: | family | ancestors | descendants | both | trunk | build | 
| Files: | files | file ages | folders | 
| SHA3-256: | 90c18a4cb48c4f6b2b771960bf5a35c3 | 
| User & Date: | olr on 2018-07-07 06:38:21 | 
| Original Comment: | [build] move bottle.py in 3rd parnt folder and copy it into Grammalecte package | 
| Other Links: | manifest | tags | 
Context
| 2018-07-07 | ||
| 12:08 | [server] don’t use global ini file for server options check-in: 1724e34975 user: olr tags: trunk, server | |
| 06:38 | [build] move bottle.py in 3rd part folder and copy it into Grammalecte package check-in: 90c18a4cb4 user: olr tags: trunk, build | |
| 2018-07-05 | ||
| 12:48 | [build] setup.py update check-in: 65a6a08553 user: olr tags: trunk, build | |
Changes
Name change from bottle.py to 3rd/bottle.py.
| ︙ | ︙ | 
Modified gc_lang/fr/setup.py from [ec7e264aeb] to [84260050cd].
| ︙ | ︙ | |||
| 58 59 60 61 62 63 64 | 
        'Programming Language :: Python :: 3.6',
    ],
    # What does your project relate to?
    keywords='French grammar checker correcteur grammatical français',
    # Scripts
 | | | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | 
        'Programming Language :: Python :: 3.6',
    ],
    # What does your project relate to?
    keywords='French grammar checker correcteur grammatical français',
    # Scripts
    scripts=['grammalecte-cli.py', 'grammalecte-server.py', 'grammalecte-server-options.fr.ini', 'grammalecte-server-options._global.ini'],
    # You can just specify the packages manually here if your project is
    # simple. Or you can use find_packages().
    # packages=find_packages(exclude=['contrib', 'docs', 'tests']),
    packages=['grammalecte', 'grammalecte.graphspell', 'grammalecte.fr'],
    # Alternatively, if you want to distribute just a my_module.py, uncomment
 | 
| ︙ | ︙ | 
Modified grammalecte-server.py from [a5cc9d7be7] to [190fd07852].
| 1 2 3 4 5 6 7 8 9 10 | #!/usr/bin/env python3 import sys import os.path import argparse import json import traceback import configparser import time | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | 
 #!/usr/bin/env python3
import sys
import os.path
import argparse
import json
import traceback
import configparser
import time
from grammalecte.bottle import Bottle, run, request, response, template, static_file
import grammalecte
import grammalecte.text as txt
from grammalecte.graphspell.echo import echo
HOMEPAGE = """
<!DOCTYPE HTML>
<html>
    <head>
        <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
    </head>
    <body class="panel">
        <h1>Grammalecte · Serveur</h1>
        <h2>INFORMATIONS</h1>
        <h3>Analyser du texte</h3>
        <p>[adresse_serveur]:8080/gc_text/fr (POST)</p>
 | 
| ︙ | ︙ | |||
| 47 48 49 50 51 52 53 | 
            <li>"options" (text) : une chaîne au format JSON avec le nom des options comme attributs et un booléen comme valeur. Exemple : {"gv": true, "html": true}</li>
        </ul>
        <h3>Remise à zéro de ses options</h3>
        <p>[adresse_serveur]:8080/reset_options/fr (POST)</p>
        <h2>TEST</h2>
 | | | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | 
            <li>"options" (text) : une chaîne au format JSON avec le nom des options comme attributs et un booléen comme valeur. Exemple : {"gv": true, "html": true}</li>
        </ul>
        <h3>Remise à zéro de ses options</h3>
        <p>[adresse_serveur]:8080/reset_options/fr (POST)</p>
        <h2>TEST</h2>
        <h3>Analyse</h3>
        <form method="post" action="/gc_text/fr" accept-charset="UTF-8">
            <p>Texte à analyser :</p>
            <textarea name="text" cols="120" rows="20" required></textarea>
            <p><label for="tf">Formateur de texte</label> <input id="tf" name="tf" type="checkbox"></p>
            <p><label for="options">Options (JSON)</label> <input id="options" type="text" name="options" style="width: 500px" /></p>
            <p>(Ces options ne seront prises en compte que pour cette requête.)</p>
 | 
| ︙ | ︙ | 
Modified make.py from [14e0172bf2] to [dcf6a6310a].
| ︙ | ︙ | |||
| 154 155 156 157 158 159 160 | 
def createPackageZip (sLang, dVars, spLangPack):
    "create server zip"
    spfZip = "_build/" + dVars['name'] + "-"+ dVars['lang'] +"-v" + dVars['version'] + '.zip'
    hZip = zipfile.ZipFile(spfZip, mode='w', compression=zipfile.ZIP_DEFLATED)
    copyGrammalectePyPackageInZipFile(hZip, spLangPack)
 | | | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 | 
def createPackageZip (sLang, dVars, spLangPack):
    "create server zip"
    spfZip = "_build/" + dVars['name'] + "-"+ dVars['lang'] +"-v" + dVars['version'] + '.zip'
    hZip = zipfile.ZipFile(spfZip, mode='w', compression=zipfile.ZIP_DEFLATED)
    copyGrammalectePyPackageInZipFile(hZip, spLangPack)
    for spf in ["grammalecte-cli.py", "grammalecte-server.py", \
                "grammalecte-server-options._global.ini", "grammalecte-server-options."+sLang+".ini", \
                "README.txt", "LICENSE.txt", "LICENSE.fr.txt"]:
        hZip.write(spf)
    hZip.writestr("setup.py", helpers.fileFile("gc_lang/fr/setup.py", dVars))
def copyGrammalectePyPackageInZipFile (hZip, spLangPack, sAddPath=""):
 | 
| ︙ | ︙ | |||
| 207 208 209 210 211 212 213 214 215 216 217 218 219 220 | 
    print()
    dVars["plugins"] = sCodePlugins
    ## COPY GC_CORE COMMON FILES
    for sf in os.listdir("gc_core/py"):
        if not os.path.isdir("gc_core/py/"+sf):
            helpers.copyAndFileTemplate("gc_core/py/"+sf, "grammalecte/"+sf, dVars)
    open("grammalecte/WARNING.txt", "w", encoding="utf-8", newline="\n").write(sWarningMessage)
    ## CREATE GRAMMAR CHECKER PACKAGE
    spLangPack = "grammalecte/"+sLang
    helpers.createCleanFolder(spLangPack)
    for sf in os.listdir("gc_core/py/lang_core"):
        if not os.path.isdir("gc_core/py/lang_core/"+sf):
 | > | 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 | 
    print()
    dVars["plugins"] = sCodePlugins
    ## COPY GC_CORE COMMON FILES
    for sf in os.listdir("gc_core/py"):
        if not os.path.isdir("gc_core/py/"+sf):
            helpers.copyAndFileTemplate("gc_core/py/"+sf, "grammalecte/"+sf, dVars)
    file_util.copy_file("3rd/bottle.py", "grammalecte/bottle.py")
    open("grammalecte/WARNING.txt", "w", encoding="utf-8", newline="\n").write(sWarningMessage)
    ## CREATE GRAMMAR CHECKER PACKAGE
    spLangPack = "grammalecte/"+sLang
    helpers.createCleanFolder(spLangPack)
    for sf in os.listdir("gc_core/py/lang_core"):
        if not os.path.isdir("gc_core/py/lang_core/"+sf):
 | 
| ︙ | ︙ | |||
| 248 249 250 251 252 253 254 | 
        print()
        dVars["pluginsJS"] = sCodePlugins
        # options data struct
        dVars["dOptJavaScript"] = json.dumps(list(dVars["dOptJavaScript"].items()))
        dVars["dOptFirefox"] = json.dumps(list(dVars["dOptFirefox"].items()))
        dVars["dOptThunderbird"] = json.dumps(list(dVars["dOptThunderbird"].items()))
 | | | 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 | 
        print()
        dVars["pluginsJS"] = sCodePlugins
        # options data struct
        dVars["dOptJavaScript"] = json.dumps(list(dVars["dOptJavaScript"].items()))
        dVars["dOptFirefox"] = json.dumps(list(dVars["dOptFirefox"].items()))
        dVars["dOptThunderbird"] = json.dumps(list(dVars["dOptThunderbird"].items()))
        # create folder
        spLangPack = "grammalecte-js/"+sLang
        helpers.createCleanFolder(spLangPack)
        # create files
        for sf in os.listdir("js_extension"):
            dVars[sf[:-3]] = open("js_extension/"+sf, "r", encoding="utf-8").read()
 | 
| ︙ | ︙ |