Skip to content

Commit ebdb4b1

Browse files
authored
Merge pull request #18 from funnel-io/spring_cleaning
Drop support for Python 3.7
2 parents 8ad1680 + 5c7a5cb commit ebdb4b1

File tree

6 files changed

+33
-19
lines changed

6 files changed

+33
-19
lines changed

.github/workflows/python-publish.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222
- name: Set up Python
23-
uses: actions/setup-python@v2
23+
uses: actions/setup-python@v5
2424
with:
2525
python-version: '3.x'
2626
- name: Install dependencies
2727
run: |
28-
python -m pip install --upgrade pip
29-
pip install build
28+
python -m pip install --upgrade build pip
3029
- name: Build package
3130
run: python -m build
3231
- name: Publish package

.github/workflows/test.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ on:
77
jobs:
88
build:
99
runs-on: ubuntu-latest
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
1014

1115
steps:
12-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1317

1418
- name: install virtual env
1519
run: |

Makefile

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
1-
dist: clean-dist venv
2-
. venv/bin/activate && \
3-
pip3 install --upgrade pip build twine && \
4-
python3 -m build .
5-
61
setup: venv
72

3+
dist: clean-dist venv
4+
. venv/bin/activate && python3 -m build .
5+
86
venv: dev-requirements.txt
97
virtualenv venv --python=${PYTHON_VERSION}
108
. venv/bin/activate && \
119
pip3 install --upgrade pip && \
1210
pip3 install \
1311
--requirement dev-requirements.txt
1412

15-
.PHONY: test
16-
test: venv
17-
@ . venv/bin/activate && PYTHONPATH=src/ pytest -vv -rsx tests/ src/ --cov ./src/json_normalize/ --no-cov-on-fail --cov-report term-missing --doctest-modules --doctest-continue-on-failure
18-
@ . venv/bin/activate && flake8 src --exclude '#*,~*,.#*'
19-
2013
.PHONY: clean
2114
clean: clean-dist
2215
rm -rf venv
@@ -26,3 +19,15 @@ clean-dist:
2619
rm -rf build
2720
rm -rf src/json_normalize.egg-info
2821
rm -rf dist
22+
23+
.PHONY: test
24+
test: venv
25+
@ . venv/bin/activate && PYTHONPATH=src/ pytest -vv -rsx tests/ src/ --cov ./src/json_normalize/ --no-cov-on-fail --cov-report term-missing --doctest-modules --doctest-continue-on-failure
26+
@ . venv/bin/activate && flake8 src --exclude '#*,~*,.#*'
27+
@ . venv/bin/activate && black --check src/ tests/
28+
29+
.PHONY: test-focus
30+
test-focus: venv
31+
@ . venv/bin/activate && PYTHONPATH=src/ pytest -vv -m focus -rsx tests/ src/ --cov ./src/json_normalize/ --no-cov-on-fail --cov-report term-missing --doctest-modules --doctest-continue-on-failure
32+
@ . venv/bin/activate && flake8 src --exclude '#*,~*,.#*'
33+
@ . venv/bin/activate && black --check src/ tests/

dev-requirements.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
flake8
21
black
2+
build
3+
flake8
34
pytest
45
pytest-clarity
5-
pytest-cov
6+
pytest-cov
7+
twine

pytest.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[pytest]
2+
markers =
3+
focus: the test to work on now

setup.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@ classifiers =
1414
Development Status :: 5 - Production/Stable
1515
License :: OSI Approved :: MIT License
1616
Programming Language :: Python :: 3
17-
Programming Language :: Python :: 3.7
1817
Programming Language :: Python :: 3.8
1918
Programming Language :: Python :: 3.9
2019
Programming Language :: Python :: 3.10
20+
Programming Language :: Python :: 3.11
21+
Programming Language :: Python :: 3.12
2122
Topic :: Software Development :: Libraries
2223
keywords = JSON
2324
license = MIT
2425
long_description = file: README.md
2526
long_description_content_type = text/markdown
26-
requires_python = ~=3.7
27+
requires_python = ~=3.8
2728
project_urls =
2829
Bug Reports = https://github.com/funnel-io/json-normalize/issues
2930
Source = https://github.com/funnel-io/json-normalize

0 commit comments

Comments
 (0)