IndEcol / pymrio

Multi-Regional Input-Output Analysis in Python.
http://pymrio.readthedocs.io/en/latest/
Other
154 stars 71 forks source link

Ghosh implementation for downstream scope 3 #136

Closed Beckebanze closed 3 months ago

Beckebanze commented 5 months ago

See issue #135 for more details.

With this PR the following is added/implemented:

konstantinstadler commented 4 months ago

Hi, there are some problems with pytest 8.*, can you change the line in the environment.yml file to - pytest >= 5.4.3, < 5.8.0 and then push again to the pr

Beckebanze commented 4 months ago

Thanks. I updated the environment.yml.

konstantinstadler commented 4 months ago

So the test run now, just one small problem with the formating. When you run the format_and_test from the route within your environment it should just format everything as it should be. If you are not on linux, you can run the lines of the files from the cml in windows.

I run it locally, and then all your tests pass

Beckebanze commented 4 months ago

Indeed. iomath.py was not yet correctly formatted in this PR. It apparently slipped through when I committed all formatting changes to my development branch.

konstantinstadler commented 4 months ago

There is still some black problems, do you use the same version ( black 24.2.0 ).. See also the details of the run

konstantinstadler commented 4 months ago

@Beckebanze : let me know if there are any issues

Beckebanze commented 3 months ago

Hi Konstantin,I had an unusually busy two weeks at work and I’m on vacation for a few days as off today.I have the impression that the problem is all about version conflicts. I will pick up trying to understand which ‘black’ versions do work and which don’t after my vacation. Best,FelixOn 12 Mar 2024, at 10:11, Konstantin Stadler @.***> wrote: @Beckebanze : let me know if there are any issues

—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were mentioned.Message ID: @.***>

konstantinstadler commented 3 months ago

Hi,

If you go into the CI run you see a section "list environment". There you find the versions of all packages used, for black: black 24.2.0 py39hf3d152e_0 conda-forge

Your changes pass the tests on my local machine as well - so yes, I guess it is just some annoying version conflict.. I am kind of pushing you to do that via a pull request so you are listed as an official contributor. But for now enjoy your holiday!

Beckebanze commented 3 months ago

There are indeed changes due to the new version of black in files that I haven’t touched. I used black 24.3.0 for the committed changes. On 19 Mar 2024, at 09:18, Konstantin Stadler @.***> wrote: Hi, If you go into the CI run you see a section "list environment". There you find the versions of all packages used, for black: black 24.2.0 py39hf3d152e_0 conda-forge Your changes pass the tests on my local machine as well - so yes, I guess it is just some annoying version conflict.. I am kind of pushing you to do that via a pull request so you are listed as an official contributor. But for now enjoy your holiday!

—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were mentioned.Message ID: @.***>

konstantinstadler commented 3 months ago

Fantastic to get that in!