Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt to Core v24 #51

Merged
merged 5 commits into from
Aug 15, 2018
Merged

Adapt to Core v24 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b621c01
Remove obsolete extra require
fpagnoux Aug 2, 2018
0aa383e
Install OpenFisca Web API by default
fpagnoux Aug 2, 2018
898152c
Bump version number
fpagnoux Aug 2, 2018
b4e1e99
Install API from core feature branch
fpagnoux Aug 2, 2018
73f2278
Rename 'test' dep to 'dev'
fpagnoux Aug 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
name: Install dependencies
command: |
pip install --upgrade pip twine wheel
pip install --editable .[test] --upgrade
# pip install --editable git+https://github.com/openfisca/openfisca-core.git@BRANCH_NAME#egg=OpenFisca-Core # use a specific branch of OpenFisca-Core
# pip install --editable git+https://github.com/openfisca/openfisca-core.git@BRANCH#egg=OpenFisca-Core[web-api] # use a specific branch of OpenFisca-Core
pip install --editable .[dev] --upgrade

- save_cache:
key: v1-py2-{{ checksum "setup.py" }}
Expand Down Expand Up @@ -88,8 +88,8 @@ jobs:
name: Install dependencies
command: |
pip install --upgrade pip twine wheel
pip install --editable .[test] --upgrade
# pip install --editable git+https://github.com/openfisca/openfisca-core.git@BRANCH_NAME#egg=OpenFisca-Core # use a specific branch of OpenFisca-Core
# pip install --editable git+https://github.com/openfisca/openfisca-core.git@BRANCH#egg=OpenFisca-Core[web-api] # use a specific branch of OpenFisca-Core
pip install --editable .[dev] --upgrade

- save_cache:
key: v1-py3-{{ checksum "setup.py" }}
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

### 3.3.0 - [#51](https://github.com/openfisca/country-template/pull/51)

* Technical change
- Make package compatible with OpenFisca Core v24
- Rename development dependencies from `test` to `dev`:

### 3.2.3 - [#50](https://github.com/openfisca/country-template/pull/50)

* Minor change
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Clone this Country Package on your machine:
```sh
git clone https://github.com/openfisca/openfisca-country-template.git
cd openfisca-country-template
pip install --editable .[test]
pip install --editable .[dev]
```

You can make sure that everything is working by running the provided tests with `make test`.
Expand Down
9 changes: 3 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setup(
name='OpenFisca-Country-Template',
version='3.2.3',
version='3.3.0',
author='OpenFisca Team',
author_email='contact@openfisca.fr',
description=u'OpenFisca tax and benefit system for Country-Template',
Expand All @@ -16,13 +16,10 @@
url='https://github.com/openfisca/country-template',
include_package_data = True, # Will read MANIFEST.in
install_requires=[
'OpenFisca-Core >= 23.3, < 24.0',
'OpenFisca-Core[web-api] >= 24.0, < 25.0',
],
extras_require = {
'api': [
'OpenFisca-Web-API >= 4.0.0, < 7.0',
],
'test': [
'dev': [
'flake8 >= 3.4.0, < 3.5.0',
'flake8-print',
'nose',
Expand Down