-
Notifications
You must be signed in to change notification settings - Fork 43
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
feat: migrate from setup.py/setuptools to pyproject.toml/hatch #99
base: release
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,10 +18,8 @@ jobs: | |
uses: actions/setup-python@v5 | ||
with: | ||
python-version: ${{ matrix.python-version }} | ||
- name: Upgrade pip | ||
run: python -m pip install --upgrade pip setuptools | ||
- name: Install dependencies | ||
run: | | ||
run: pip install pylint black | | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Previously, we had a dev environment, which installed tutor[dev] (and that, handled these dependencies). Why we're not including that in our pyproject.toml? |
||
pip install .[dev] | ||
- name: Test lint, types, and format | ||
run: make test |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
# https://hatch.pypa.io/latest/how-to/config/dynamic-metadata/ | ||
import os | ||
import typing as t | ||
|
||
from hatchling.metadata.plugin.interface import MetadataHookInterface | ||
|
||
HERE = os.path.dirname(__file__) | ||
|
||
|
||
class MetaDataHook(MetadataHookInterface): | ||
def update(self, metadata: dict[str, t.Any]) -> None: | ||
about = load_about() | ||
metadata["version"] = about["__version__"] | ||
|
||
|
||
def load_about() -> dict[str, str]: | ||
about: dict[str, str] = {} | ||
with open( | ||
os.path.join(HERE, "tutordiscovery", "__about__.py"), "rt", encoding="utf-8" | ||
) as f: | ||
exec(f.read(), about) # pylint: disable=exec-used | ||
return about |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
- [Improvement] Migrate packaging from setup.py/setuptools to pyproject.toml/hatch. (by @Faraz32123) | ||
- For more details view tutor core PR: https://github.com/overhangio/tutor/pull/1163 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,60 @@ | ||
# https://packaging.python.org/en/latest/tutorials/packaging-projects/ | ||
# https://hatch.pypa.io/latest/config/build/ | ||
|
||
[project] | ||
name = "tutor-discovery" | ||
license = {file = "LICENSE.txt"} | ||
authors = [ | ||
{name = "Edly", email = "[email protected]"}, | ||
] | ||
maintainers = [ | ||
{name = "Muhammad Faraz Maqsood", email = "[email protected]"} | ||
] | ||
description="A Tutor plugin for course discovery, the Open edX service for providing access to consolidated course and program metadata" | ||
readme = {file = "README.rst", content-type = "text/x-rst"} | ||
requires-python = ">= 3.9" | ||
classifiers = [ | ||
"Development Status :: 5 - Production/Stable", | ||
"Intended Audience :: Developers", | ||
"License :: OSI Approved :: GNU Affero General Public License v3", | ||
"Operating System :: OS Independent", | ||
"Programming Language :: Python", | ||
"Programming Language :: Python :: 3.9", | ||
"Programming Language :: Python :: 3.10", | ||
"Programming Language :: Python :: 3.11", | ||
"Programming Language :: Python :: 3.12", | ||
] | ||
dependencies = [ | ||
"tutor>=19.0.0,<20.0.0", | ||
] | ||
# these fields will be set by hatch_build.py | ||
dynamic = ["version"] | ||
|
||
# https://packaging.python.org/en/latest/specifications/well-known-project-urls/#well-known-labels | ||
[project.urls] | ||
Homepage = "https://docs.tutor.edly.io/" | ||
Documentation = "https://docs.tutor.edly.io/" | ||
Source = "https://github.com/overhangio/tutor-discovery" | ||
Issues = "https://github.com/overhangio/tutor-discovery/issues" | ||
Changelog = "https://github.com/overhangio/tutor-discovery/blob/release/CHANGELOG.md" | ||
Community = "https://discuss.openedx.org/tag/tutor" | ||
|
||
# hatch-specific configuration | ||
[tool.hatch.metadata.hooks.custom] | ||
path = ".hatch_build.py" | ||
|
||
[build-system] | ||
requires = ["setuptools", "wheel"] | ||
requires = ["hatchling"] | ||
build-backend = "hatchling.build" | ||
|
||
[tool.hatch.build.targets.sdist] | ||
# Disable strict naming, otherwise twine is not able to detect name/version | ||
strict-naming = false | ||
include = [ "/tutordiscovery"] | ||
exclude = ["tests*"] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What's the difference in egg_file now that we are only excluding tests*? The MANIFEST.in included only certain files. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I have now added include statement! may be we can restrict it to only templates and patches folder also! |
||
|
||
[tool.hatch.build.targets.wheel] | ||
packages = ["tutordiscovery"] | ||
|
||
[project.entry-points."tutor.plugin.v1"] | ||
discovery = "tutordiscovery.plugin" |
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we not keep pip in here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's just extra, as we are only upgrading pip, it's pre-compiled version is sufficient I think.
Plus, it's synchronized with the tutor core PR here.