Compare commits

..

No commits in common. "master" and "v0.5.0" have entirely different histories.

12 changed files with 729 additions and 1105 deletions

View File

@ -1,32 +1,18 @@
name: flake8 name: flake8
concurrency: on: pull_request
group: ${{ github.ref }}
cancel-in-progress: true
on:
workflow_dispatch:
push:
tags:
- "*"
branches:
- main
- master
- develop
- "release/*"
pull_request:
jobs: jobs:
flake8-lint: flake8-lint:
runs-on: ubuntu-24.04 runs-on: ubuntu-latest
name: Lint name: Lint
steps: steps:
- name: Check out source repository - name: Check out source repository
uses: actions/checkout@v4 uses: actions/checkout@v2
- name: Set up Python environment - name: Set up Python environment
uses: actions/setup-python@v5 uses: actions/setup-python@v2
with: with:
python-version: "3.13" python-version: "3.9"
- name: flake8 Lint - name: flake8 Lint
uses: reviewdog/action-flake8@v3 uses: reviewdog/action-flake8@v3
with: with:

View File

@ -1,55 +1,46 @@
name: Tests and Codecov name: Tests and Codecov
on: on:
push: push:
branches:
- master
- main
- "release/*"
pull_request: pull_request:
workflow_dispatch: workflow_dispatch:
jobs: jobs:
run_tests: run_tests:
runs-on: ubuntu-24.04 runs-on: ubuntu-latest
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.10'] python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.9-7.3.12']
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }} - name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5 uses: actions/setup-python@v4
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install uv python -m pip install --upgrade pip
uv pip install --system tox tox-gh-actions pip install tox tox-gh-actions
- name: Test with tox - name: Test with tox
run: tox run: tox
coverage_report: coverage_report:
needs: run_tests needs: run_tests
runs-on: ubuntu-24.04 runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: Set up Python 3.13
uses: actions/setup-python@v5
with:
python-version: 3.13
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install uv python -m pip install --upgrade pip
uv pip install --system poetry pip install poetry
uv pip install --system .[dev] poetry install --with dev
- name: Calculate coverage - name: Calculate coverage
run: poetry run coverage run --source=pipreqs -m unittest discover run: poetry run coverage run --source=pipreqs -m unittest discover
@ -58,8 +49,7 @@ jobs:
run: poetry run coverage xml run: poetry run coverage xml
- name: Upload coverage to Codecov - name: Upload coverage to Codecov
uses: codecov/codecov-action@v5 uses: codecov/codecov-action@v3
with: with:
files: coverage.xml files: coverage.xml
token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: true
fail_ci_if_error: false

View File

@ -1,96 +0,0 @@
ci:
autoupdate_commit_msg: "chore: update pre-commit hooks"
autofix_commit_msg: "style: pre-commit fixes"
autoupdate_schedule: quarterly
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: check-added-large-files
args: [ '--maxkb=1000' ]
- id: check-case-conflict
- id: check-merge-conflict
- id: check-symlinks
- id: check-yaml
- id: check-toml
- id: check-json
- id: debug-statements
- id: end-of-file-fixer
- id: mixed-line-ending
- id: requirements-txt-fixer
- id: trailing-whitespace
files: ".*\\.(?:tex|py)$"
args: [ --markdown-linebreak-ext=md ]
exclude: (^notebooks/|^tests/truth/)
- id: detect-private-key
- id: fix-byte-order-marker
- id: check-ast
- id: check-docstring-first
- id: debug-statements
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.10.0
hooks:
- id: python-use-type-annotations
- id: python-check-mock-methods
- id: python-no-eval
- id: rst-backticks
- id: rst-directive-colons
- repo: https://github.com/asottile/pyupgrade
rev: v3.3.1
hooks:
- id: pyupgrade
args: [ --py38-plus ]
# Notebook formatting
- repo: https://github.com/nbQA-dev/nbQA
rev: 1.9.1
hooks:
- id: nbqa-isort
additional_dependencies: [ isort ]
- id: nbqa-pyupgrade
additional_dependencies: [ pyupgrade ]
args: [ --py38-plus ]
- repo: https://github.com/kynan/nbstripout
rev: 0.8.1
hooks:
- id: nbstripout
- repo: https://github.com/sondrelg/pep585-upgrade
rev: 'v1.0'
hooks:
- id: upgrade-type-hints
args: [ '--futures=true' ]
- repo: https://github.com/MarcoGorelli/auto-walrus
rev: 0.3.4
hooks:
- id: auto-walrus
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.30.0
hooks:
- id: check-github-workflows
- id: check-github-actions
- id: check-dependabot
- id: check-readthedocs
- repo: https://github.com/dannysepler/rm_unneeded_f_str
rev: v0.2.0
hooks:
- id: rm-unneeded-f-str
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.8.6"
hooks:
- id: ruff
types_or: [ python, pyi, jupyter ]
args: [ --fix, --show-fixes , --line-length=120 ] # --unsafe-fixes,
# Run the formatter.
- id: ruff-format
types_or: [ python, pyi, jupyter ]

