From df44b4468648ab5d1a03cb3941c92e472389fa66 Mon Sep 17 00:00:00 2001 From: M Starch Date: Wed, 8 Jun 2022 10:31:13 -0700 Subject: [PATCH] lestarch: loosening package requirements (#78) * lestarch: loosening package requirements * lestarch: fixing on major revisions, per recommendation --- .github/workflows/fprime-tools-ci.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- setup.py | 30 ++++++++++++------------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/fprime-tools-ci.yml b/.github/workflows/fprime-tools-ci.yml index e50c8e7d..642805e3 100644 --- a/.github/workflows/fprime-tools-ci.yml +++ b/.github/workflows/fprime-tools-ci.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: ["3.7", "3.8", "3.9", "3.10"] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 7f2da5f3..3dda6242 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: ["3.7", "3.8", "3.9", "3.10"] fprime-version: [[NASA-v1.5.3, 99cef07], [v2.0.0, 521516c], [v3.0.0, 521516c], [devel, 521516c]] steps: diff --git a/setup.py b/setup.py index 68285b51..da24801b 100644 --- a/setup.py +++ b/setup.py @@ -71,32 +71,30 @@ "Operating System :: POSIX", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ], - # Requires Python 3.6+ - python_requires=">=3.6", + # Requires Python 3.7+ + python_requires=">=3.7", install_requires=[ - "lxml==4.6.3", - "Markdown==3.3.4", - "MarkupSafe<2.0.0", - "pexpect==4.8.0", - "pytest==6.2.4", - "Cheetah3==3.2.6", - "setuptools-scm==6.0.1", - "cookiecutter==1.7.2", - "gcovr==5.0", + "lxml>=4.6.3, <5.0.0", + "Markdown>=3.3.4, <4.0.0", + "pexpect>=4.8.0, <5.0.0", + "pytest>=6.2.4, <7.0.0", + "Cheetah3>=3.2.6, <4.0.0", + "cookiecutter>=1.7.2, <2.0.0", + "gcovr>=5.0, <6.0", ], extras_require={ "dev": [ "black==21.5b1", - "pylama==7.7.1", - "pylint==2.8.2", - "pre-commit==2.12.1", + "pylama", + "pylint", + "pre-commit", "sphinx", "sphinxcontrib.mermaid", "sphinx-rtd-theme", @@ -106,7 +104,7 @@ ] }, # Setup and test requirements, not needed by normal install - setup_requires=["pytest-runner==5.3.0", "setuptools_scm==6.0.1"], + setup_requires=["pytest-runner", "setuptools_scm"], tests_require=["pytest"], # Create a set of executable entry-points for running directly from the package entry_points={