Skip to content

Commit e18f23b

Browse files
authored
Fix pristine editable install
Merge pull request #1137 from openfisca/fix-pristine-editable-install
2 parents 3eb157f + b50006b commit e18f23b

4 files changed

Lines changed: 11 additions & 4 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
### 35.8.5 [#1137](https://github.com/openfisca/openfisca-core/pull/1137)
4+
5+
#### Technical changes
6+
7+
- Fix pylint dependency in fresh editable installations
8+
- Ignore pytest requirement, used to collect test cases, if it is not yet installed.
9+
310
### 35.8.4 [#1131](https://github.com/openfisca/openfisca-core/pull/1131)
411

512
#### Technical changes

openfisca_tasks/install.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
install:
33
@$(call print_help,$@:)
44
@pip install --upgrade pip twine wheel
5-
@pip install --editable .[dev] --upgrade --use-deprecated=legacy-resolver
5+
@pip install --editable ".[dev]" --upgrade --use-deprecated=legacy-resolver
66

77
## Uninstall project dependencies.
88
uninstall:

openfisca_tasks/test_code.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ test-code: test-core test-country test-extension
2020
@$(call print_pass,$@:)
2121

2222
## Run openfisca-core tests.
23-
test-core: $(shell pytest --quiet --quiet --collect-only | cut -f 1 -d ":")
23+
test-core: $(shell pytest --quiet --quiet --collect-only 2> /dev/null | cut -f 1 -d ":")
2424
@$(call print_help,$@:)
2525
@PYTEST_ADDOPTS="$${PYTEST_ADDOPTS} ${pytest_args}" \
2626
coverage run -m \

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
'autopep8 >= 1.4.0, < 1.6.0',
3535
'coverage == 6.0.2',
3636
'darglint == 1.8.0',
37-
'flake8 >= 3.9.0, < 4.0.0',
37+
'flake8 >= 4.0.0, < 4.1.0',
3838
'flake8-bugbear >= 19.3.0, < 20.0.0',
3939
'flake8-docstrings == 1.6.0',
4040
'flake8-print >= 3.1.0, < 4.0.0',
@@ -47,7 +47,7 @@
4747

4848
setup(
4949
name = 'OpenFisca-Core',
50-
version = '35.8.4',
50+
version = '35.8.5',
5151
author = 'OpenFisca Team',
5252
author_email = 'contact@openfisca.org',
5353
classifiers = [

0 commit comments

Comments
 (0)