From 5c1ee41839ddc3a201ac991419ff3bb5b60a33e4 Mon Sep 17 00:00:00 2001 From: Aaron Zuspan Date: Fri, 14 Jul 2023 18:57:46 -0700 Subject: [PATCH] Drop 3.7 support and simplify packaging #23 - Set min Python to 3.8 - Add 3.11 to CI tests - Simplify hatch scripts - Remove redundant setup.py and setup.cfg --- .github/workflows/tests.yml | 6 +++--- pyproject.toml | 22 +++------------------- setup.cfg | 15 --------------- setup.py | 3 --- 4 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e6a7cf4..5ca6ba9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,12 +14,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ '3.7', '3.8', '3.9', '3.10' ] + python-version: [ '3.8', '3.9', '3.10', '3.11' ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/pyproject.toml b/pyproject.toml index 040a3c4..0e40098 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ dynamic = ["version"] description = "Code Editor-style reprs for Earth Engine data in a Jupyter notebook." readme = "README.md" license = { file = "LICENSE" } -requires-python = ">=3.7" +requires-python = ">=3.8" authors = [{ name = "Aaron Zuspan" }] keywords = [ "earthengine", @@ -44,27 +44,11 @@ include = ["/eerepr"] [tool.hatch.envs.test] dependencies = [ - "earthengine-api", "pytest", "pytest-cov", - "tox", ] [tool.hatch.envs.test.scripts] -tests = "pytest ." -cov = "pytest . --cov=eerepr --cov-report=html" -view-cov = "open htmlcov/index.html" -ci = "tox" +all = "pytest . {args}" +cov = "pytest . --cov=eerepr {args}" -[tool.tox] -legacy_tox_ini = """ -[tox] -envlist = python3.7,python3.8,python3.9,python3.10 -[testenv] -deps = - pytest - pytest-cov - earthengine-api -commands = pytest -isolated_build = True -""" diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 7423ce8..0000000 --- a/setup.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[metadata] -name = eerepr - -[options] -packages = find: -include_package_data = True - -[options.package_data] -eerepr = - static/css/* - static/js/* - -[options.packages.find] -exclude = - tests \ No newline at end of file diff --git a/setup.py b/setup.py deleted file mode 100644 index 6068493..0000000 --- a/setup.py +++ /dev/null @@ -1,3 +0,0 @@ -from setuptools import setup - -setup()