View File

@ -1,4 +1,3 @@
3.13
3.12 3.12
3.11 3.11
3.10 3.10

View File

@ -1 +1 @@
python 3.13 3.12 3.11 3.10 3.9 3.8 pypy3.9-7.3.12 python 3.12 3.11 3.10 3.9 3.8 pypy3.9-7.3.12

View File

@ -2,8 +2,8 @@
``pipreqs`` - Generate requirements.txt file for any project based on imports ``pipreqs`` - Generate requirements.txt file for any project based on imports
============================================================================= =============================================================================
.. image:: https://github.com/bndr/pipreqs/actions/workflows/tests.yml/badge.svg .. image:: https://img.shields.io/travis/bndr/pipreqs.svg
:target: https://github.com/bndr/pipreqs/actions/workflows/tests.yml :target: https://travis-ci.org/bndr/pipreqs
.. image:: https://img.shields.io/pypi/v/pipreqs.svg .. image:: https://img.shields.io/pypi/v/pipreqs.svg
@ -55,7 +55,6 @@ Usage
--debug Print debug information --debug Print debug information
--ignore <dirs>... Ignore extra directories, each separated by a comma --ignore <dirs>... Ignore extra directories, each separated by a comma
--no-follow-links Do not follow symbolic links in the project --no-follow-links Do not follow symbolic links in the project
--ignore-errors Ignore errors while scanning files
--encoding <charset> Use encoding parameter for file open --encoding <charset> Use encoding parameter for file open
--savepath <file> Save the list of requirements in the given file --savepath <file> Save the list of requirements in the given file
--print Output the list of requirements in the standard output --print Output the list of requirements in the standard output

View File

@ -36,7 +36,6 @@ Pyxides:astro_pyxis
QtCore:PySide QtCore:PySide
S3:s3cmd S3:s3cmd
SCons:pystick SCons:pystick
speech_recognition:SpeechRecognition
Shared:Zope2 Shared:Zope2
Signals:Zope2 Signals:Zope2
Stemmer:PyStemmer Stemmer:PyStemmer
@ -583,7 +582,6 @@ ctff:tff
cups:pycups cups:pycups
curator:elasticsearch_curator curator:elasticsearch_curator
curl:pycurl curl:pycurl
cv2:opencv-python
daemon:python_daemon daemon:python_daemon
dare:DARE dare:DARE
dateutil:python_dateutil dateutil:python_dateutil
@ -722,7 +720,6 @@ jaraco:jaraco.util
jinja2:Jinja2 jinja2:Jinja2
jiracli:jira_cli jiracli:jira_cli
johnny:johnny_cache johnny:johnny_cache
jose:python_jose
jpgrid:python_geohash jpgrid:python_geohash
jpiarea:python_geohash jpiarea:python_geohash
jpype:JPype1 jpype:JPype1
@ -978,7 +975,6 @@ pysynth_samp:PySynth
pythongettext:python_gettext pythongettext:python_gettext
pythonjsonlogger:python_json_logger pythonjsonlogger:python_json_logger
pyutilib:PyUtilib pyutilib:PyUtilib
pywintypes:pywin32
pyximport:Cython pyximport:Cython
qs:qserve qs:qserve
quadtree:python_geohash quadtree:python_geohash

View File

