From e5336a446a245b9a9830440c358bf01b88b6b494 Mon Sep 17 00:00:00 2001 From: Jonas Eschle Date: Mon, 7 Apr 2025 17:05:51 +0200 Subject: [PATCH 1/4] Update pyproject.toml and tests.yml config --- .github/workflows/tests.yml | 4 ++++ pyproject.toml | 35 +++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d98c199..4ece6e5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,6 +1,10 @@ name: Tests and Codecov on: push: + branches: + - master + - main + - "release/*" pull_request: workflow_dispatch: diff --git a/pyproject.toml b/pyproject.toml index 5944f4b..1de2290 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,11 +1,11 @@ -[tool.poetry] +[project] name = "pipreqs" version = "0.5.0" description = "Pip requirements.txt generator based on imports in project" authors = ["Vadim Kravcenko "] license = "Apache-2.0" readme = ["README.rst", "HISTORY.rst"] -packages = [{include = "pipreqs"}] +packages = [{ include = "pipreqs" }] repository = "https://github.com/bndr/pipreqs" keywords = ["pip", "requirements", "imports"] classifiers = [ @@ -21,22 +21,25 @@ classifiers = [ "Programming Language :: Python :: 3.12" ] +dependencies = [ + "python>=3.8.1,<3.13", + "yarg>=0.1.9", + "docopt>=0.6.2", + "nbconvert>=7.11.0", + "ipython>=8.12.3", +] +[project.optional-dependencies] +dev = [ + "flake8>=6.1.0", + "tox>=4.11.3", + "coverage>=7.3.2", + "sphinx>=7.2.6;python_version>=3.9", +] + + [tool.poetry.scripts] pipreqs = "pipreqs.pipreqs:main" -[tool.poetry.dependencies] -python = ">=3.8.1,<3.13" -yarg = "0.1.9" -docopt = "0.6.2" -nbconvert = "^7.11.0" -ipython = "8.12.3" - -[tool.poetry.group.dev.dependencies] -flake8 = "^6.1.0" -tox = "^4.11.3" -coverage = "^7.3.2" -sphinx = { version = "^7.2.6", python = ">=3.9" } - [build-system] -requires = ["poetry-core"] +requires = ["poetry-core>=2.0.0,<3.0.0"] build-backend = "poetry.core.masonry.api" From 9eedfb39db8dd0db11a337401b6a32b18ea6ff1c Mon Sep 17 00:00:00 2001 From: Jonas Eschle Date: Mon, 7 Apr 2025 17:18:54 +0200 Subject: [PATCH 2/4] Upgrade dependencies in pyproject.toml and tests.yml --- .github/workflows/tests.yml | 8 ++++---- pyproject.toml | 14 +++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4ece6e5..56a398d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,10 +18,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install dependencies run: | @@ -53,7 +53,7 @@ jobs: run: poetry run coverage xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v5 with: files: coverage.xml fail_ci_if_error: true diff --git a/pyproject.toml b/pyproject.toml index 1de2290..9dcd357 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,9 +2,14 @@ name = "pipreqs" version = "0.5.0" description = "Pip requirements.txt generator based on imports in project" -authors = ["Vadim Kravcenko "] +authors = [ + { name = "Vadim Kravcenko", email = "vadim.kravcenko@gmail.com" } +] +maintainers = [ + {name = "Jonas Eschle", email = "jonas.eschle@gmail.com"} +] license = "Apache-2.0" -readme = ["README.rst", "HISTORY.rst"] +readme = "README.rst" packages = [{ include = "pipreqs" }] repository = "https://github.com/bndr/pipreqs" keywords = ["pip", "requirements", "imports"] @@ -20,9 +25,8 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12" ] - +requires-python = ">=3.8, <3.13" dependencies = [ - "python>=3.8.1,<3.13", "yarg>=0.1.9", "docopt>=0.6.2", "nbconvert>=7.11.0", @@ -33,7 +37,7 @@ dev = [ "flake8>=6.1.0", "tox>=4.11.3", "coverage>=7.3.2", - "sphinx>=7.2.6;python_version>=3.9", + "sphinx>=7.2.6;python_version>='3.9'", ] From ebfa1f4832a632a5079b6c8f2c88958f1520686d Mon Sep 17 00:00:00 2001 From: Jonas Eschle Date: Mon, 7 Apr 2025 17:19:23 +0200 Subject: [PATCH 3/4] Upgrade dependencies in pyproject.toml and tests.yml --- .github/workflows/flake8.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 819104d..a934906 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -8,9 +8,9 @@ jobs: name: Lint steps: - name: Check out source repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Python environment - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: "3.9" - name: flake8 Lint From d6725caee61451c6e45bee9cacf3a90ceff86c92 Mon Sep 17 00:00:00 2001 From: Jonas Eschle Date: Mon, 7 Apr 2025 17:25:37 +0200 Subject: [PATCH 4/4] upgrade Python version --- .github/workflows/tests.yml | 2 +- pyproject.toml | 6 +++--- tox.ini | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 56a398d..ddda541 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.9-7.3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.9-7.3.13'] steps: - name: Checkout repository diff --git a/pyproject.toml b/pyproject.toml index 9dcd357..d0772f4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,13 +19,13 @@ classifiers = [ "License :: OSI Approved :: Apache Software License", "Natural Language :: English", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12" + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", ] -requires-python = ">=3.8, <3.13" +requires-python = ">=3.9, <3.14" dependencies = [ "yarg>=0.1.9", "docopt>=0.6.2", diff --git a/tox.ini b/tox.ini index 13f090e..6b4c648 100644 --- a/tox.ini +++ b/tox.ini @@ -1,20 +1,20 @@ [tox] isolated_build = true -envlist = py38, py39, py310, py311, py312, pypy3, flake8 +envlist = py39, py310, py311, py312, py313, pypy3, flake8 [gh-actions] python = - 3.8: py38 3.9: py39 3.10: py310 3.11: py311 3.12: py312 - pypy-3.9-7.3.12: pypy3 + 3.13: py313 + pypy-3.9-7.3.13: pypy3 [testenv] setenv = PYTHONPATH = {toxinidir}:{toxinidir}/pipreqs -commands = +commands = python -m unittest discover [testenv:flake8] @@ -28,4 +28,4 @@ exclude = tests/_data_duplicated_deps/ tests/_data_ignore/ tests/_invalid_data/ -max-line-length = 120 \ No newline at end of file +max-line-length = 120