From a157e95d3f472a8241a65938a32a9d96a98da228 Mon Sep 17 00:00:00 2001 From: David Brown Date: Mon, 4 May 2020 09:30:48 -0700 Subject: [PATCH] Remove Requirements Files This removes the requirements files and puts the dependencies into the `.travis-ci.yml` for development and `setup.py` for code dependencies. Signed-off-by: David Brown --- .pre-commit-config.yaml | 11 +++++------ .travis.yml | 5 +++-- requirements-dev.txt | 13 ------------- requirements.txt | 3 --- setup.py | 4 +--- 5 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 requirements-dev.txt delete mode 100644 requirements.txt diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 87f8e4a..348911a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,11 +1,11 @@ exclude: 'jsonpath2/parser/JSONPath.*' repos: - repo: https://github.com/pre-commit/mirrors-autopep8 - rev: v1.4.4 + rev: v1.5.2 hooks: - id: autopep8 -- repo: git://github.com/pre-commit/pre-commit-hooks - rev: v2.2.3 +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v2.5.0 hooks: - id: fix-encoding-pragma - id: trailing-whitespace @@ -35,7 +35,6 @@ repos: - id: check-symlinks - id: check-yaml - id: detect-private-key - - id: requirements-txt-fixer - id: trailing-whitespace - repo: local hooks: @@ -49,8 +48,8 @@ repos: entry: python -m pylint --rcfile=pylintrc language: system types: [python] -- repo: git://github.com/Lucas-C/pre-commit-hooks - rev: v1.1.6 +- repo: https://github.com/Lucas-C/pre-commit-hooks + rev: v1.1.7 hooks: - id: remove-tabs - id: remove-crlf diff --git a/.travis.yml b/.travis.yml index 386bd3d..20b450a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ stages: - deploy script: -- pip install . - cd tests - coverage run --include='*/site-packages/jsonpath2/*' --omit='*/site-packages/jsonpath2/parser/JSONPath*' -m pytest -xv - coverage report -m --fail-under 100 @@ -16,7 +15,9 @@ script: - python setup.py bdist_wheel - python setup.py sdist -install: pip install -r requirements-dev.txt +install: +- pip install coverage pep257 pre-commit pylint pytest readthedocs-sphinx-ext recommonmark setuptools sphinx sphinx-rtd-theme +- pip install . jobs: include: - stage: lint diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index f88b784..0000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,13 +0,0 @@ -antlr4-python3-runtime -coverage -pep257 -pre-commit -pylint -pytest -readthedocs-sphinx-ext -recommonmark -recommonmark -setuptools -six -sphinx -sphinx-rtd-theme diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 425f17e..0000000 --- a/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -antlr4-python3-runtime==4.7.2 -setuptools -six diff --git a/setup.py b/setup.py index e03b926..3005991 100644 --- a/setup.py +++ b/setup.py @@ -19,8 +19,6 @@ author_email='mark.borkum@pnnl.gov', packages=find_packages(), install_requires=[ - 'antlr4-python3-runtime==4.7.2', - 'setuptools', - 'six' + 'antlr4-python3-runtime==4.7.2' ] )