Skip to content

Commit

Permalink
Remove legacy resolver
Browse files Browse the repository at this point in the history
  • Loading branch information
Mauko Quiroga committed Sep 8, 2021
1 parent 4322f29 commit 83c3884
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 9 deletions.
13 changes: 9 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:

- run:
name: Install core
command: pip install --editable .[dev] --upgrade --use-deprecated=legacy-resolver
command: pip install --editable . --upgrade --no-dependencies

- run:
name: Run core tests
Expand Down Expand Up @@ -101,7 +101,9 @@ jobs:

- run:
name: Install core constrained
command: pip install --editable .[dev] --upgrade --constraint requirements/constraints --use-deprecated=legacy-resolver
command: |
pip install --requirement requirements/dev --upgrade --constraint requirements/constraints
pip install --editable . --upgrade --no-dependencies
- run:
name: Run core tests
Expand All @@ -124,7 +126,9 @@ jobs:
name: Submit coverage to Coveralls
command: |
source /tmp/venv/openfisca_core/bin/activate
pip install --editable .[coverage]
pip install --requirement requirements/coverage --upgrade
pip install --requirement requirements/dev --upgrade
pip install --editable . --upgrade --no-dependencies
coveralls
- save_cache:
Expand Down Expand Up @@ -157,7 +161,8 @@ jobs:
- run:
name: Upload a Python package to PyPi
command: |
pip install --editable .[publication]
pip install --requirement requirements/publication --upgrade
pip install --editable . --upgrade --no-dependencies
.circleci/publish-python-package.sh
- run:
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ all: test
install:
@$(call doc,$@:)
@pip install --upgrade pip setuptools
@pip install --editable .[dev] --upgrade --use-deprecated=legacy-resolver
@pip install --requirement requirements/dev --upgrade
@pip install --editable . --upgrade --no-dependencies

## Install openfisca-core for deployment and publishing.
build: setup.py
Expand Down
15 changes: 12 additions & 3 deletions requirements/dev
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
# Please make sure to pin all dependency versions, in order to avoid unwanted
# functional and integration breaks caused by external code updates.
#
# These are dev dependencies, so pin them.
# General Rule
# ============
#
# * Pin them.
#
# Exceptions
# ==========
#
# * openfisca-country-template should not be constrained (circular dep).
# * openfisca-extension-template should not be constrained (circular dep).

# For automatic style formatting.
autopep8 == 1.5.7
Expand All @@ -18,8 +27,8 @@ pytest-cov == 2.11.1
mypy == 0.812

# For testing: parameters, variables, etc.
openfisca-country-template == 3.12.5
openfisca-extension-template == 1.3.6
openfisca-country-template
openfisca-extension-template

# Include Web API dependencies for development
-r web-api
2 changes: 1 addition & 1 deletion requirements/tracker
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# versions.

# For sending usage statistics to the Matomo third-party service.
openfisca-tracker <= 0.4.0
openfisca-tracker

0 comments on commit 83c3884

Please sign in to comment.