Skip to content

Commit

Permalink
Increase pyarrow version used in tests (#40)
Browse files Browse the repository at this point in the history
* Increase pyarrow version used in tests

* Add fallback in makefile

* Add fallback in makefile
  • Loading branch information
gtopper authored Jan 4, 2024
1 parent 9fbe756 commit 8be75d3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
17 changes: 11 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@
# limitations under the License.

# We only want to format and lint checked in python files
CHECKED_IN_PYTHING_FILES := $(shell git ls-files | grep '\.py$$')
CHECKED_IN_PYTHON_FILES := $(shell git ls-files | grep '\.py$$')

# Fallback
ifeq ($(CHECKED_IN_PYTHON_FILES),)
CHECKED_IN_PYTHON_FILES := .
endif

FLAKE8_OPTIONS := --max-line-length 120
BLACK_OPTIONS := --line-length 120
Expand All @@ -26,22 +31,22 @@ all:
.PHONY: fmt
fmt:
@echo "Running black fmt..."
python -m black $(BLACK_OPTIONS) $(CHECKED_IN_PYTHING_FILES)
python -m isort $(ISORT_OPTIONS) $(CHECKED_IN_PYTHING_FILES)
python -m black $(BLACK_OPTIONS) $(CHECKED_IN_PYTHON_FILES)
python -m isort $(ISORT_OPTIONS) $(CHECKED_IN_PYTHON_FILES)

.PHONY: lint
lint: flake8 fmt-check

.PHONY: fmt-check
fmt-check:
@echo "Running black+isort fmt check..."
python -m black $(BLACK_OPTIONS) --check --diff $(CHECKED_IN_PYTHING_FILES)
python -m isort --check --diff $(ISORT_OPTIONS) $(CHECKED_IN_PYTHING_FILES)
python -m black $(BLACK_OPTIONS) --check --diff $(CHECKED_IN_PYTHON_FILES)
python -m isort --check --diff $(ISORT_OPTIONS) $(CHECKED_IN_PYTHON_FILES)

.PHONY: flake8
flake8:
@echo "Running flake8 lint..."
python -m flake8 $(FLAKE8_OPTIONS) $(CHECKED_IN_PYTHING_FILES)
python -m flake8 $(FLAKE8_OPTIONS) $(CHECKED_IN_PYTHON_FILES)

.PHONY: test
test:
Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ flake8~=5.0
flake8-bugbear~=22.9
isort~=5.7
pandas>=1.1
pyarrow~=1.0
pyarrow~=12.0
pytest>=6.0

0 comments on commit 8be75d3

Please sign in to comment.