Skip to content

Commit

Permalink
Updated Pipfile and Makefile to:
Browse files Browse the repository at this point in the history
 - update and move packages to the "dev" section
 - use Python 3.7 for pipenv
 - install tox-pipenv plugin to try and fix Tox (currently doesn't)
 - simplify tox.ini to try and fix Tox (didn't)
 - move ci makefile target to the circle config

Currently Tox is broken (see tox-dev/tox-pipenv#61)
  • Loading branch information
bear committed May 31, 2020
1 parent 50dc617 commit 55a2b1d
Show file tree
Hide file tree
Showing 7 changed files with 403 additions and 48 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
command: |
make dev
make info
uname -a
lsb_release -a
- run:
name: build and test
command: make ci
name: test
command: |
make lint
make coverage
14 changes: 14 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
31 May 2020 - bear
PR #244 Polished README.rst
PR #242 fix pyicu import to suppress warnings
PR #239 Fixed missing comma in seconds strings

Updated Pipfile and Makefile to:
- update and move packages to the "dev" section
- use Python 3.7 for pipenv
- install tox-pipenv plugin to try and fix Tox (currently doesn't)
- simplify tox.ini to try and fix Tox (didn't)
- move ci makefile target to the circle config

Currently Tox is broken (see https://github.com/tox-dev/tox-pipenv/issues/61)

18 Nov 2019 - bear
v2.5 release

Expand Down
32 changes: 5 additions & 27 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,38 +1,19 @@
.PHONY: docs test

UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)
BREWPATH = $(shell brew --prefix)
PYICU_LD = "-L${BREWPATH}/opt/icu4c/lib -L${BREWPATH}/opt/[email protected]/lib"
PYICU_CPP = "-I${BREWPATH}/opt/icu4c/include -I${BREWPATH}/opt/[email protected]/include"
ICU_VER = 58.2
else
PYICU_LD =
PYICU_CPP =
ICU_VER =
endif
.PHONY: dev info clean docs lint test

help:
@echo " env install all production dependencies"
@echo " dev install all dev and production dependencies (virtualenv is assumed)"
@echo " clean remove unwanted stuff"
@echo " lint check style with flake8"
@echo " test run tests"
@echo " build generate source and wheel dist files"
@echo " upload generate source and wheel dist files and upload them"

env:
pipenv install

dev: env
@echo "on OS X use homebrew to install icu4c"
LDFLAGS=${PYICU_LD} CPPFLAGS=${PYICU_CPP} ICU_VERSION=${ICU_VER} \
pipenv --python 2.7
pipenv --python 3.7
dev:
pipenv install --dev --python 3.7

info:
@python --version
@pipenv --version
@pipenv run python --version

clean:
rm -fr build
Expand All @@ -47,7 +28,7 @@ docs:
lint:
pipenv run flake8 parsedatetime > violations.flake8.txt

test: lint
test:
pipenv run python setup.py test

tox: clean
Expand All @@ -58,9 +39,6 @@ coverage: clean
@pipenv run coverage html
@pipenv run coverage report

ci: tox coverage
CODECOV_TOKEN=`cat .codecov-token` pipenv run codecov

build: clean
pipenv run python setup.py check
pipenv run python setup.py sdist
Expand Down
4 changes: 2 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
tox = "*"
tox-pipenv = "*"
pytest = "*"
pytest-cov = "*"
Expand All @@ -15,8 +16,7 @@ coveralls = "*"
codecov = "*"
check-manifest = "*"
unittest2 = "*"
tox = "*"
tox-pyenv = "*"
pyicu-binary = "*"

[packages]

Expand Down
Loading

0 comments on commit 55a2b1d

Please sign in to comment.