Commit 7004df0a authored by Mickaël Desfrênes's avatar Mickaël Desfrênes
Browse files

Merge branch 'md/upgrade-sanic' into 'master' 

fix working directory bug

See merge request !2
parents cab63878 9bff0b85

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ clean: 
	rm -rf build

	rm -rf circe/__pycache__/

	rm -rf circe_CERTIC.egg-info/

pypi: clean

dist: clean

	python setup.py sdist

pypi: dist

	python setup.py sdist

	twine upload --skip-existing dist/*

test:

circe/__init__.py

+1 −3
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ import os 
import sys

from time import sleep



sys.path.insert(0, os.getcwd())



try:

    from uuid import uuid4

    import sanic.request
@@ -338,7 +336,7 @@ def start_workers(workers: int = CONFIG["CIRCE_WORKERS"]): 
    """

    if CONFIG["CIRCE_IMMEDIATE_MODE"]:

        sys.exit("Can't start workers if CIRCE_IMMEDIATE_MODE=1")

    working_directory = os.path.dirname(os.path.abspath(__file__))

    working_directory = os.getcwd()

    call(

        ["huey_consumer.py", "circe.tasks.huey", "-w", str(workers)],

        cwd=working_directory,

circe/__main__.py

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ from circe import ( 
import sys

import os



sys.path.insert(0, os.getcwd())





def run_cli():

    parser = argh.ArghParser()

circe/config.py

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ from multiprocessing import cpu_count 
import sys

from dotenv import load_dotenv



load_dotenv()

sys.path.append(os.getcwd())

load_dotenv("{}/.env".format(os.getcwd()))



CONFIG = {

    "CIRCE_HOST": "127.0.0.1",

circe/static/index.html

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
            Le traitement est terminé, vous pouvez récuperer vos fichiers:

        </p>

        <p>

            <form action="/webui/fetchjob">

            <form action="/webui/fetchjob/">

                <input class="sobig" type="submit" value="Téléchargez vos fichiers" />

            </form>

        </p>