diff --git a/project.clj b/project.clj index 7fd4e33b4360169d261bc349805bd1721466c71c..7347f1aedaa268203a91772910cd9b55900735e4 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject python/lein-template "0.18.2" +(defproject python/lein-template "0.19.0" :description "lein template for a python project" :repositories [["snapshots" {:url "http://devserv.game.yy.com/nexus/content/repositories/snapshots" diff --git a/src/leiningen/new/python/Makefile b/src/leiningen/new/python/Makefile index 531d8be05d5e418fe7a94dfceb4411656ebc4f66..dd835ca2dace16b1ebd5e68b53f3bbf0d1fc6a60 100644 --- a/src/leiningen/new/python/Makefile +++ b/src/leiningen/new/python/Makefile @@ -31,7 +31,7 @@ requirements: @if [ -d wheelhouse ]; then \ $(PIP) install -q --no-index --find-links=wheelhouse $(REQUIREMENTS); \ else \ - $(PIP) install -q -f https://emacsos.com/python/packages/ $(REQUIREMENTS); \ + $(PIP) install -q $(REQUIREMENTS); \ fi logdir: @if [ ! -d /var/log/{{name}} ]; then \ @@ -52,7 +52,7 @@ pipfreeze: wheel: bootstrap-dev @echo "building wheelhouse..." $(PIP) install wheel - $(PIP) wheel -w wheelhouse -f https://emacsos.com/python/packages/ $(REQUIREMENTS) + $(PIP) wheel -w wheelhouse $(REQUIREMENTS) check: just-test sanity-check: bootstrap @@ -69,7 +69,7 @@ just-test: $(PYTEST) $(PYTHON_MODULES) install-dev-no-wheel: - $(PIP) install -q -i https://pypi.tuna.tsinghua.edu.cn/simple -f https://emacsos.com/python/packages/ $(DEV_REQUIREMENTS) + $(PIP) install -q -i https://pypi.tuna.tsinghua.edu.cn/simple $(DEV_REQUIREMENTS) test-prod: install-dev-no-wheel test clean: diff --git a/src/leiningen/new/python/config.py b/src/leiningen/new/python/config.py index 7a43e7e8b98839bc7af07ba8209c706f5c86d19e..7ddd820351da509db73b7b74bb1ece8b93d05982 100644 --- a/src/leiningen/new/python/config.py +++ b/src/leiningen/new/python/config.py @@ -12,7 +12,7 @@ import {{name}}.configlogger import logging import os -from yygame.config import ConfigurationManger +from wells.config import ConfigurationManger logger = logging.getLogger(__name__) diff --git a/src/leiningen/new/python/logger.conf b/src/leiningen/new/python/logger.conf index 67ebffb1bde2bdef5c2cba8ab7ed9c95647b2354..ad99d22e6e27e546844791bddb7b51b5192ac203 100644 --- a/src/leiningen/new/python/logger.conf +++ b/src/leiningen/new/python/logger.conf @@ -1,5 +1,5 @@ [loggers] -keys=root,pika,py,requests,neutronclient,celery,yygame_debug +keys=root,pika,py,requests,neutronclient,celery,wells_debug [logger_root] level=DEBUG @@ -17,11 +17,11 @@ handlers=console,file_celery,sentry qualname=celery propagate=0 -[logger_yygame_debug] +[logger_wells_debug] level=DEBUG -handlers=console,file_yygame_debug,sentry +handlers=console,file_wells_debug,sentry propagate=0 -qualname=yygame.debug +qualname=wells.debug [logger_pika] handlers=console,file @@ -42,7 +42,7 @@ propagate=0 qualname=py [handlers] -keys=console,file,file_yygame_debug,file_celery,file_crit,sentry +keys=console,file,file_wells_debug,file_celery,file_crit,sentry [handler_sentry] level=ERROR @@ -70,11 +70,11 @@ formatter=long class=FileHandler args=('/var/log/{{name}}/celery.log', 'a', 'utf-8', True) -[handler_file_yygame_debug] +[handler_file_wells_debug] level=DEBUG formatter=long class=FileHandler -args=('/var/log/{{name}}/yygame-debug.log', 'a', 'utf-8', True) +args=('/var/log/{{name}}/wells-debug.log', 'a', 'utf-8', True) [handler_file_crit] level=CRITICAL diff --git a/src/leiningen/new/python/requirements.txt b/src/leiningen/new/python/requirements.txt index 3d3713d6bc34678b60878b9fa97e2b85c88c6d24..bb3e23c108f274b26e96d3eb5d5ce7b0dbe4c34e 100644 --- a/src/leiningen/new/python/requirements.txt +++ b/src/leiningen/new/python/requirements.txt @@ -1,3 +1,3 @@ -yygame-utils==0.18.0 +wells==1.1.0 # six==1.10.0 # raven==6.0.0 diff --git a/src/leiningen/new/python/sanity_check.py b/src/leiningen/new/python/sanity_check.py index bb2b6d93164faa824fa1adaf046bd54c8569e1cb..22bc8d1ac659e49d2b6fd3e4262801d8734eebd2 100644 --- a/src/leiningen/new/python/sanity_check.py +++ b/src/leiningen/new/python/sanity_check.py @@ -8,7 +8,7 @@ import sys import logging -from yygame.utils import check +from wells.utils import check from {{name}}.config import CONF # from {{name}} import db