Skip to content

Commit 3ecfe95

Browse files
committed
Merge remote-tracking branch 'origin/master' into disable-unicode-conversion-flag
2 parents 05677b1 + 74c1441 commit 3ecfe95

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ matrix:
2222
include:
2323
- python: 3.7
2424
- python: 3.7-dev
25-
- python: 3.8-dev
25+
# - python: 3.8-dev
2626

2727
deploy:
2828
- provider: pypi
@@ -46,4 +46,4 @@ deploy:
4646
on:
4747
repo: bogdandm/json2python-models
4848
tags: true
49-
all_branches: false
49+
all_branches: false

json_to_models/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
from pkg_resources import parse_version
22

3-
__version__ = "0.1.0.post1"
3+
__version__ = "0.1.0.post2"
44
VERSION = parse_version(__version__)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ def run_tests(self):
5151
install_requires=required,
5252
cmdclass={"test": PyTest},
5353
tests_require=["pytest>=4.4.0", "pytest-xdist", "requests", "attrs"],
54-
data_files=[('', ['pytest.ini', '.coveragerc', 'LICENSE', 'README.md', 'CHANGELOG.md'])]
54+
data_files=[('', ['requirements.txt', 'pytest.ini', '.coveragerc', 'LICENSE', 'README.md', 'CHANGELOG.md'])]
5555
)

0 commit comments

Comments
 (0)