v1 => v2 && Py3 #2
Conversation
| @@ -1255,8 +1255,8 @@ | |||
| "input": [ | |||
| "def func(url):\n", | |||
| " # Basic function that doesn't do any caching\n", | |||
| " import urllib2\n", | |||
| " return urllib2.urlopen(url).read()\n", | |||
| " from six.moves.urllib import request\n", | |||
There was a problem hiding this comment.
chose to use six and to maintain py2 since, well, what the heck.
|
|
||
| kw = {} | ||
| if sys.version_info >= (3,): | ||
| kw["use_2to3"] = True | ||
|
|
||
| setup( |
There was a problem hiding this comment.
tsk tsk, trailing whitespace. Sorry about that, had no idea.
| from indicators import IndicatorAPI, IndicatorDataset | ||
| from climate import ClimateAPI, InstrumentalDataset, ModelledDataset | ||
| from wbpy.indicators import IndicatorAPI, IndicatorDataset | ||
| from wbpy.climate import ClimateAPI, InstrumentalDataset, ModelledDataset |
There was a problem hiding this comment.
need fully qualified paths to get this working in py3
| """ | ||
|
|
||
| BASE_URL = "http://api.worldbank.org/" | ||
| BASE_URL = "http://api.worldbank.org/v2/" |
There was a problem hiding this comment.
le big change for v1 => v2
| @@ -18,7 +18,7 @@ class TestFetchFn(unittest.TestCase): | |||
| def setUp(self): | |||
| # The response contains non-ascii characters, so encoding can be tested | |||
| # against different python versions. | |||
| self.url = "http://api.worldbank.org/topic?format=json&" | |||
| self.url = "http://api.worldbank.org/v2/topic?format=json&" | |||
There was a problem hiding this comment.
hidden again over here...
|
@bcipolli this is excellent, thanks! I'll just test that it works and then will look at merging and doing a new PyPI release. I won't be able to get to it today but aiming for this week. |
|
@bcipolli have just had a look at this and it all seems good - tests pass, the example code still works, etc. Thanks for taking the time to fix it up. I'm gonna merge and then update a few things - the tox versions, sane versions in requirements.txt, add CI, etc. and then will release a new version to PyPI. I'll give credit in the README that you were responsible for updating this. Will also provide commit access in case you ever need to fix anything. |
|
@bcipolli I've released a v3.0 to pypi. Meant to do it last weekend but couldn't get to it. It includes your PR here, and also a change I made to be compatible with pycountry, which has had a couple of breaking changes over the last few years - one to rename alpha fields like alpha2 and alpha3 to alpha_2 and alpha_3, and one change to a I've temporarily dropped support for python2 and I was running into compatibility issues with some dev dependencies. I'm open to adding it back later if there is a need for it. Let me know if you run into any problems. |
So, two big changes to the world:
Did my best. We're using this in production :)