diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index fe67b2c..668784c 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -24,13 +24,15 @@ jobs: python-version: 3.11 - name: Install twine - run: pip install twine + run: pip install twine bui - name: install setuptools run: pip install setuptools - name: Build the package - run: python setup.py sdist + run: python -m build - name: Publish the package run: twine upload --skip-existing --repository-url https://upload.pypi.org/legacy/ -u __token__ -p ${{ secrets.PYPI_TOKEN }} ${{ github.workspace }}/dist/* + + diff --git a/pyproject.toml b/pyproject.toml index 0d6abd3..ac94db6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,13 +1,25 @@ [build-system] -requires = ["setuptools", "wheel"] +requires = ["setuptools>=61.0", "wheel"] + + + +build-backend = "setuptools.build_meta" + +[tool.setuptools] +packages = ["find_and_replace"] [project] name = "find-and-replace-strings" -version = "1.0.2" +version = "1.0.3" description = "Python package and pre-commit-hook for finding and replacing string(s) in file(s)." license = { text = "GPLv3" } authors = [{name = "OpenCEPK Open Cloud Engineering Platform Kit", email = "opencepk@gmail.com"}] -requires-python = ">=3.7" +dependencies = [ + 'tomli; python_version < "3.11"', +] +requires-python = ">=3.9" + + classifiers = [ "Programming Language :: Python", "Programming Language :: Python :: 3", @@ -36,5 +48,10 @@ keywords = ["find", "replace", "string", "file", "pre-commit", "hook", "git", "t [project.scripts] +<<<<<<< HEAD find-and-replace-strings = "find_and_replace.main:main" +======= +find-and-replace-strings = "find_and_replace.__main__:main" + +>>>>>>> test diff --git a/setup.py b/setup.py index e63c73a..30a40ea 100644 --- a/setup.py +++ b/setup.py @@ -1,16 +1,16 @@ from setuptools import setup, find_packages setup( - name="find-and-replace-strings", - version="1.0.0", - description="Python package and pre-commit-hook for finding and replacing string(s) in file(s).", - author="OpenCEPK Open Cloud Engineering Platform Kit", - author_email="opencepk@gmail.com", - python_requires=">=3.7", - packages=find_packages(include=["find_and_replace", "find_and_replace.*"]), - entry_points={ - "console_scripts": [ - "find-and-replace-strings=find_and_replace.main:main", - ], - }, + # name="find-and-replace-strings", + # version="1.0.0", + # description="Python package and pre-commit-hook for finding and replacing string(s) in file(s).", + # author="OpenCEPK Open Cloud Engineering Platform Kit", + # author_email="opencepk@gmail.com", + # python_requires=">=3.7", + # packages=find_packages(include=["find_and_replace", "find_and_replace.*"]), + # entry_points={ + # "console_scripts": [ + # "find-and-replace-strings=find_and_replace.main:main", + # ], + # }, ) \ No newline at end of file