Skip to content

Commit 9ef16ae

Browse files
committed
Moved the metadata from setup.py into pyproject.toml.
Moved all the "requirements*.txt" into `pyproject.toml` under extras.
1 parent 6c481d9 commit 9ef16ae

File tree

5 files changed

+63
-69
lines changed

5 files changed

+63
-69
lines changed

pyproject.toml

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,64 @@
11
[build-system]
2-
requires = ["setuptools", "wheel"]
2+
requires = ["setuptools>=61.2"]
33
build-backend = "setuptools.build_meta"
4+
5+
[project]
6+
name = "PGPy"
7+
version = "0.6.0-dev"
8+
authors = [{name = "Michael Greene", email = "mgreene@securityinnovation.com"}]
9+
maintainers = [{name = "Security Innovation", email = "opensource@securityinnovation.com"}]
10+
license = {text = "BSD-3-Clause"}
11+
description = "Pretty Good Privacy for Python"
12+
readme = "README.rst"
13+
keywords = ["OpenPGP", "PGP", "Pretty Good Privacy", "GPG", "GnuPG", "openpgp", "pgp", "gnupg", "gpg", "encryption", "signature"]
14+
classifiers = [
15+
"Development Status :: 4 - Beta",
16+
"Operating System :: POSIX :: Linux",
17+
"Operating System :: MacOS :: MacOS X",
18+
"Operating System :: Microsoft :: Windows",
19+
"Intended Audience :: Developers",
20+
"Programming Language :: Python",
21+
"Programming Language :: Python :: 3",
22+
"Programming Language :: Python :: 3 :: Only",
23+
"Programming Language :: Python :: 3.9",
24+
"Programming Language :: Python :: 3.8",
25+
"Programming Language :: Python :: 3.7",
26+
"Programming Language :: Python :: 3.6",
27+
"Programming Language :: Python :: 3.5",
28+
"Programming Language :: Python :: Implementation :: CPython",
29+
"Topic :: Security",
30+
"Topic :: Security :: Cryptography",
31+
"Topic :: Software Development :: Libraries",
32+
"Topic :: Software Development :: Libraries :: Python Modules",
33+
"License :: OSI Approved :: BSD License",
34+
]
35+
requires-python = ">=3.5"
36+
dependencies = [
37+
"cryptography>=2.6,<38", # TODO: fix support for cryptography >= 38.0.0 (https://github.com/SecurityInnovation/PGPy/issues/402)
38+
"pyasn1",
39+
"six>=1.9.0",
40+
]
41+
42+
[project.optional-dependencies]
43+
docs-build = ["sphinx", "sphinx-better-theme"]
44+
test = [
45+
"pytest",
46+
"pytest-cov",
47+
"pytest-order @ git+https://github.com/SecurityInnovation/pytest-order.git@07ceb36233fb083275f34d5c8abbd3e35cd00158#egg=pytest-order", # We need a patched version of pytest-order to run on 3.5 and handle parameterized tests,
48+
"flake8",
49+
"pep8-naming",
50+
# "gpg", # is not here on purpose currently
51+
]
52+
53+
[project.urls]
54+
Homepage = "https://github.com/SecurityInnovation/PGPy"
55+
Documentation = "https://pgpy.readthedocs.io/en/latest/"
56+
"Bug Tracker" = "https://github.com/SecurityInnovation/PGPy/issues"
57+
58+
[tool.setuptools]
59+
zip-safe = true
60+
include-package-data = false
61+
62+
[tool.setuptools.packages.find]
63+
include = ["pgpy", "pgpy.*"]
64+

requirements-rtd.txt

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

requirements-test.txt

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

requirements.txt

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

setup.cfg

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,4 @@
1-
[metadata]
2-
name = PGPy
3-
version = 0.6.0-dev
4-
author = Michael Greene
5-
author_email = mgreene@securityinnovation.com
6-
maintainer = Security Innovation
7-
maintainer_email = opensource@securityinnovation.com
8-
license = BSD-3-Clause
9-
description = Pretty Good Privacy for Python
10-
keywords = OpenPGP, PGP, Pretty Good Privacy, GPG, GnuPG, openpgp, pgp, gnupg, gpg, encryption, signature
11-
url = https://github.com/SecurityInnovation/PGPy
12-
project_urls =
13-
Documentation = https://pgpy.readthedocs.io/en/latest/
14-
Bug Tracker = https://github.com/SecurityInnovation/PGPy/issues
15-
long_description = file: README.rst
16-
long_description_content_type = text/x-rst
17-
classifiers =
18-
Development Status :: 4 - Beta
19-
Operating System :: POSIX :: Linux
20-
Operating System :: MacOS :: MacOS X
21-
Operating System :: Microsoft :: Windows
22-
Intended Audience :: Developers
23-
Programming Language :: Python
24-
Programming Language :: Python :: 3
25-
Programming Language :: Python :: 3 :: Only
26-
Programming Language :: Python :: 3.9
27-
Programming Language :: Python :: 3.8
28-
Programming Language :: Python :: 3.7
29-
Programming Language :: Python :: 3.6
30-
Programming Language :: Python :: 3.5
31-
Programming Language :: Python :: Implementation :: CPython
32-
Topic :: Security
33-
Topic :: Security :: Cryptography
34-
Topic :: Software Development :: Libraries
35-
Topic :: Software Development :: Libraries :: Python Modules
36-
License :: OSI Approved :: BSD License
37-
38-
[options]
39-
packages =
40-
pgpy
41-
pgpy.packet
42-
pgpy.packet.subpackets
43-
# TODO: fix support for cryptography >= 38.0.0 (https://github.com/SecurityInnovation/PGPy/issues/402)
44-
install_requires =
45-
cryptography>=2.6,<38
46-
pyasn1
47-
six>=1.9.0
48-
python_requires = >=3.5
49-
50-
# doc_requires =
51-
# sphinx
52-
# sphinx-better-theme
53-
54-
1+
# https://github.com/sphinx-doc/sphinx/issues/9473
552
[build_sphinx]
563
source-dir = docs/source
574
build-dir = docs/build

0 commit comments

Comments
 (0)