Skip to content

Commit 3d388b6

Browse files
committed
Merge branch '2.0'
2 parents 74350b3 + 17923b0 commit 3d388b6

File tree

360 files changed

+21843
-24920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

360 files changed

+21843
-24920
lines changed

.coveragerc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[run]
2-
omit = pendulum/lang/*,
2+
omit = pendulum/locales/*,
33
pendulum/_compat.py,
4-
pendulum/version.py,
5-
pendulum/_extensions/*,
6-
pendulum/formatting/formatter.py
4+
pendulum/__version__.py,
5+
pendulum/_extensions/*
6+
pendulum/parsing/iso8601.py
7+
pendulum/utils/_compat.py

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ nosetests.xml
1919

2020
.DS_Store
2121
.idea/*
22+
.python-version
2223

2324
/test.py
2425
/test_*.*
@@ -27,3 +28,5 @@ benchmark.py
2728
results.json
2829
profile.html
2930
/wheelhouse
31+
/docs/site/*
32+
pyproject.lock

.travis.yml

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,29 @@ matrix:
66
env: PENDULUM_EXTENSIONS=1
77
- python: 2.7
88
env: PENDULUM_EXTENSIONS=0
9-
- python: 3.4
10-
env: PENDULUM_EXTENSIONS=1
11-
- python: 3.4
12-
env: PENDULUM_EXTENSIONS=0
13-
- python: 3.5
14-
env: PENDULUM_EXTENSIONS=1
15-
- python: 3.5
16-
env: PENDULUM_EXTENSIONS=0
179
- python: 3.6
1810
env: PENDULUM_EXTENSIONS=1
1911
- python: 3.6
2012
env: PENDULUM_EXTENSIONS=0
21-
- python: pypy
13+
- python: 3.7-dev
14+
env: PENDULUM_EXTENSIONS=1
15+
- python: 3.7-dev
16+
env: PENDULUM_EXTENSIONS=0
2217

2318
before_install:
2419
- pip install codecov
2520

2621
install:
22+
- virtualenv --python="$HOME/virtualenv/python3.6/bin/python" "$HOME/virtualenvs/venv-poetry"
23+
- $HOME/virtualenvs/venv-poetry/bin/pip install poetry --pre
24+
- $HOME/virtualenvs/venv-poetry/bin/poetry install -v
25+
- $HOME/virtualenvs/venv-poetry/bin/poetry build -v
2726
- |
28-
if [ "$TRAVIS_PYTHON_VERSION" = "pypy" ]; then
29-
export PYENV_ROOT="$HOME/.pyenv"
30-
if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
31-
pushd "$PYENV_ROOT" && git pull && popd
32-
else
33-
rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
34-
fi
35-
export PYPY_VERSION="5.6.0"
36-
"$PYENV_ROOT/bin/pyenv" install --skip-existing "pypy-$PYPY_VERSION"
37-
virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
38-
source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
27+
if [ "$PENDULUM_EXTENSIONS" == "1" ]; then
28+
find dist/ -iname pendulum*.whl -exec unzip -o {} 'pendulum/*' -d . \;
3929
fi
40-
- pip install -r tests-requirements.txt
41-
- python setup.py develop
4230
43-
script: py.test --cov=pendulum --cov-config=.coveragerc tests/
31+
script: pytest --cov=pendulum --cov-config=.coveragerc tests/
4432

4533
after_success:
4634
- codecov

0 commit comments

Comments
 (0)