Skip to content

Commit 7fe9847

Browse files
authored
Merge pull request #276 from Ouranosinc/refresh-cookiecutter-template
Refresh cookiecutter template. To get changes from this cookiecutter PR bird-house/cookiecutter-birdhouse#87
2 parents 118c75f + cf05392 commit 7fe9847

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.cruft.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/bird-house/cookiecutter-birdhouse",
3-
"commit": "e02632d22f7a3311c4b449bb7088b55d94bc0c35",
3+
"commit": "4709e722e9a6cc60d1992734f07b7fae2f607292",
44
"skip": [
55
"raven/processes/wps_say_hello.py",
66
"tests/test_wps_hello.py",

requirements_dev.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
pytest
2-
pytest-dependency
3-
pytest-notebook
42
flake8
53
pytest-flake8
64
ipython
@@ -9,7 +7,11 @@ nbsphinx
97
nbval
108
nbconvert
119
sphinx>=1.7
12-
sphinx-autoapi
1310
bump2version
1411
twine
12+
cruft
13+
# Changing dependencies above this comment will create merge conflicts when updating the cookiecutter template with cruft. Add extra requirements below this line.
14+
pytest-dependency
15+
pytest-notebook
16+
sphinx-autoapi
1517
urlpath

setup.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ values =
2020
beta
2121
final
2222

23-
[bumpversion:file:raven/__init__.py]
24-
search = __version__ = {current_version}
25-
replace = {new_version}
26-
2723
[bumpversion:file:docs/source/conf.py]
2824
search = release = {current_version}
2925
replace = {new_version}
@@ -32,6 +28,10 @@ replace = {new_version}
3228
search = Version={current_version}
3329
replace = {new_version}
3430

31+
[bumpversion:file:.cruft.json]
32+
search = "version": "{current_version}",
33+
replace = "version": "{new_version}",
34+
3535
[tool:pytest]
3636
addopts =
3737
--strict

0 commit comments

Comments
 (0)