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.

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

IEA #97

Merged
merged 2 commits into from
Nov 16, 2021
Merged

IEA #97

merged 2 commits into from
Nov 16, 2021

Conversation

Kajwan
Copy link
Contributor

@Kajwan Kajwan commented Nov 10, 2021

Added IEA classification.

@konstantinstadler
Copy link
Member

Fantastic. Thanks a lot. Any tests you could add?

@Kajwan
Copy link
Contributor Author

Kajwan commented Nov 11, 2021

What kind of tests are you thinking?

@konstantinstadler
Copy link
Member

In test_functionality.py you find some example (e.g. test_fao_number_codes).
The idea here is to make sure that the column header works for all entries in the tsv. Just some examples to ensure full functionality.

Please remove vscode (put in gitignore).

sorry, i need to better explain the contribution. The branch "release_test" is an internal branch for testing release to pypi (to pypitesting). A change to master would be highly appreciate, but I can also solve on my side.

I might wait for the merge one or two days, I want to show Mohammed and Candy how this works (thanks for the example 👏🏽 ) ; unless you need that urgently

@Kajwan
Copy link
Contributor Author

Kajwan commented Nov 16, 2021

Ah I see.
I don't really have any testing to do. Only issue might be if IEA increases their country resolution, and a region is therefore mistakenly added to an aggregate region (Other Africa, Other non-OECD Asia, or Other non-OECD Americas) instead of itself. However, I don't see how I can test that without having the IEA data available.

What do you mean by "Please remove vscode (put in gitignore)". It should already be in .gitignore?

I am no sure if you would like me to do anything now? Should I make a pull request to the master branch or will you do that yourself at some point? And how should I interpret the build error above? Something I should worry about or is that fine?

@konstantinstadler konstantinstadler changed the base branch from release_test to master November 16, 2021 10:53
@konstantinstadler konstantinstadler merged commit 2d3886f into IndEcol:master Nov 16, 2021
@konstantinstadler
Copy link
Member

thanks a lot 👍🏽

konstantinstadler added a commit that referenced this pull request Aug 3, 2022
* update changelog

* added link to example script for parsing data

* vscode ignore in gitignore

* Mamba GitHub actions (#98)

- switched github actions to development and production
- testing on different os

* IEA (#97)

* added IEA classification

* Added IEA to README.rst

Co-authored-by: Kajwan Rasul <[email protected]>

* fixed country data missing NA

* updated CHANGELOG for new release

* updated CHANGELOG for new release

* new version

* Added EXIOBASE 3 letter codes (#100)

Added 3 letter codes for EXIOBASE 1, 2 and 3 with various test cases

Co-authored-by: Konstantin Stadler <[email protected]>

* IEA update and bug fix (#109)

* wrapped spec_name in re.escape()

allows for countries to have names with regular expression characters, such as parenthesis or dots.

* bug in pd max_rows

Returned 'Pattern matched multiple keys' option error

* ran black properly now

Co-authored-by: Kajwan Rasul <[email protected]>

* update changelog

* pump version

* pump version

* Changed to Türkiye and North Macedonia - fix #110

* Fix Bassas Da India - fix #111

* black formating

* Add oecd dac (closes #101) (#102)

* Added OECD DAC code classification to country_data.tsv

* Add DACcode to README.rst

* Add DACcode test to test_functionality.py

* update test_functionality.py

Missing white space at 662 for black test to pass successfully

* Update country_data.tsv

* Update country_data.tsv

* N Korea match North Korea #95

* Converted md files to rst

* Allow regex in ISO2 - fix #92

* rerun notebooks

* regex for iso

* changelog and new version test

* removed rst from links

* fix markdown render for pypi

Co-authored-by: Kajwan <[email protected]>
Co-authored-by: Kajwan Rasul <[email protected]>
Co-authored-by: Mohamed Badr <[email protected]>
Co-authored-by: Jorge Rivera <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants