Skip to content

Commit

Permalink
remove python 2.7 build targets
Browse files Browse the repository at this point in the history
  • Loading branch information
David Kegley committed Dec 13, 2021
1 parent a9b0357 commit b0775e4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
matrix:
# TODO: work on windows-latest compatibility?
os: [ubuntu-latest]
python-version: ['2.7', '3.5', '3.6', '3.7', '3.8', '3.9']
python-version: ['3.5', '3.6', '3.7', '3.8', '3.9']
include:
- os: macos-latest
python-version: '3.9'
Expand All @@ -25,9 +25,9 @@ jobs:
python-version: ${{ matrix.python-version }}
- run: pip install -r requirements.txt
- run: pip freeze
- if: matrix.python-version != '2.7' && matrix.python-version != '3.5'
- if: matrix.python-version != '3.5'
run: make fmt
- if: matrix.python-version != '2.7' && matrix.python-version != '3.5'
- if: matrix.python-version != '3.5'
run: make lint
- run: python setup.py --version
- run: make test-${{ matrix.python-version }}
Expand Down
10 changes: 2 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ SOURCE_DATE_EPOCH := $(shell date +%s)
export SOURCE_DATE_EPOCH

.PHONY: all-tests
all-tests: all-images test-2.7 test-3.5 test-3.6 test-3.7 test-3.8
all-tests: all-images test-3.5 test-3.6 test-3.7 test-3.8

.PHONY: all-images
all-images: image-2.7 image-3.5 image-3.6 image-3.7 image-3.8
all-images: image-3.5 image-3.6 image-3.7 image-3.8

image-%:
docker build -t rsconnect-python:$* --build-arg BASE_IMAGE=python:$*-slim .
Expand All @@ -61,9 +61,6 @@ mock-test-%: clean-stores
fmt-%:
$(RUNNER) 'black .'

.PHONY: fmt-2.7
fmt-2.7: .fmt-unsupported

.PHONY: fmt-3.5
fmt-3.5: .fmt-unsupported

Expand All @@ -84,9 +81,6 @@ lint-%:
$(RUNNER) 'flake8 rsconnect/'
$(RUNNER) 'mypy -p rsconnect'

.PHONY: lint-2.7
lint-2.7: .lint-unsupported

.PHONY: lint-3.5
lint-3.5: .lint-unsupported

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4"]

[tool.black]
line-length = 120
target-version = ['py27', 'py35', 'py36', 'py37', 'py38']
target-version = ['py35', 'py36', 'py37', 'py38']

[tool.coverage.run]
omit = ["tests/*"]
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ setup_requires =
toml
wheel
packages = rsconnect
python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
python_requires = >=3.5
zip_safe = true

[options.entry_points]
Expand Down

0 comments on commit b0775e4

Please sign in to comment.