Skip to content

Commit aa0c936

Browse files
committed
Migrate most metadata to setup.cfg
1 parent 374be0a commit aa0c936

File tree

4 files changed

+45
-48
lines changed

4 files changed

+45
-48
lines changed

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
include HISTORY.rst README.rst LICENSE geoip2/py.typed requirements.txt tests/*.py tests/data/test-data/*.mmdb
1+
include HISTORY.rst README.rst LICENSE geoip2/py.typed tests/*.py tests/data/test-data/*.mmdb
22
graft docs/html

requirements.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

setup.cfg

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,50 @@
1+
[metadata]
2+
name = geoip2
3+
author = Gregory Oschwald
4+
author_email = [email protected]
5+
license = Apache License, Version 2.0
6+
description = MaxMind GeoIP2 API
7+
url = http://www.maxmind.com/
8+
long_description = file: README.rst
9+
classifiers =
10+
Development Status :: 5 - Production/Stable
11+
Environment :: Web Environment
12+
Intended Audience :: Developers
13+
Intended Audience :: System Administrators
14+
License :: OSI Approved :: Apache Software License
15+
Programming Language :: Python :: 3
16+
Programming Language :: Python :: 3.7
17+
Programming Language :: Python :: 3.8
18+
Programming Language :: Python :: 3.9
19+
Programming Language :: Python :: 3.10
20+
Programming Language :: Python
21+
Topic :: Internet :: Proxy Servers
22+
Topic :: Internet
23+
project_urls =
24+
Documentation = https://geoip2.readthedocs.org/
25+
Source Code = https://github.com/maxmind/GeoIP2-python
26+
Issue Tracker = https://github.com/maxmind/GeoIP2-python/issues
27+
28+
[options]
29+
package_dir =
30+
geoip2 = geoip2
31+
packages = geoip2
32+
install_requires =
33+
aiohttp>=3.6.2,<4.0.0
34+
maxminddb>=2.3.0,<3.0.0
35+
requests>=2.24.0,<3.0.0
36+
include_package_data = True
37+
python_requires = >=3.7
38+
test_suite = tests
39+
tests_require = mocket>=3.11.1
40+
141
[flake8]
242
# black uses 88 : ¯\_(ツ)_/¯
343
max-line-length = 88
444

45+
[options.package_data]
46+
geoip2 = py.typed
47+
548
[wheel]
649
universal = 1
750

@@ -30,7 +73,7 @@ commands = pytest tests
3073

3174
[testenv:py310-black]
3275
deps = black
33-
commands = black --check --diff .
76+
commands = black --check --diff .
3477

3578
[testenv:py310-lint]
3679
deps = pylint

setup.py

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,9 @@
11
#!/usr/bin/env python
22

3-
import codecs
4-
import os
5-
import sys
6-
73
import geoip2
84

95
from setuptools import setup
106

11-
packages = ["geoip2"]
12-
13-
requirements = [i.strip() for i in open("requirements.txt").readlines()]
14-
157
setup(
16-
name="geoip2",
178
version=geoip2.__version__,
18-
description="MaxMind GeoIP2 API",
19-
long_description=codecs.open("README.rst", "r", "utf-8").read(),
20-
author="Gregory Oschwald",
21-
author_email="[email protected]",
22-
url="http://www.maxmind.com/",
23-
packages=["geoip2"],
24-
package_data={"": ["LICENSE"], "geoip2": ["py.typed"]},
25-
package_dir={"geoip2": "geoip2"},
26-
include_package_data=True,
27-
python_requires=">=3.7",
28-
install_requires=requirements,
29-
tests_require=["mocket>=3.11.1"],
30-
test_suite="tests",
31-
license=geoip2.__license__,
32-
classifiers=[
33-
"Development Status :: 5 - Production/Stable",
34-
"Environment :: Web Environment",
35-
"Intended Audience :: Developers",
36-
"Intended Audience :: System Administrators",
37-
"License :: OSI Approved :: Apache Software License",
38-
"Programming Language :: Python :: 3",
39-
"Programming Language :: Python :: 3.7",
40-
"Programming Language :: Python :: 3.8",
41-
"Programming Language :: Python :: 3.9",
42-
"Programming Language :: Python :: 3.10",
43-
"Programming Language :: Python",
44-
"Topic :: Internet :: Proxy Servers",
45-
"Topic :: Internet",
46-
],
47-
project_urls={
48-
"Documentation": "https://geoip2.readthedocs.org/",
49-
"Source Code": "https://github.com/maxmind/GeoIP2-python",
50-
"Issue Tracker": "https://github.com/maxmind/GeoIP2-python/issues",
51-
},
529
)

0 commit comments

Comments
 (0)