Commit 10d30f21 authored by Yuanle Song's avatar Yuanle Song
Browse files

v0.19.0 use wells instead of yygame-utils

parent 75bca03b

project.clj

+1 −1
Original line number Diff line number Diff line 
(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"

src/leiningen/new/python/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -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:

src/leiningen/new/python/config.py

+1 −1
Original line number Diff line number Diff line
@@ -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__)

src/leiningen/new/python/logger.conf

+7 −7
Original line number Diff line number Diff line 
[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

src/leiningen/new/python/requirements.txt

+1 −1
Original line number Diff line number Diff line 
yygame-utils==0.18.0

wells==1.1.0

# six==1.10.0

# raven==6.0.0