Skip to content

Commit

Permalink
Merge pull request #33 from marselester/deprecate-lt-3.6
Browse files Browse the repository at this point in the history
Deprecate Python versions below 3.6
  • Loading branch information
marselester authored Mar 10, 2024
2 parents bf41c57 + ffeabc8 commit 1b20bcb
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015 Marsel Mavletkulov
Copyright (c) 2024 Marsel Mavletkulov

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions json_log_formatter/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import logging
from datetime import datetime
from datetime import datetime, timezone

import json

Expand Down Expand Up @@ -120,7 +120,7 @@ def json_record(self, message, extra, record):
"""
extra['message'] = message
if 'time' not in extra:
extra['time'] = datetime.utcnow()
extra['time'] = datetime.now(timezone.utc)

if record.exc_info:
extra['exc_info'] = self.formatException(record.exc_info)
Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,19 @@ packages = ["json_log_formatter"]

[project]
name = "JSON-log-formatter"
version = "0.5.2"
version = "1.0"
description = "JSON log formatter"
readme = "README.rst"
requires-python = ">=2.7"
requires-python = ">=3.6"
license = {text = "MIT"}
authors = [
{name = "Marsel Mavletkulov", email = "[email protected]"},
{name = "Marsel Mavletkulov"},
]
classifiers=[
"License :: OSI Approved :: MIT License",
"Intended Audience :: Developers",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 3",
"Topic :: Software Development :: Libraries :: Python Modules"
]
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

setup(
name='JSON-log-formatter',
version='0.5.2',
version='1.0',
license='MIT',
packages=['json_log_formatter'],
author='Marsel Mavletkulov',
author_email='[email protected]',
url='https://github.com/marselester/json-log-formatter',
description='JSON log formatter',
long_description=open('README.rst').read(),
Expand All @@ -15,7 +14,6 @@
'Intended Audience :: Developers',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
'Topic :: Software Development :: Libraries :: Python Modules'
],
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[tox]
envlist=py27,py35,py36,py37,py38,py39,py310,py311,py312
envlist=py36,py37,py38,py39,py310,py311,py312

[testenv]
deps=
pytest
ujson==5.9.0
simplejson==3.19.2
ujson
simplejson
django
commands=
pytest -s tests.py

0 comments on commit 1b20bcb

Please sign in to comment.