Update setuptools and black (#498)

* Use setuptools
* Use black==22.1.0
This commit is contained in:
Inada Naoki 2022-03-03 12:29:55 +09:00 committed by GitHub
parent 89ea57747e
commit cb50b2081b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 83 additions and 84 deletions

View file

@ -17,9 +17,9 @@ jobs:
architecture: 'x64' architecture: 'x64'
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v2
- name: Black Code Formatter - name: Black Code Formatter
run: | run: |
pip install black pip install black==22.1.0
black --diff --check msgpack/ test/ setup.py black -S --diff --check msgpack/ test/ setup.py

View file

@ -4,7 +4,7 @@ all: cython
.PHONY: black .PHONY: black
black: black:
black msgpack/ test/ setup.py black -S msgpack/ test/ setup.py
.PHONY: cython .PHONY: cython
cython: cython:

View file

@ -1,5 +1,4 @@
# coding: utf-8 # coding: utf-8
from ._version import version
from .exceptions import * from .exceptions import *
from .ext import ExtType, Timestamp from .ext import ExtType, Timestamp
@ -7,6 +6,10 @@ import os
import sys import sys
version = (1, 0, 4, 'dev')
__version__ = "1.0.4dev"
if os.environ.get("MSGPACK_PUREPYTHON") or sys.version_info[0] == 2: if os.environ.get("MSGPACK_PUREPYTHON") or sys.version_info[0] == 2:
from .fallback import Packer, unpackb, Unpacker from .fallback import Packer, unpackb, Unpacker
else: else:

View file

@ -1 +0,0 @@
version = (1, 0, 3)

View file

@ -1,2 +1,5 @@
# Also declared in pyproject.toml, if updating here please also update there # Also declared in pyproject.toml, if updating here please also update there
Cython~=0.29.13 Cython~=0.29.13
# dev only tools. no need to add pyproject
black==22.1.0

32
setup.cfg Normal file
View file

@ -0,0 +1,32 @@
[metadata]
name = msgpack
#version = attr: msgpack.__version__
version = attr: msgpack.version
license = Apache 2.0
author = Inada Naoki
author_email = songofacandy@gmail.com
description = MessagePack serializer
long_description = file: README.md
long_description_content_type = text/markdown
url = https://msgpack.org/
project_urls =
Documentation = https://msgpack-python.readthedocs.io/
Source = https://github.com/msgpack/msgpack-python
Tracker = https://github.com/msgpack/msgpack-python/issues
classifiers =
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: Implementation :: PyPy
Intended Audience :: Developers
License :: OSI Approved :: Apache Software License
[flake8]
max_line_length = 100

View file

@ -4,10 +4,9 @@ import io
import os import os
import sys import sys
from glob import glob from glob import glob
from distutils.command.sdist import sdist
from setuptools import setup, Extension from setuptools import setup, Extension
from setuptools.command.build_ext import build_ext
from distutils.command.build_ext import build_ext from setuptools.command.sdist import sdist
PYPY = hasattr(sys, "pypy_version_info") PYPY = hasattr(sys, "pypy_version_info")
@ -65,12 +64,6 @@ class BuildExt(build_ext):
print(e) print(e)
exec(open("msgpack/_version.py").read())
version_str = ".".join(str(x) for x in version[:3])
if len(version) > 3 and version[3] != "final":
version_str += version[3]
# Cython is required for sdist # Cython is required for sdist
class Sdist(sdist): class Sdist(sdist):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -99,39 +92,8 @@ if not PYPY and not PY2 and not os.environ.get("MSGPACK_PUREPYTHON"):
del libraries, macros del libraries, macros
desc = "MessagePack (de)serializer."
with io.open("README.md", encoding="utf-8") as f:
long_desc = f.read()
del f
setup( setup(
name="msgpack",
author="Inada Naoki",
author_email="songofacandy@gmail.com",
version=version_str,
cmdclass={"build_ext": BuildExt, "sdist": Sdist}, cmdclass={"build_ext": BuildExt, "sdist": Sdist},
ext_modules=ext_modules, ext_modules=ext_modules,
packages=["msgpack"], packages=["msgpack"],
description=desc,
long_description=long_desc,
long_description_content_type="text/markdown",
url="https://msgpack.org/",
project_urls={
"Documentation": "https://msgpack-python.readthedocs.io/",
"Source": "https://github.com/msgpack/msgpack-python",
"Tracker": "https://github.com/msgpack/msgpack-python/issues",
},
license="Apache 2.0",
classifiers=[
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Intended Audience :: Developers",
"License :: OSI Approved :: Apache Software License",
],
) )