Skip to content

Commit

Permalink
Merge pull request #27 from lehinevych/v1.1.3
Browse files Browse the repository at this point in the history
V1.1.3
  • Loading branch information
lehinevych authored Jul 13, 2018
2 parents 5e6b444 + dfb6e52 commit f1484f6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 20 deletions.
7 changes: 2 additions & 5 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,11 @@ Contents:

changelog

Master
=======

* Add `category member <https://www.mediawiki.org/wiki/API:Categorymembers>`_ query support by `PR #24 <https://github.com/lehinevych/MediaWikiAPI/pull/24>`_

Version 1.1.2
Version 1.1.3
=============

* Add `category member <https://www.mediawiki.org/wiki/API:Categorymembers>`_ query support by `PR #24 <https://github.com/lehinevych/MediaWikiAPI/pull/24>`_
* Add backlinks to WikipediaPage `PR #22 <https://github.com/lehinevych/MediaWikiAPI/pull/22>`_
* Fix missing self reference `PR #11 <https://github.com/lehinevych/MediaWikiAPI/pull/11>`_ by @danielunderwood
* Fix dependencies installable from setup.py `PR #12 <https://github.com/lehinevych/MediaWikiAPI/pull/12>`_ by @danielunderwood
Expand Down
2 changes: 1 addition & 1 deletion mediawikiapi/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.1.2"
__version__ = "1.1.3"
18 changes: 4 additions & 14 deletions tests/request_mock_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,7 @@
},

