OpenFisca-UK integration #2

jdebacker · 2021-03-04T21:45:28Z

This PR integrates OpenFisca-UK into oguk_calibration. This microsimulation model will provide the underlying data on marginal and effective tax rates that will go into the UK calibration of the OG model.

jdebacker · 2021-04-20T16:52:37Z

@nikhilwoodruff Can you look at the testing failures and see if you can identify why the conflict in setting up the environment arises? The issue is described here:

  The conflict is caused by:
1093
      The user requested openfisca-core 35.0.0 (from git+https://github.com/nikhilwoodruff/openfisca-core.git)
1094
      openfisca-uk 0.2.2 depends on openfisca-core 35.0.0 (from git+https://github.com/nikhilwoodruff/openfisca-core)

  ERROR: Cannot install -r /home/runner/work/OG-UK-Calibration/OG-UK-Calibration/condaenv.1lzvviqe.requirements.txt (line 5) and openfisca-core 35.0.0 (from git+https://github.com/nikhilwoodruff/openfisca-core.git) because these package versions have conflicting dependencies.
1128
  ERROR: ResolutionImpossible: for help visit https://pip.pypa.io/en/latest/user_guide/#fixing-conflicting-dependencies

rickecon · 2021-04-21T06:31:52Z

@jdebacker and @nikhilwoodruff. As @jdebacker notes above, the error states:

The conflict is caused by:
      The user requested openfisca-core 35.0.0 (from git+https://github.com/nikhilwoodruff/openfisca-core.git)
      openfisca-uk 0.2.2 depends on openfisca-core 35.0.0 (from git+https://github.com/nikhilwoodruff/openfisca-core)
  
  To fix this you could try to:
  1. loosen the range of package versions you've specified
  2. remove package versions to allow pip attempt to solve the dependency conflict

This is going to take some detective work to figure out what the conflict is. It sounds like it is a conflict between some package in our environment.yml and the openfisca-core 35.0.0.

I tried fixing the Python version in environment.yml to python==3.7.7 and removing the ability to accommodate Python 3.8 and 3.9 in setup.py in a PR that I submitted to @jdebacker's branch. But that gave the same error. That PR is now closed and not merged.

nikhilwoodruff · 2021-04-21T06:35:54Z

Thanks @rickecon and @jdebacker it's possible openfisca-uk has some lack of support (purely because of not specifying different package versions) for Python above 3.7 - I'll have a look and see if I can fix it. Not this - see below

nikhilwoodruff

@jdebacker @rickecon think I found the issue - I've seen it before in other places but only occasionally.

nikhilwoodruff · 2021-04-21T13:32:35Z

environment.yml

  - git+https://github.com/PSLmodels/OG-USA.git
+  - git+https://github.com/nikhilwoodruff/openfisca-core.git


@jdebacker I think this is causing the issue - the openfisca-uk requirements require:

- git+https://github.com/nikhilwoodruff/openfisca-core

rather than with the .git. It might be easier just to drop this requirement for the sake of clarity and let it be installed as an openfisca-uk dependency?

nikhilwoodruff · 2021-04-21T14:48:50Z

environment.yml

  - git+https://github.com/PSLmodels/OG-USA.git
+  - git+https://github.com/nikhilwoodruff/openfisca-core
+  - git+https://github.com/nikhilwoodruff/frs.git


Suggested change

- git+https://github.com/nikhilwoodruff/frs.git

- git+https://github.com/nikhilwoodruff/frs

nikhilwoodruff · 2021-04-21T14:49:00Z

environment.yml

  - git+https://github.com/PSLmodels/OG-USA.git
+  - git+https://github.com/nikhilwoodruff/openfisca-core
+  - git+https://github.com/nikhilwoodruff/frs.git
+  - git+https://github.com/PSLmodels/openfisca-uk.git


Suggested change

- git+https://github.com/PSLmodels/openfisca-uk.git

- git+https://github.com/PSLmodels/openfisca-uk

nikhilwoodruff · 2021-04-21T14:49:09Z

environment.yml

+  - git+https://github.com/nikhilwoodruff/openfisca-core
+  - git+https://github.com/nikhilwoodruff/frs.git
+  - git+https://github.com/PSLmodels/openfisca-uk.git
+  - git+https://github.com/PSLmodels/microdf.git


Suggested change

- git+https://github.com/PSLmodels/microdf.git

- git+https://github.com/PSLmodels/microdf

nikhilwoodruff

Looks like it's the same problem - maybe this just to be on the safe side?

nikhilwoodruff · 2021-04-21T15:09:16Z

Just changed the openfisca-uk dependency for microdf (pslmodels/... PSLmodels/...) which should at least fix the current error.

codecov-commenter · 2021-04-21T15:15:52Z

Codecov Report

❗ No coverage uploaded for pull request base (main@02cc204). Click here to learn what that means.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main       #2   +/-   ##
=======================================
  Coverage        ?   51.76%           
=======================================
  Files           ?        5           
  Lines           ?      736           
  Branches        ?        0           
=======================================
  Hits            ?      381           
  Misses          ?      355           
  Partials        ?        0

Flag	Coverage Δ
unittests	`51.76% <0.00%> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 02cc204...8b94be8. Read the comment docs.

jdebacker · 2021-04-21T15:24:52Z

Thanks @nikhilwoodruff, tests on 3.7 appear to pass now!

rickecon · 2021-04-21T15:29:19Z

og_uk_calibrate/txfunc.py

@@ -16,11 +16,12 @@
 from dask import delayed, compute
 import dask.multiprocessing
 import pickle
-from ogusa_calibrate import get_micro_data
+from og_uk_calibrate import get_micro_data
 import ogusa.parameter_plots as pp


@jdebacker. I make a point in Issue #9 to eventually move all parameter_plots functionality into the OG-UK-Calibration repo as is started in PR #3. But we don't need to do that right now for this PR.

rickecon · 2021-04-21T15:30:30Z

I have reviewed all the changes. This looks good to me. @jdebacker are you ready for me to merge this? Thanks, @nikhilwoodruff for the help.

jdebacker · 2021-04-21T16:07:12Z

@rickecon Yes, this PR is ready to merge. Thanks for reviewing!

jdebacker added 9 commits March 3, 2021 11:02

initial attempt to get micro data from openfisca-uk

5040603

add dependencies for openfisca-uk

977bcdf

clean up docstrings

9ef86d5

Merge remote-tracking branch 'upstream/main' into openfisca_data

4968360

black formatting

c1d99bc

sync with main branch

5bc36d8

format

d1cf663

add testing files

d5237ab

create tests for openfisca uk data

0aec0b2

rickecon mentioned this pull request Apr 19, 2021

LICENSE.md and OG-UK logo files #7

Merged

jdebacker added 6 commits April 18, 2021 22:28

update env

4601c26

remove unused depends

8d46611

add tests of get_micro_data.py

99ad5f8

only test against 3.7

b35a837

update tax function est

9a06e07

update expected values

dcb4272

jdebacker added 2 commits April 20, 2021 22:56

passing tests

fb0eec7

updated data for uk output

b014523

rickecon mentioned this pull request Apr 21, 2021

Take out python 3.8 and 3.9 from environment.yml and setup.py jdebacker/OG-UK#1

Closed

nikhilwoodruff reviewed Apr 21, 2021

View reviewed changes

update env

3d563f1

nikhilwoodruff reviewed Apr 21, 2021

View reviewed changes

jdebacker added 2 commits April 21, 2021 10:49

update env

7b2d6e0

update env

d1620b7

jdebacker marked this pull request as ready for review April 21, 2021 15:24

test on 3.8 and 3.9

8b94be8

rickecon mentioned this pull request Apr 21, 2021

Move ogusa/parameter_plots.py to og_uk_calibrate/parameter_plots.py #9

Open

rickecon reviewed Apr 21, 2021

View reviewed changes

rickecon merged commit 9b4d7ac into PSLmodels:main Apr 21, 2021

jdebacker mentioned this pull request Apr 21, 2021

Set up codecov #8

Closed

rickecon mentioned this pull request Apr 24, 2021

Update openfisca-uk usage #11

Merged

jdebacker mentioned this pull request Apr 26, 2021

Reintroduce Python 3.9 testing in build_and_test.yml #12

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OpenFisca-UK integration #2

OpenFisca-UK integration #2

jdebacker commented Mar 4, 2021

jdebacker commented Apr 20, 2021

rickecon commented Apr 21, 2021 •

edited

nikhilwoodruff commented Apr 21, 2021 •

edited

nikhilwoodruff left a comment

nikhilwoodruff Apr 21, 2021

nikhilwoodruff Apr 21, 2021

nikhilwoodruff Apr 21, 2021

nikhilwoodruff Apr 21, 2021

nikhilwoodruff left a comment

nikhilwoodruff commented Apr 21, 2021

codecov-commenter commented Apr 21, 2021 •

edited

jdebacker commented Apr 21, 2021

rickecon Apr 21, 2021

rickecon commented Apr 21, 2021

jdebacker commented Apr 21, 2021

		- git+https://github.com/PSLmodels/OG-USA.git
		- git+https://github.com/nikhilwoodruff/openfisca-core.git

	- git+https://github.com/PSLmodels/openfisca-uk.git
	- git+https://github.com/PSLmodels/openfisca-uk

	- git+https://github.com/PSLmodels/microdf.git
	- git+https://github.com/PSLmodels/microdf

OpenFisca-UK integration #2

OpenFisca-UK integration #2

Conversation

jdebacker commented Mar 4, 2021

jdebacker commented Apr 20, 2021

rickecon commented Apr 21, 2021 • edited

nikhilwoodruff commented Apr 21, 2021 • edited

nikhilwoodruff left a comment

Choose a reason for hiding this comment

nikhilwoodruff Apr 21, 2021

Choose a reason for hiding this comment

nikhilwoodruff Apr 21, 2021

Choose a reason for hiding this comment

nikhilwoodruff Apr 21, 2021

Choose a reason for hiding this comment

nikhilwoodruff Apr 21, 2021

Choose a reason for hiding this comment

nikhilwoodruff left a comment

Choose a reason for hiding this comment

nikhilwoodruff commented Apr 21, 2021

codecov-commenter commented Apr 21, 2021 • edited

Codecov Report

jdebacker commented Apr 21, 2021

rickecon Apr 21, 2021

Choose a reason for hiding this comment

rickecon commented Apr 21, 2021

jdebacker commented Apr 21, 2021

rickecon commented Apr 21, 2021 •

edited

nikhilwoodruff commented Apr 21, 2021 •

edited

codecov-commenter commented Apr 21, 2021 •

edited