@ -20,7 +20,6 @@ Options:
$ export HTTPS_PROXY="https://10.10.1.10:1080" $ export HTTPS_PROXY="https://10.10.1.10:1080"
--debug Print debug information --debug Print debug information
--ignore <dirs>... Ignore extra directories, each separated by a comma --ignore <dirs>... Ignore extra directories, each separated by a comma
--ignore-errors Ignore errors while scanning files
--no-follow-links Do not follow symbolic links in the project --no-follow-links Do not follow symbolic links in the project
--encoding <charset> Use encoding parameter for file open --encoding <charset> Use encoding parameter for file open
--savepath <file> Save the list of requirements in the given file --savepath <file> Save the list of requirements in the given file
@ -32,7 +31,7 @@ Options:
--clean <file> Clean up requirements.txt by removing modules --clean <file> Clean up requirements.txt by removing modules
that are not imported in project that are not imported in project
--mode <scheme> Enables dynamic versioning with <compat>, --mode <scheme> Enables dynamic versioning with <compat>,
<gt> or <no-pin> schemes. <gt> or <non-pin> schemes.
<compat> | e.g. Flask~=1.1.2 <compat> | e.g. Flask~=1.1.2
<gt> | e.g. Flask>=1.1.2 <gt> | e.g. Flask>=1.1.2
<no-pin> | e.g. Flask <no-pin> | e.g. Flask
@ -98,10 +97,11 @@ def _open(filename=None, mode="r"):
file.close() file.close()
def get_all_imports(path, encoding="utf-8", extra_ignore_dirs=None, follow_links=True, ignore_errors=False): def get_all_imports(path, encoding="utf-8", extra_ignore_dirs=None, follow_links=True):
imports = set() imports = set()
raw_imports = set() raw_imports = set()
candidates = [] candidates = []
ignore_errors = False
ignore_dirs = [ ignore_dirs = [
".hg", ".hg",
".svn", ".svn",
@ -110,7 +110,6 @@ def get_all_imports(path, encoding="utf-8", extra_ignore_dirs=None, follow_links
"__pycache__", "__pycache__",
"env", "env",
"venv", "venv",
".venv",
".ipynb_checkpoints", ".ipynb_checkpoints",
] ]
@ -134,9 +133,9 @@ def get_all_imports(path, encoding="utf-8", extra_ignore_dirs=None, follow_links
for file_name in files: for file_name in files:
file_name = os.path.join(root, file_name) file_name = os.path.join(root, file_name)
contents = read_file_content(file_name, encoding)
try: try:
contents = read_file_content(file_name, encoding)
tree = ast.parse(contents) tree = ast.parse(contents)
for node in ast.walk(tree): for node in ast.walk(tree):
if isinstance(node, ast.Import): if isinstance(node, ast.Import):
@ -146,7 +145,7 @@ def get_all_imports(path, encoding="utf-8", extra_ignore_dirs=None, follow_links
raw_imports.add(node.module) raw_imports.add(node.module)
except Exception as exc: except Exception as exc:
if ignore_errors: if ignore_errors:
traceback.print_exc() traceback.print_exc(exc)
logging.warn("Failed on file: %s" % file_name) logging.warn("Failed on file: %s" % file_name)
continue continue
else: else:
@ -505,7 +504,6 @@ def init(args):
encoding = args.get("--encoding") encoding = args.get("--encoding")
extra_ignore_dirs = args.get("--ignore") extra_ignore_dirs = args.get("--ignore")
follow_links = not args.get("--no-follow-links") follow_links = not args.get("--no-follow-links")
ignore_errors = args.get("--ignore-errors")
scan_noteboooks = args.get("--scan-notebooks", False) scan_noteboooks = args.get("--scan-notebooks", False)
handle_scan_noteboooks() handle_scan_noteboooks()
@ -537,7 +535,6 @@ def init(args):
encoding=encoding, encoding=encoding,
extra_ignore_dirs=extra_ignore_dirs, extra_ignore_dirs=extra_ignore_dirs,
follow_links=follow_links, follow_links=follow_links,
ignore_errors=ignore_errors,
) )
candidates = get_pkg_names(candidates) candidates = get_pkg_names(candidates)
logging.debug("Found imports: " + ", ".join(candidates)) logging.debug("Found imports: " + ", ".join(candidates))

1587
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,16 +1,11 @@
[project] [tool.poetry]
name = "pipreqs" name = "pipreqs"
version = "0.5.0" version = "0.5.0"
description = "Pip requirements.txt generator based on imports in project" description = "Pip requirements.txt generator based on imports in project"
authors = [ authors = ["Vadim Kravcenko <vadim.kravcenko@gmail.com>"]
{ name = "Vadim Kravcenko", email = "vadim.kravcenko@gmail.com" }
]
maintainers = [
{name = "Jonas Eschle", email = "jonas.eschle@gmail.com"}
]
license = "Apache-2.0" license = "Apache-2.0"
readme = "README.rst" readme = ["README.rst", "HISTORY.rst"]
packages = [{ include = "pipreqs" }] packages = [{include = "pipreqs"}]
repository = "https://github.com/bndr/pipreqs" repository = "https://github.com/bndr/pipreqs"
keywords = ["pip", "requirements", "imports"] keywords = ["pip", "requirements", "imports"]
classifiers = [ classifiers = [
@ -19,35 +14,29 @@ classifiers = [
"License :: OSI Approved :: Apache Software License", "License :: OSI Approved :: Apache Software License",
"Natural Language :: English", "Natural Language :: English",
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.12"
"Programming Language :: Python :: 3.13",
] ]
requires-python = ">=3.9, <3.14"
dependencies = [ [tool.poetry.scripts]
"yarg>=0.1.9", pipreqs = "pipreqs.pipreqs:main"
"docopt>=0.6.2",
"nbconvert>=7.11.0", [tool.poetry.dependencies]
"ipython>=8.12.3", python = ">=3.8.1,<3.13"
] yarg = "0.1.9"
[project.optional-dependencies] docopt = "0.6.2"
dev = [ nbconvert = "^7.11.0"
"flake8>=6.1.0", ipython = "8.12.3"
"tox>=4.11.3",
"coverage>=7.3.2", [tool.poetry.group.dev.dependencies]
"sphinx>=7.2.6;python_version>='3.9'",
]
[tool.poetry.group.dev.dependencies] # for legacy usage
flake8 = "^6.1.0" flake8 = "^6.1.0"
tox = "^4.11.3" tox = "^4.11.3"
coverage = "^7.3.2" coverage = "^7.3.2"
sphinx = { version = "^7.2.6", python = ">=3.9" } sphinx = { version = "^7.2.6", python = ">=3.9" }
[project.scripts]
pipreqs = "pipreqs.pipreqs:main"
[build-system] [build-system]
requires = ["poetry-core>=2.0.0,<3.0.0"] requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api" build-backend = "poetry.core.masonry.api"

View File

@ -114,13 +114,6 @@ class TestPipreqs(unittest.TestCase):
""" """
self.assertRaises(SyntaxError, pipreqs.get_all_imports, self.project_invalid) self.assertRaises(SyntaxError, pipreqs.get_all_imports, self.project_invalid)
def test_ignore_errors(self):
"""
Test that invalid python files do not raise an exception when ignore_errors is True.
"""
imports = pipreqs.get_all_imports(self.project_invalid, ignore_errors=True)
self.assertEqual(len(imports), 0)
def test_get_imports_info(self): def test_get_imports_info(self):
""" """
Test to see that the right number of packages were found on PyPI Test to see that the right number of packages were found on PyPI

10
tox.ini
View File

@ -1,20 +1,20 @@
[tox] [tox]
isolated_build = true isolated_build = true
envlist = py39, py310, py311, py312, py313, pypy3, flake8 envlist = py38, py39, py310, py311, py312, pypy3, flake8
[gh-actions] [gh-actions]
python = python =
3.8: py38
3.9: py39 3.9: py39
3.10: py310 3.10: py310
3.11: py311 3.11: py311
3.12: py312 3.12: py312
3.13: py313 pypy-3.9-7.3.12: pypy3
pypy-3.10: pypy3
[testenv] [testenv]
setenv = setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/pipreqs PYTHONPATH = {toxinidir}:{toxinidir}/pipreqs
commands = commands =
python -m unittest discover python -m unittest discover
[testenv:flake8] [testenv:flake8]
@ -28,4 +28,4 @@ exclude =
tests/_data_duplicated_deps/ tests/_data_duplicated_deps/
tests/_data_ignore/ tests/_data_ignore/
tests/_invalid_data/ tests/_invalid_data/
max-line-length = 120 max-line-length = 120