Skip to content

Commit 0f379b5

Browse files
committed
Merge remote-tracking branch 'b2w/feature/migrate-to-pipenv' into release/0.1.0-rc2
# Conflicts: # .travis.yml # requirements-dev.txt
2 parents 970bd8a + e715a08 commit 0f379b5

File tree

3 files changed

+188
-6
lines changed

3 files changed

+188
-6
lines changed

Diff for: Pipfile

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[[source]]
2+
url = "https://pypi.org/simple"
3+
verify_ssl = true
4+
name = "pypi"
5+
6+
[packages]
7+
pytest = "*"
8+
pytest-cov = "*"
9+
codecov = "*"
10+
asynctest = "==0.12.0"
11+
12+
[dev-packages]
13+
14+
[requires]
15+
python_version = "3.6"

Diff for: Pipfile.lock

+173
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: requirements-dev.txt

-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +0,0 @@
1-
pytest
2-
pytest-cov
3-
codecov
4-
asynctest==0.12.0
5-
python-dateutil==2.7.3
6-
freezegun==0.3.10

0 commit comments

Comments
 (0)