Skip to content

Commit 8ed43fa

Browse files
committed
Build script fixes from v4 branch
1 parent 76c27c0 commit 8ed43fa

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

scripts/basic-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ PYTEST="python -m pytest -n2"
2424

2525
$PYTEST --runpytest=subprocess tests/pytest
2626

27-
pip install ".[datetime]"
27+
pip install ".[pytz]"
2828
$PYTEST tests/datetime/
2929
pip uninstall -y pytz
3030

scripts/check-release-file.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,17 @@
2626

2727
sys.path.append(os.path.dirname(__file__)) # noqa
2828

29+
DO_RELEASE_CHECK = os.environ.get('TRAVIS_BRANCH', 'master') == 'master'
2930

3031
if __name__ == '__main__':
31-
if tools.has_source_changes():
32+
if DO_RELEASE_CHECK and tools.has_source_changes():
3233
if not tools.has_release():
3334
print(
3435
'There are source changes but no RELEASE.rst. Please create '
3536
'one to describe your changes.'
3637
)
3738
sys.exit(1)
3839
tools.parse_release_file()
40+
else:
41+
print('Skipping release check, because this is not the master branch '
42+
'or the pull request is not targeting the master branch.')

0 commit comments

Comments
 (0)