From 8b62d3dc60572acabbe7cd46b0b6e1377bc64496 Mon Sep 17 00:00:00 2001 From: Evgeniy Blinov Date: Tue, 28 Nov 2023 19:23:44 +0300 Subject: [PATCH 1/6] pyproject.toml instead the setup.py --- .github/workflows/coverage.yml | 4 ++-- pyproject.toml | 32 +++++++++++++++++++++++++++++ setup.py | 37 ---------------------------------- 3 files changed, 34 insertions(+), 39 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.py diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 639e94e..8e9a5af 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -18,10 +18,10 @@ jobs: uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} - + - name: Install the library shell: bash - run: python setup.py install + run: pip install . - name: Install dependencies shell: bash diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..be7a455 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,32 @@ +[build-system] +requires = ['setuptools==68.0.0'] +build-backend = 'setuptools.build_meta' + +[project] +name = 'fazy' +version = '0.0.8' +authors = [ + { name='Evgeniy Blinov', email='zheni-b@yandex.ru' }, +] +description = 'Lazy f-strings for everyone' +readme = 'README.md' +requires-python = '>=3.7' +classifiers = [ + 'Operating System :: MacOS :: MacOS X', + 'Operating System :: Microsoft :: Windows', + 'Operating System :: POSIX', + 'Operating System :: POSIX :: Linux', + 'Programming Language :: Python', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'License :: OSI Approved :: MIT License', + 'Intended Audience :: Developers', + 'Topic :: Software Development :: Libraries', +] + +[project.urls] +'Source' = 'https://github.com/pomponchik/fazy' +'Tracker' = 'https://github.com/pomponchik/fazy/issues' diff --git a/setup.py b/setup.py deleted file mode 100644 index 28a67bb..0000000 --- a/setup.py +++ /dev/null @@ -1,37 +0,0 @@ -import sys -from setuptools import setup, find_packages - -with open('README.md', 'r', encoding='utf8') as readme_file: - readme = readme_file.read() - -requirements = [] -if sys.version_info < (3, 8): - requirements.append('typing-extensions==4.1.0') - -setup( - name='fazy', - version='0.0.8', - author='Evgeniy Blinov', - author_email='zheni-b@yandex.ru', - description='Lazy f-strings for everyone', - long_description=readme, - long_description_content_type='text/markdown', - url='https://github.com/pomponchik/fazy', - packages=find_packages(exclude=('tests',)), - install_requires=requirements, - classifiers=[ - 'Operating System :: MacOS :: MacOS X', - 'Operating System :: Microsoft :: Windows', - 'Operating System :: POSIX', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - 'License :: OSI Approved :: MIT License', - 'Intended Audience :: Developers', - 'Topic :: Software Development :: Libraries', - ], -) From da69944eb2e97bd76a6828be2d36c6c3dcd61545 Mon Sep 17 00:00:00 2001 From: Evgeniy Blinov Date: Tue, 28 Nov 2023 19:25:36 +0300 Subject: [PATCH 2/6] + python 3/12 --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 8e9a5af..e62c2d8 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [macos-latest, ubuntu-latest, windows-latest] - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v2 From 43224c57d54f3b1f6c033923a885ff83990563e2 Mon Sep 17 00:00:00 2001 From: Evgeniy Blinov Date: Tue, 28 Nov 2023 19:30:45 +0300 Subject: [PATCH 3/6] added the build library --- requirements_dev.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements_dev.txt b/requirements_dev.txt index 7f71ff4..abe3089 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -2,5 +2,6 @@ pytest==7.2.2 coverage==7.2.2 wheel==0.40.0 twine==4.0.2 +build==0.9.0 ruff==0.0.290 mypy==1.4.1 From 1564f26f30352ef97bb2f16a52aac14b1cb63da2 Mon Sep 17 00:00:00 2001 From: Evgeniy Blinov Date: Wed, 29 Nov 2023 13:20:24 +0300 Subject: [PATCH 4/6] no extra dockerfile --- Dockerfile | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 2751c5f..0000000 --- a/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM python:3.7 - -# working directory -WORKDIR /usr/src/app - -# copy requirement file to working directory -COPY . . - -RUN pip install --no-cache-dir -r requirements_dev.txt From 7c2e709aa4ebb339d2a540247bd0e2fd684897c2 Mon Sep 17 00:00:00 2001 From: Evgeniy Blinov Date: Wed, 29 Nov 2023 13:28:17 +0300 Subject: [PATCH 5/6] new version tag --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index be7a455..e30c728 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta' [project] name = 'fazy' -version = '0.0.8' +version = '0.0.9' authors = [ { name='Evgeniy Blinov', email='zheni-b@yandex.ru' }, ] From aac8ea01bbd2d5a1cc869eb9e1b93691829dadad Mon Sep 17 00:00:00 2001 From: Evgeniy Blinov Date: Wed, 29 Nov 2023 13:28:39 +0300 Subject: [PATCH 6/6] new classifier --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index e30c728..170be77 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,6 +22,7 @@ classifiers = [ 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'License :: OSI Approved :: MIT License', 'Intended Audience :: Developers', 'Topic :: Software Development :: Libraries',