From d0d2e2cc0819b269207eeb2b471bfd48f9261c13 Mon Sep 17 00:00:00 2001 From: franneck94 Date: Sat, 11 Sep 2021 09:49:38 +0200 Subject: [PATCH] Updated tooling --- .gitignore | 1 + .pre-commit-config.yaml | 12 ++++++------ requirements-dev.txt | 22 ++++++++++++++++++++++ requirements.txt | 22 ---------------------- setup.py | 30 ++++++++++++++++-------------- tensorcross/version.py | 2 +- 6 files changed, 46 insertions(+), 43 deletions(-) create mode 100644 requirements-dev.txt diff --git a/.gitignore b/.gitignore index f105ab9..6eddd01 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.txt *.isorted !requirements.txt +!requirements-dev.txt build/ !docs/build/ .benchmarks/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cb0f645..a72df0a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,22 +1,22 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.2.0 + rev: v4.0.1 hooks: - id: trailing-whitespace - id: end-of-file-fixer - id: check-docstring-first - repo: https://gitlab.com/pycqa/flake8 - rev: 3.8.3 + rev: 3.9.2 hooks: - id: flake8 -- repo: https://github.com/pre-commit/mirrors-autopep8 - rev: v1.5.3 +- repo: https://github.com/psf/black + rev: 21.8b0 hooks: - - id: autopep8 + - id: black - repo: https://github.com/PyCQA/isort - rev: 5.5.3 + rev: 5.9.3 hooks: - id: isort diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000..171c336 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,22 @@ +# Packaging +setuptools +wheel +twine + +# Docs +mkdocs +mkdocstrings +pygments + +# Linting/Tooling +flake8 +mypy +isort +black +pre-commit + +# Testing +pytest +codecov +pytest-cov +tox diff --git a/requirements.txt b/requirements.txt index e722641..4106bbe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,25 +6,3 @@ tensorflow-datasets scikit-learn scipy numpy - -# Docs -mkdocs -mkdocstrings -pygments - -# Linting/Tooling -pylint -flake8 -mypy -isort -autopep8 -pre-commit - -# Testing -pytest -codecov -pytest-cov -tox - -# Packaging -twine diff --git a/setup.py b/setup.py index 2db5a92..a2a1291 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,9 @@ CLASSIFIERS = """\ License :: OSI Approved -Programming Language :: Python :: 3.7 :: 3.8 :: 3.9 +Programming Language :: Python :: 3.7 +Programming Language :: Python :: 3.8 +Programming Language :: Python :: 3.9 Topic :: Software Development Operating System :: Microsoft :: Windows Operating System :: POSIX @@ -16,23 +18,23 @@ DISTNAME = "tensorcross" AUTHORS = "Jan Schaffranek, Saif Al-Dilaimi" -DESCRIPTION = ("Cross Validation, Grid Search and Random Search " - "for TensorFlow Datasets.") +DESCRIPTION = ( + "Cross Validation, Grid Search and Random Search " + "for TensorFlow Datasets." +) LICENSE = "MIT" -README = ("Cross Validation, Grid Search and Random Search for TensorFlow " - "Datasets. For more information see here: " - "https://github.com/franneck94/TensorCross") +README = ( + "Cross Validation, Grid Search and Random Search for TensorFlow " + "Datasets. For more information see here: " + "https://github.com/franneck94/TensorCross" +) VERSION = __version__ ISRELEASED = False MIN_PYTHON_VERSION = "3.7" -INSTALL_REQUIRES = [ - "tensorflow>=2.0", - "numpy", - "scipy", - "scikit-learn" -] +MAX_PYTHON_VERSION = "3.9" +INSTALL_REQUIRES = ["tensorflow>=2.0", "numpy", "scipy", "scikit-learn"] PACKAGES = find_packages(include=["tensorcross", "tensorcross.*"]) @@ -42,11 +44,11 @@ long_description=README, packages=PACKAGES, author=AUTHORS, - python_requires=f">={MIN_PYTHON_VERSION}", + python_requires=f">={MIN_PYTHON_VERSION},<={MAX_PYTHON_VERSION}", install_requires=INSTALL_REQUIRES, description=DESCRIPTION, classifiers=[CLASSIFIERS], - license=LICENSE + license=LICENSE, ) diff --git a/tensorcross/version.py b/tensorcross/version.py index 6a9beea..3d26edf 100644 --- a/tensorcross/version.py +++ b/tensorcross/version.py @@ -1 +1 @@ -__version__ = "0.4.0" +__version__ = "0.4.1"