"data": {
"celtuce.content": """Celtuce (/ˈsɛlt.əs/) (Lactuca sativa var. augustana, angustata, or asparagina), also called stem lettuce, celery lettuce, asparagus lettuce, or Chinese lettuce, is a cultivar of lettuce grown primarily for its thick stem, or its leaves. It is used as a vegetable, and is especially popular in Taiwan, and China, where it is called wosun, (Chinese: 莴笋; pinyin: wōsǔn), or woju (Chinese: 莴苣; pinyin: wōjù) (although the latter name may also be used to mean lettuce in general). In the south of China, it is also called (Chinese: 油麦菜; pinyin: yóu mài cài) or ‘ou sen’.
The pale green leaves, which are tender, and white stems, can be eaten raw (in salads) or cooked. It can be pickled, grilled, roasted, or stir-fried. It is mild but nutty, with a slight smoky aftertaste. It is high in vitamins.
It is thought to have originated in the Mediterranean region and then brought to China during Tang Dynasty, about A.D. 600-900.
It can be grown from seed, sown from April and May. Into a set bed or a temporary nursery bed and then transplanted to the growing site. They should be spread 30 cm apart each way. The young (edible) leaves are ready about 4–5 weeks after planting and the edible stems are ready when about 30 cm tall, they are usually harvested between July and September.
The plant can suffer from aphid attack.
"celtuce.content": """Celtuce (/ˈsɛlt.əs/) (Lactuca sativa var. augustana, angustata, or asparagina), also called stem lettuce, celery lettuce, asparagus lettuce, or Chinese lettuce, is a cultivar of lettuce grown primarily for its thick stem, or its leaves. It is used as a vegetable, and is especially popular in Taiwan, and China, where it is called wosun, (Chinese: 莴笋; pinyin: wōsǔn), or woju (Chinese: 莴苣; pinyin: wōjù) (although the latter name may also be used to mean lettuce in general). In the south of China, it is also called (Chinese: 油麦菜; pinyin: yóu mài cài) or ‘ou sen’.The pale green leaves, which are tender, and white stems, can be eaten raw (in salads) or cooked. It can be pickled, grilled, roasted, or stir-fried. It is mild but nutty, with a slight smoky aftertaste. It is high in vitamins.It is thought to have originated in the Mediterranean region and then brought to China during Tang Dynasty, about A.D. 600-900.It can be grown from seed, sown from April and May. Into a set bed or a temporary nursery bed and then transplanted to the growing site. They should be spread 30 cm apart each way. The young (edible) leaves are ready about 4–5 weeks after planting and the edible stems are ready when about 30 cm tall, they are usually harvested between July and September.The plant can suffer from aphid attack.
The stem is usually harvested at a length of around 15–20 cm and a diameter of around 3–4 cm. It is crisp, moist, and mildly flavored, and typically prepared by slicing and then stir frying with more strongly flavored ingredients.
Expand All @@ -248,11 +244,7 @@

"celtuce.revid": 838056332,

"celtuce.summary": """Celtuce (/ˈsɛlt.əs/) (Lactuca sativa var. augustana, angustata, or asparagina), also called stem lettuce, celery lettuce, asparagus lettuce, or Chinese lettuce, is a cultivar of lettuce grown primarily for its thick stem, or its leaves. It is used as a vegetable, and is especially popular in Taiwan, and China, where it is called wosun, (Chinese: 莴笋; pinyin: wōsǔn), or woju (Chinese: 莴苣; pinyin: wōjù) (although the latter name may also be used to mean lettuce in general). In the south of China, it is also called (Chinese: 油麦菜; pinyin: yóu mài cài) or ‘ou sen’.
The pale green leaves, which are tender, and white stems, can be eaten raw (in salads) or cooked. It can be pickled, grilled, roasted, or stir-fried. It is mild but nutty, with a slight smoky aftertaste. It is high in vitamins.
It is thought to have originated in the Mediterranean region and then brought to China during Tang Dynasty, about A.D. 600-900.
It can be grown from seed, sown from April and May. Into a set bed or a temporary nursery bed and then transplanted to the growing site. They should be spread 30 cm apart each way. The young (edible) leaves are ready about 4–5 weeks after planting and the edible stems are ready when about 30 cm tall, they are usually harvested between July and September.
The plant can suffer from aphid attack.
"celtuce.summary": """Celtuce (/ˈsɛlt.əs/) (Lactuca sativa var. augustana, angustata, or asparagina), also called stem lettuce, celery lettuce, asparagus lettuce, or Chinese lettuce, is a cultivar of lettuce grown primarily for its thick stem, or its leaves. It is used as a vegetable, and is especially popular in Taiwan, and China, where it is called wosun, (Chinese: 莴笋; pinyin: wōsǔn), or woju (Chinese: 莴苣; pinyin: wōjù) (although the latter name may also be used to mean lettuce in general). In the south of China, it is also called (Chinese: 油麦菜; pinyin: yóu mài cài) or ‘ou sen’.The pale green leaves, which are tender, and white stems, can be eaten raw (in salads) or cooked. It can be pickled, grilled, roasted, or stir-fried. It is mild but nutty, with a slight smoky aftertaste. It is high in vitamins.It is thought to have originated in the Mediterranean region and then brought to China during Tang Dynasty, about A.D. 600-900.It can be grown from seed, sown from April and May. Into a set bed or a temporary nursery bed and then transplanted to the growing site. They should be spread 30 cm apart each way. The young (edible) leaves are ready about 4–5 weeks after planting and the edible stems are ready when about 30 cm tall, they are usually harvested between July and September.The plant can suffer from aphid attack.
The stem is usually harvested at a length of around 15–20 cm and a diameter of around 3–4 cm. It is crisp, moist, and mildly flavored, and typically prepared by slicing and then stir frying with more strongly flavored ingredients.""",

Expand All @@ -279,9 +271,7 @@
== Meteorological history ==
On August 8, a tropical wave emerged from the west coast of Africa and entered the Atlantic Ocean. Tracking toward the west, the depression began to exhibit signs of convective organization on August 11. The system continued to develop, and it is estimated that Tropical Depression Ten formed at 1200 UTC on August 13. At the time, it was located about 1,600 miles (2,600 km) east of Barbados. Upon its designation, the depression consisted of a large area of thunderstorm activity, with curved banding features and expanding outflow. The environmental conditions were predicted to quickly become unfavorable, however. The depression moved erratically and slowly towards the west, and wind shear inhibited any significant intensification. Late on August 13, it was "beginning to look like Irene-junior as it undergoes southwesterly mid-level shear beneath the otherwise favorable upper-level outflow pattern". The wind shear was expected to relent within 48 hours, prompting some forecast models to suggest the depression would eventually attain hurricane status.
By early August 14, the shear had substantially disrupted the storm, leaving the low-level center of circulation exposed from the area of convection, which was also deteriorating. After meandering, the storm began to move westward. Forecasters expected it to resume a northwestward track as high pressure to the south of Bermuda was forecast to weaken and another high was predicted to form southwest of the Azores. By 1800 UTC on August 14, the strong shear had further weakened the storm, and it no longer met the criteria for a tropical cyclone. It degenerated into a remnant low, and the National Hurricane Center issued their final advisory on the cyclone. Moving westward, it occasionally produced bursts of convective activity, before dissipating on August 18.
Tropical Depression Twelve formed over the southeastern Bahamas at 2100 UTC on August 23, partially from the remains of Tropical Depression Ten. While the normal standards for numbering tropical depressions in the Atlantic stipulate that the initial designation be retained when a depression regenerates, satellite imagery indicated that a second tropical wave had combined with Tropical Depression Ten north of Puerto Rico to form a new, more complex weather system, which was then designated as Tropical Depression Twelve. In post-season reanalysis, it was found that the low-level circulation of Tropical Depression Ten had completely detached and dissipated; only the remnant mid-level circulation moved on and merged with the second tropical wave. As a result, the criteria for keeping the same name and identity were not met. Tropical Depression Twelve later became Hurricane Katrina.
On August 8, a tropical wave emerged from the west coast of Africa and entered the Atlantic Ocean. Tracking toward the west, the depression began to exhibit signs of convective organization on August 11. The system continued to develop, and it is estimated that Tropical Depression Ten formed at 1200 UTC on August 13. At the time, it was located about 1,600 miles (2,600 km) east of Barbados. Upon its designation, the depression consisted of a large area of thunderstorm activity, with curved banding features and expanding outflow. The environmental conditions were predicted to quickly become unfavorable, however. The depression moved erratically and slowly towards the west, and wind shear inhibited any significant intensification. Late on August 13, it was "beginning to look like Irene-junior as it undergoes southwesterly mid-level shear beneath the otherwise favorable upper-level outflow pattern". The wind shear was expected to relent within 48 hours, prompting some forecast models to suggest the depression would eventually attain hurricane status.By early August 14, the shear had substantially disrupted the storm, leaving the low-level center of circulation exposed from the area of convection, which was also deteriorating. After meandering, the storm began to move westward. Forecasters expected it to resume a northwestward track as high pressure to the south of Bermuda was forecast to weaken and another high was predicted to form southwest of the Azores. By 1800 UTC on August 14, the strong shear had further weakened the storm, and it no longer met the criteria for a tropical cyclone. It degenerated into a remnant low, and the National Hurricane Center issued their final advisory on the cyclone. Moving westward, it occasionally produced bursts of convective activity, before dissipating on August 18.Tropical Depression Twelve formed over the southeastern Bahamas at 2100 UTC on August 23, partially from the remains of Tropical Depression Ten. While the normal standards for numbering tropical depressions in the Atlantic stipulate that the initial designation be retained when a depression regenerates, satellite imagery indicated that a second tropical wave had combined with Tropical Depression Ten north of Puerto Rico to form a new, more complex weather system, which was then designated as Tropical Depression Twelve. In post-season reanalysis, it was found that the low-level circulation of Tropical Depression Ten had completely detached and dissipated; only the remnant mid-level circulation moved on and merged with the second tropical wave. As a result, the criteria for keeping the same name and identity were not met. Tropical Depression Twelve later became Hurricane Katrina.
== Impact ==
Expand All @@ -308,7 +298,7 @@

"cyclone.parentid": 832709771,

"cyclone.summary": 'Tropical Depression Ten was a short-lived and weak tropical cyclone that was the tenth system of the record-breaking 2005 Atlantic hurricane season. It formed on August 13 from a tropical wave that emerged from the west coast of Africa on August 8. As a result of strong wind shear, the depression remained weak and did not strengthen beyond tropical depression status. It degenerated on August 14, although its remnants partially contributed to the formation of the tropical depression that eventually became Hurricane Katrina. Thus, it is often referred to as "the precursor to Katrina". The cyclone had no effect on land, and did not directly result in any fatalities or damage.',
"cyclone.summary": """Tropical Depression Ten was a short-lived and weak tropical cyclone that was the tenth system of the record-breaking 2005 Atlantic hurricane season. It formed on August 13 from a tropical wave that emerged from the west coast of Africa on August 8. As a result of strong wind shear, the depression remained weak and did not strengthen beyond tropical depression status. It degenerated on August 14, although its remnants partially contributed to the formation of the tropical depression that eventually became Hurricane Katrina. Thus, it is often referred to as "the precursor to Katrina". The cyclone had no effect on land, and did not directly result in any fatalities or damage.""",

"cyclone.images": ['https://upload.wikimedia.org/wikipedia/commons/8/89/Cyclone_Catarina_from_the_ISS_on_March_26_2004.JPG', 'https://upload.wikimedia.org/wikipedia/commons/7/7d/Tropical_Depression_10_%282005%29.png', 'https://upload.wikimedia.org/wikipedia/commons/a/a5/10-L_2005_track.png', 'https://upload.wikimedia.org/wikipedia/commons/3/37/People_icon.svg', 'https://upload.wikimedia.org/wikipedia/en/4/4a/Commons-logo.svg', 'https://upload.wikimedia.org/wikipedia/commons/4/47/Sound-icon.svg', 'https://upload.wikimedia.org/wikipedia/commons/8/89/Symbol_book_class2.svg', 'https://upload.wikimedia.org/wikipedia/en/e/e7/Cscr-featured.svg', 'https://upload.wikimedia.org/wikipedia/en/4/48/Folder_Hexagonal_Icon.svg', 'https://upload.wikimedia.org/wikipedia/commons/3/33/Tropical_Depression_Ten_%282005%29.ogg', 'https://upload.wikimedia.org/wikipedia/en/f/fd/Portal-puzzle.svg', 'https://upload.wikimedia.org/wikipedia/commons/e/e0/2005_Atlantic_hurricane_season_summary_map.png'],

Expand Down

0 comments on commit f1484f6

Please sign in to comment.