diff --git a/.gitea/workflows/package.yml b/.gitea/workflows/package.yml index 45191a6..90771b9 100644 --- a/.gitea/workflows/package.yml +++ b/.gitea/workflows/package.yml @@ -3,9 +3,12 @@ on: [push] jobs: Test: - uses: jmaa/workflows/.gitea/workflows/python-test.yaml@v6.20 + uses: jmaa/workflows/.gitea/workflows/python-test.yaml@v6.21 Package: - uses: jmaa/workflows/.gitea/workflows/python-package.yaml@v6.20 + uses: jmaa/workflows/.gitea/workflows/python-package.yaml@v6.21 + with: + REGISTRY_DOMAIN: gitfub.space + REGISTRY_ORGANIZATION: Jmaa secrets: PIPY_REPO_USER: ${{ secrets.PIPY_REPO_USER }} PIPY_REPO_PASS: ${{ secrets.PIPY_REPO_PASS }} diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index a72a851..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -enforce_typing -frozendict diff --git a/requirements_test.txt b/requirements_test.txt deleted file mode 100644 index e079f8a..0000000 --- a/requirements_test.txt +++ /dev/null @@ -1 +0,0 @@ -pytest diff --git a/setup.py b/setup.py index 5e057ac..e12c1d3 100644 --- a/setup.py +++ b/setup.py @@ -1,49 +1,62 @@ #!/usr/bin/env python import re +import pathlib from setuptools import setup -PACKAGE_NAME = 'pbcabi' +PACKAGE_NAME = "pbcabi" -with open('README.md') as f: +with open("README.md") as f: readme = f.read() -with open(PACKAGE_NAME + '/_version.py') as f: +with open(PACKAGE_NAME + "/_version.py") as f: text = f.read() match = re.match(r'^__version__\s*=\s*(["\'])([\d\.]+)\1$', text) version = match.group(2) del match, text -def read_requirements(path: str = 'requirements.txt'): +def parse_requirements(text: str) -> list[str]: + return text.strip().split("\n") + + +def read_requirements(path: str): with open(path) as f: - return f.read().strip().split('\n') + return parse_requirements(f.read()) def get_short_description(readme: str): - readme = re.sub(r'#+[^\n]*\n+', '', readme) - m = re.search(r'^\s*(\w+[\w\s,`]+\.)', readme) + readme = re.sub(r"#+[^\n]*\n+", "", readme) + m = re.search(r"^\s*(\w+[\w\s,`]+\.)", readme) try: return m.group(1) except AttributeError as err: - msg = 'Could not determine short description' + msg = "Could not determine short description" raise Exception(msg) from err +REQUIREMENTS_MAIN = """ +enforce_typing +frozendict +""" + +REQUIREMENTS_TEST = """ +pytest +""" + setup( name=PACKAGE_NAME, version=version, description=get_short_description(readme), long_description=readme, - long_description_content_type='text/markdown', - author='Jmaa', - author_email='jonjmaa@gmail.com', - url='https://gitfub.space/Jmaa/' + PACKAGE_NAME, + long_description_content_type="text/markdown", + author="Jmaa", + author_email="jonjmaa@gmail.com", + url="https://gitfub.space/Jmaa/" + PACKAGE_NAME, packages=[PACKAGE_NAME], - install_requires=read_requirements(), + install_requires=parse_requirements(REQUIREMENTS_MAIN), extras_require={ - 'test': read_requirements('requirements_test.txt'), + "test": parse_requirements(REQUIREMENTS_TEST), }, - license="MIT", python_requires=">=3.9", )