Merge branch 'master' into v0.3.x

README.md

@@ -27,23 +27,37 @@ Easily **custom(add/replace)** `LogRecord` attribute, e.g. in `Flask` web projec
 
 
 
-## Installation
+## Contributing
 
-jsonformatter is available on PyPI.
-Use pip to install:
+Download source code
+```shell
+$ git clone https://github.com/MyColorfulDays/jsonformatter.git
+$ cd jsonformatter
+$ pip install -e .
+```
 
+Run tests
 ```shell
-$ pip install jsonformatter
+$ python -m unittest tests/test.py
+$ python -m unittest tests/test_windows.py
 ```
-or:
 
+Build
 ```shell
-$ git clone https://github.com/MyColorfulDays/jsonformatter.git
-$ cd jsonformatter
-$ python setup.py install
+$ pip install build
+$ python -m build
 ```
 
 
+## Installation
+
+jsonformatter is available on PyPI.
+Use pip to install:
+
+```shell
+$ pip install jsonformatter
+```
+
 
 ## Basic Usage
 

pyproject.toml

@@ -0,0 +1,29 @@
+[build-system]
+requires = ["pdm-pep517>=1.1.2"]
+build-backend = "pdm.pep517.api"
+
+[project]
+name = "jsonformatter"
+version = "0.3.3"
+description = 'Python log in json format.'
+readme = "README.md"
+license = "BSD License"
+license-files.paths = [
+    "LICENSE",
+]
+classifiers = [
+    'Development Status :: 2 - Pre-Alpha',
+    'Intended Audience :: Developers',
+    'License :: OSI Approved :: BSD License',
+    'Operating System :: OS Independent',
+    'Programming Language :: Python :: 2.7',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: Implementation :: CPython',
+    'Topic :: Utilities',
+]
+authors = [
+    { name = "MyColorfulDays", email = "my_colorful_days@163.com" },
+]
+urls = { Homepage = "https://github.com/MyColorfulDays/jsonformatter.git" }
+requires-python = ">=2.7"
+dependencies = []

jsonformatter/__init__.py → src/jsonformatter/__init__.py

@@ -1,16 +1,13 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-"""
-File: jsonformatter.py
-Author: Me
-Email: yourname@email.com
-Github: https://github.com/yourname
-Description: jsonformatter.py
-"""
-from .jsonformatter import JsonFormatter, basicConfig
-
-__all__ = ['JsonFormatter', 'basicConfig']
-
-version_info = (0, 3, 2)
-version = '.'.join(str(v) for v in version_info)
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+File: jsonformatter.py
+Author: Me
+Email: yourname@email.com
+Github: https://github.com/yourname
+Description: jsonformatter.py
+"""
+from .jsonformatter import JsonFormatter, basicConfig
+
+__all__ = ['JsonFormatter', 'basicConfig']