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

Hatchlinger Update #475

Merged
merged 8 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions dev_requirements/requirements-test_packaging.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# specific requirements for the tox test_packaging env
build
twine
# tools below for the actual packaging
setuptools
setuptools-scm

6 changes: 2 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
# This hack is necessary since RTD does not issue `sphinx-apidoc` before running
# `sphinx-build -b html . _build/html`. See Issue:
# https://github.com/rtfd/readthedocs.org/issues/1139
# DON'T FORGET: Check the box "Install your project inside a virtualenv using
# setup.py install" in the RTD Advanced Settings.
Comment on lines -34 to -35
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

irgendwie bin ich nicht überzeugt, dass wir das problem lösen, indem wir den "DON'T FORGET" hinweis, der auf das alte setuptools setup verweist einfach löschen. Oder hattest du mit @hf-aschloegl gesprochen oder das explizit getestet?

Falls du es getestet hast, wäre es gut, wenn du an die Stelle schreibst, was das neue Vorgehen ist oder zumindest explizit erwähnst, dass das Problem seit der hatchling umstellung nicht mehr besteht (sofern es eben getestet wurde).

# Additionally, it helps us to avoid running apidoc manually

try: # for Sphinx >= 1.7
Expand Down Expand Up @@ -104,9 +102,9 @@
# built documents.
#
# The short X.Y version.
version = "" # Is set by calling `setup.py docs`
version = ""
# The full version, including alpha/beta/rc tags.
release = "" # Is set by calling `setup.py docs`
release = ""

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
65 changes: 60 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,42 @@
[build-system]
requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4"]
build-backend = "setuptools.build_meta"
[project]
name = "ahbicht"
description = "Python Library to parse AHB expressions."
license = { text = "MIT" }
requires-python = ">=3.9"
authors = [{ name = "Annika Schlögl", email = "annika.schloegl@hochfrequenz.de" }]
keywords = ["AHB", "Parsing", "Expressions"]
classifiers = [
"Development Status :: 4 - Beta",
"Environment :: Console",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]

dependencies = [
"attrs>=21.4.0",
"lark>=1.1.4",
"inject",
"marshmallow",
"marshmallow_enum",
"maus>=0.6.0",
"pytz",
"efoli>=1.1.0"
] # add all the dependencies here
dynamic = ["readme", "version"]

[project.optional-dependencies]

[tool.setuptools_scm]
[project.urls]
Changelog = "https://github.com/Hochfrequenz/ahbicht/releases"
Homepage = "https://github.com/Hochfrequenz/ahbicht"
Documentation = "https://ahbicht.readthedocs.io/en/latest/"

[tool.black]
line-length = 120
Expand All @@ -25,4 +59,25 @@ markers = [
]

[tool.mypy]
# warn_unused_ignores = true # doesn't work,because either 'error: Cannot infer type argument 1 of "Tree" [misc]' but this is also flagged as unused ignore
# warn_unused_ignores = true # doesn't work,because either 'error: Cannot infer type argument 1 of "Tree" [misc]' but this is also flagged as unused ignore

[build-system]
requires = ["hatchling>=1.8.0", "hatch-vcs", "hatch-fancy-pypi-readme"]
build-backend = "hatchling.build"


[tool.hatch.metadata.hooks.fancy-pypi-readme]
content-type = "text/x-rst"
fragments = [{ path = "README.rst" }]

[tool.hatch.version]
source = "vcs"



[tool.hatch.build.targets.sdist]
exclude = ["/unittests"]

[tool.hatch.build.targets.wheel]
only-include = ["src"]
sources = ["src"]
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile requirements.in
Expand Down
48 changes: 0 additions & 48 deletions setup.cfg

This file was deleted.

3 changes: 0 additions & 3 deletions setup.py

This file was deleted.