Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganise the project layout and version management #626

Merged
merged 3 commits into from Dec 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Expand Up @@ -39,7 +39,7 @@ jobs:
# Linting verifies that the project is in an acceptable state to create files
# for releasing.
# And this action should be run whenever a release is ready to go public as
# the version number will be changed by editing __about__.py.
# the version number will be changed by editing __init__.py.
needs: lint

steps:
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Expand Up @@ -8,7 +8,7 @@

ABOUT = {}
_BASE_DIR = os.path.join(os.path.dirname(__file__), os.pardir)
with open(os.path.join(_BASE_DIR, "packaging", "__about__.py")) as f:
with open(os.path.join(_BASE_DIR, "src", "packaging", "__init__.py")) as f:
exec(f.read(), ABOUT)

# -- General configuration ----------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions noxfile.py
Expand Up @@ -35,7 +35,7 @@ def coverage(*args):
coverage(
"run",
"--source",
"packaging/",
"packaging",
"-m",
"pytest",
"--strict-markers",
Expand Down Expand Up @@ -95,7 +95,7 @@ def docs(session):
@nox.session
def release(session):
package_name = "packaging"
version_file = Path(f"{package_name}/__about__.py")
version_file = Path(f"src/{package_name}/__init__.py")
changelog_file = Path("CHANGELOG.rst")

try:
Expand Down
25 changes: 0 additions & 25 deletions packaging/__init__.py

This file was deleted.

2 changes: 1 addition & 1 deletion pyproject.toml
Expand Up @@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
[project]
name = "packaging"
description = "Core utilities for Python packages"
version = "22.0"
dynamic = ["version"]
readme = "README.rst"
requires-python = ">=3.7"
authors = [{name = "Donald Stufft", email = "donald@stufft.io"}]
Expand Down
11 changes: 0 additions & 11 deletions packaging/__about__.py → src/packaging/__init__.py
Expand Up @@ -2,17 +2,6 @@
# 2.0, and the BSD License. See the LICENSE file in the root of this repository
# for complete details.

__all__ = [
"__title__",
"__summary__",
"__uri__",
"__version__",
"__author__",
"__email__",
"__license__",
"__copyright__",
]

__title__ = "packaging"
__summary__ = "Core utilities for Python packages"
__uri__ = "https://github.com/pypa/packaging"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.