Skip to content

Commit 3293755

Browse files
authored
Merge pull request #58 from LuqueDaniel/57-adds-extra-dependencies
Move build data to setup.cfg, remove unnecesary files, set setuptools as build-system
2 parents ece4f4d + 090103b commit 3293755

File tree

8 files changed

+62
-73
lines changed

8 files changed

+62
-73
lines changed

.gitignore

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1-
# Ignore files .pyc
1+
# Python files
22
*.pyc
33
*.pyo
44
*.pyd
55
*.egg-info
66
__pycache__
7-
Pipfile.lock
8-
9-
# ignore test file
10-
.pytest_cache
11-
pro.py
12-
test.json
7+
.venv
138

149
# build/dist files
1510
build/
1611
dist/
1712
Pybooru.egg-info/
1813

19-
# IDEs config files/folders
14+
# IDEs/Editors config files/folders
2015
*.nja
2116
.vscode
2217

23-
# node dirs and files
24-
node_modules/
18+
# ignore test file
19+
.pytest_cache
20+
pro.py
21+
test.json

MANIFEST.in

Lines changed: 0 additions & 1 deletion
This file was deleted.

Pipfile

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

pybooru/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
resources -- Contains all resources for Pybooru.
1818
"""
1919

20-
__version__ = "4.2.2"
20+
__version__ = "5.0.0.dev1"
2121
__license__ = "MIT"
2222
__source_url__ = "https://github.com/LuqueDaniel/pybooru"
2323
__author__ = "Daniel Luque <danielluque14[at]gmail[dot]com>"

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[build-system]
2+
requires = ["setuptools >= 59.7.0", "wheel"]
3+
build-backend = "setuptools.build_meta"

requirements.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

setup.cfg

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,50 @@
1+
[metadata]
2+
name = Pybooru
3+
version = 5.0.0.dev1
4+
description = A package to access to Danbooru/Moebooru APIs
5+
url = https://github.com/LuqueDaniel/pybooru
6+
license = MIT License
7+
author = Daniel Luque
8+
author_email = danielluque14@gmai.com
9+
project_urls =
10+
Documentation = https://pybooru.readthedocs.io/en/latest/
11+
Source = https://github.com/LuqueDaniel/pybooru
12+
Issues = https://github.com/LuqueDaniel/pybooru/issues
13+
Changelog = https://github.com/LuqueDaniel/pybooru/blob/master/changelog.md
14+
keywords = Pybooru, moebooru, danbooru, API, client
15+
classifiers =
16+
Development Status :: 5 - Production/Stable
17+
Programming Language :: Python :: 3
18+
Programming Language :: Python :: 3.5
19+
Programming Language :: Python :: 3.6
20+
Programming Language :: Python :: 3.7
21+
Programming Language :: Python :: 3.8
22+
Programming Language :: Python :: 3.9
23+
Programming Language :: Python :: 3.10
24+
Intended Audience :: Developers
25+
License :: OSI Approved :: MIT License
26+
Topic :: Software Development :: Libraries :: Python Modules
27+
Topic :: Internet
28+
Topic :: Internet :: WWW/HTTP :: Site Management
29+
30+
platforms = any
31+
long_description = file: README.md
32+
long_description_content_type = text/markdown; charset=UTF-8
33+
license_files = LICENSE
34+
35+
[options]
36+
packages = pybooru
37+
install_requires =
38+
requests >= 2.26
39+
python_requires = >= 3.6
40+
include_package_data = True
41+
42+
[options.extras_require]
43+
docs =
44+
Sphinx
45+
sphinx-rtd-theme
46+
all =
47+
%(docs)s
48+
149
[bdist_wheel]
250
universal = 1

setup.py

Lines changed: 3 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,5 @@
1-
# -*- coding utf-8 -*-
21
# !/usr/bin/env python
2+
import setuptools
33

4-
# setuptools imports
5-
from setuptools import setup
6-
from setuptools import find_packages
7-
8-
# pybooru imports
9-
import pybooru
10-
11-
12-
# Read description file
13-
with open('README.md', 'r') as f:
14-
long_description = f.read()
15-
16-
17-
setup(
18-
name="Pybooru",
19-
version=pybooru.__version__,
20-
author=pybooru.__author__,
21-
description="Pybooru is a Python package to access to the API of Danbooru/Moebooru based sites.",
22-
long_description=long_description,
23-
long_description_content_type="text/markdown",
24-
author_email="danielluque14@gmail.com",
25-
url="https://github.com/LuqueDaniel/pybooru",
26-
license="MIT License",
27-
keywords="Pybooru moebooru danbooru API client",
28-
packages=find_packages(),
29-
platforms=['any'],
30-
install_requires=['requests'],
31-
include_package_data=True,
32-
data_file=[
33-
('', ['LICENSE', 'README.md', 'changelog.md', 'requirements.txt'])
34-
],
35-
classifiers=[
36-
"Development Status :: 5 - Production/Stable",
37-
"Programming Language :: Python",
38-
"Programming Language :: Python :: 2.7",
39-
"Programming Language :: Python :: 3",
40-
"Programming Language :: Python :: 3.5",
41-
"Programming Language :: Python :: 3.6",
42-
"Programming Language :: Python :: 3.7",
43-
"Programming Language :: Python :: 3.8",
44-
"Intended Audience :: Developers",
45-
"License :: OSI Approved :: MIT License",
46-
"Topic :: Documentation :: Sphinx",
47-
"Topic :: Software Development :: Libraries :: Python Modules",
48-
"Topic :: Internet"
49-
],
50-
)
4+
if __name__ == "__main__":
5+
setuptools.setup()

0 commit comments

Comments
 (0)