From 38d204ad90c5977167059d7efccfd2457c8dadd0 Mon Sep 17 00:00:00 2001 From: hugovk Date: Wed, 25 Feb 2015 15:03:54 +0200 Subject: [PATCH 01/18] Release checklist --- RELEASING.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 RELEASING.md diff --git a/RELEASING.md b/RELEASING.md new file mode 100644 index 0000000..9715b5e --- /dev/null +++ b/RELEASING.md @@ -0,0 +1,26 @@ +# Release Checklist + +* [ ] Get master to the appropriate code release state. [Travis CI](https://travis-ci.org/pylast/pylast) should be running cleanly for all merges to master. +* [ ] Update version in `pylast/__init__.py` and `setup.py` and commit: +```bash +git add pylast/__init__.py setup.py +git commit -m "Release 1.1.0" +``` +* [ ] Tag the last commit with the version number: +```bash +git tag -a 1.1.0 +``` +* [ ] Release on PyPI: +```bash +python setup.py register +python setup.py sdist --format=gztar upload +``` +* [ ] Push: `git push` +* [ ] Push tags: `git push --tags` +* [ ] Create new GitHub release: https://github.com/pylast/pylast/releases/new +* [ ] Update develop branch from master: +```bash +git checkout develop +git merge master --ff-only +git push +``` From 816be1cbe8cd50c7775cb61ac8fe9ad8d95a1a93 Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 12 Apr 2015 12:54:22 +0300 Subject: [PATCH 02/18] Rerun flaky interation tests --- README.md | 2 +- tests/test_pylast.py | 2 ++ tox.ini | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 36bd8f5..77b16eb 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ export PYLAST_API_SECRET=TODO_ENTER_YOURS_HERE To run all unit and integration tests: ```sh -pip install pytest +pip install pytest flaky py.test ``` diff --git a/tests/test_pylast.py b/tests/test_pylast.py index 37695bf..8962ef3 100755 --- a/tests/test_pylast.py +++ b/tests/test_pylast.py @@ -2,6 +2,7 @@ """ Integration (not unit) tests for pylast.py """ +from flaky import flaky import os import pytest from random import choice @@ -30,6 +31,7 @@ def load_secrets(): return doc +@flaky class TestPyLast(unittest.TestCase): secrets = None diff --git a/tox.ini b/tox.ini index 28796b2..ec0e215 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ deps = mock ipdb pytest-cov + flaky commands = py.test -v --cov pylast --cov-report term-missing {posargs} [testenv:venv] @@ -28,4 +29,4 @@ commands = pyflakes tests pep8 pylast pep8 tests - ./clonedigger.sh \ No newline at end of file + ./clonedigger.sh From 4f2871f504afa4fb0041c481dfa877255f88f7ea Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 12 Apr 2015 15:47:00 +0300 Subject: [PATCH 03/18] pep8 fixes --- pylast/__init__.py | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/pylast/__init__.py b/pylast/__init__.py index c0d700b..f7fe250 100644 --- a/pylast/__init__.py +++ b/pylast/__init__.py @@ -20,12 +20,6 @@ # # http://code.google.com/p/pylast/ -__version__ = '1.1.0' -__author__ = 'Amr Hassan, hugovk' -__copyright__ = "Copyright (C) 2008-2010 Amr Hassan, 2013-2014 hugovk" -__license__ = "apache2" -__email__ = 'amr.hassan@gmail.com' - import hashlib from xml.dom import minidom import xml.dom @@ -36,9 +30,14 @@ import sys import collections import warnings import re - import six +__version__ = '1.1.0' +__author__ = 'Amr Hassan, hugovk' +__copyright__ = "Copyright (C) 2008-2010 Amr Hassan, 2013-2014 hugovk" +__license__ = "apache2" +__email__ = 'amr.hassan@gmail.com' + def _deprecation_warning(message): warnings.warn(message, DeprecationWarning) @@ -834,13 +833,13 @@ class LastFMNetwork(_Network): name="Last.fm", homepage="http://last.fm", ws_server=("ws.audioscrobbler.com", "/2.0/"), - api_key = api_key, - api_secret = api_secret, - session_key = session_key, - submission_server = "http://post.audioscrobbler.com:80/", - username = username, - password_hash = password_hash, - domain_names = { + api_key=api_key, + api_secret=api_secret, + session_key=session_key, + submission_server="http://post.audioscrobbler.com:80/", + username=username, + password_hash=password_hash, + domain_names={ DOMAIN_ENGLISH: 'www.last.fm', DOMAIN_GERMAN: 'www.lastfm.de', DOMAIN_SPANISH: 'www.lastfm.es', @@ -854,7 +853,7 @@ class LastFMNetwork(_Network): DOMAIN_JAPANESE: 'www.lastfm.jp', DOMAIN_CHINESE: 'cn.last.fm', }, - urls = { + urls={ "album": "music/%(artist)s/%(album)s", "artist": "music/%(artist)s", "event": "event/%(id)s", @@ -930,13 +929,13 @@ class LibreFMNetwork(_Network): name="Libre.fm", homepage="http://alpha.libre.fm", ws_server=("alpha.libre.fm", "/2.0/"), - api_key = api_key, - api_secret = api_secret, - session_key = session_key, - submission_server = "http://turtle.libre.fm:80/", - username = username, - password_hash = password_hash, - domain_names = { + api_key=api_key, + api_secret=api_secret, + session_key=session_key, + submission_server="http://turtle.libre.fm:80/", + username=username, + password_hash=password_hash, + domain_names={ DOMAIN_ENGLISH: "alpha.libre.fm", DOMAIN_GERMAN: "alpha.libre.fm", DOMAIN_SPANISH: "alpha.libre.fm", @@ -950,7 +949,7 @@ class LibreFMNetwork(_Network): DOMAIN_JAPANESE: "alpha.libre.fm", DOMAIN_CHINESE: "alpha.libre.fm", }, - urls = { + urls={ "album": "artist/%(artist)s/album/%(album)s", "artist": "artist/%(artist)s", "event": "event/%(id)s", From 0b691de78938826709d98545845c58c51f645f9c Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 12 Apr 2015 15:47:22 +0300 Subject: [PATCH 04/18] Remove unused import --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index 71a0dda..2173f52 100755 --- a/setup.py +++ b/setup.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -import os - from setuptools import setup, find_packages From 16f12a02c90d8bb5b522cfe0447bd0c3ad8179a0 Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 12 Apr 2015 16:06:34 +0300 Subject: [PATCH 05/18] Run fast lint job first --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5c0f5be..2cfaab8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,12 +10,12 @@ env: - secure: CQYL7MH6tSVrCcluIfWfDSTo4E/p+9pF0eI7Vtf0oaZBzyulODHK8h/mzJp4HwezyfOu0RCedq6sloGQr1/29CvWWESaYyoGoGz9Mz2ZS+MpIcjGISfZa+x4vSp6QPFvd4i/1Z/1j2gJVVyswkrIVUwZIDJtfAKzZI5iHx2gH8Y= - secure: SsKJoJwtDVWrL5xxl9C/gTRy6FhfRQQNNAFOogl9mTs/WeI2t9QTYoKsxLPXOdoRdu4MvT3h/B2sjwggt7zP81fBVxQRTkg4nq0zSHlj0NqclbFa6I5lUYdGwH9gPk/HWJJwXhKRDsqn/iRw2v+qBDs/j3kIgPQ0yjM58LEPXic= matrix: + - TOXENV=lint - TOXENV=py27 - TOXENV=py33 - TOXENV=py34 - TOXENV=pypy - TOXENV=pypy3 - - TOXENV=lint sudo: false install: - travis_retry pip install tox From 404f48be1e6e5adfdd3258f6d3dd5d6b71f5600d Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 12 Apr 2015 19:23:32 +0300 Subject: [PATCH 06/18] Badges: master -> develop, hugovk -> pylast [CI skip] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 77b16eb..d95d09d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ pyLast ====== -[![Build Status](https://travis-ci.org/pylast/pylast.png?branch=master)](https://travis-ci.org/pylast/pylast) [![PyPI version](https://pypip.in/version/pylast/badge.svg)](https://pypi.python.org/pypi/pylast/) [![PyPI downloads](https://pypip.in/download/pylast/badge.svg)](https://pypi.python.org/pypi/pylast/) [![Coverage Status](https://coveralls.io/repos/pylast/pylast/badge.png?branch=master)](https://coveralls.io/r/pylast/pylast?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/hugovk/pylast/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/hugovk/pylast/?branch=master) [![Code Health](https://landscape.io/github/hugovk/pylast/master/landscape.svg)](https://landscape.io/github/hugovk/pylast/master) +[![Build Status](https://travis-ci.org/pylast/pylast.svg?branch=develop)](https://travis-ci.org/pylast/pylast) [![PyPI version](https://pypip.in/version/pylast/badge.svg)](https://pypi.python.org/pypi/pylast/) [![PyPI downloads](https://pypip.in/download/pylast/badge.svg)](https://pypi.python.org/pypi/pylast/) [![Coverage Status](https://coveralls.io/repos/pylast/pylast/badge.png?branch=develop)](https://coveralls.io/r/pylast/pylast?branch=develop) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/pylast/pylast/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/pylast/pylast/?branch=develop) [![Code Health](https://landscape.io/github/pylast/pylast/develop/landscape.svg)](https://landscape.io/github/hugovk/pylast/develop) A Python interface to [Last.fm](http://www.last.fm/) and other api-compatible websites such as [Libre.fm](http://libre.fm/). From a6f209a3f91c0b37afa048935b81b043e778970b Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 12 Apr 2015 19:37:53 +0300 Subject: [PATCH 07/18] Remove unused argument --- pylast/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pylast/__init__.py b/pylast/__init__.py index f7fe250..da5cb5e 100644 --- a/pylast/__init__.py +++ b/pylast/__init__.py @@ -4038,7 +4038,7 @@ def _extract(node, name, index=0): return None -def _extract_element_tree(node, index=0): +def _extract_element_tree(node): """Extract an element tree into a multi-level dictionary NB: If any elements have text nodes as well as nested From f13c94abe8cec029bc569b8fdb0c4a63cada7139 Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 12 Apr 2015 19:39:19 +0300 Subject: [PATCH 08/18] Don't redefine built-in --- pylast/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pylast/__init__.py b/pylast/__init__.py index da5cb5e..6076d42 100644 --- a/pylast/__init__.py +++ b/pylast/__init__.py @@ -4197,13 +4197,13 @@ class BadSessionError(ScrobblingError): class _ScrobblerRequest(object): - def __init__(self, url, params, network, type="POST"): + def __init__(self, url, params, network, request_type="POST"): for key in params: params[key] = str(params[key]) self.params = params - self.type = type + self.type = request_type (self.hostname, self.subdir) = url_split_host(url[len("http:"):]) self.network = network From b36762b0f0e6182449b3bb02c48f6d25da29740d Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 12 Apr 2015 19:51:11 +0300 Subject: [PATCH 09/18] Add licence [CI skip] --- LICENSE.txt | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..8dada3e --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From 4597514317b8ad9b983f4e3b9cfcce838ca4aaf1 Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 12 Apr 2015 19:55:48 +0300 Subject: [PATCH 10/18] 2015 --- pylast/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pylast/__init__.py b/pylast/__init__.py index 6076d42..fe6873e 100644 --- a/pylast/__init__.py +++ b/pylast/__init__.py @@ -4,7 +4,7 @@ # A Python interface to Last.fm (and other API compatible social networks) # # Copyright 2008-2010 Amr Hassan -# Copyright 2013-2014 hugovk +# Copyright 2013-2015 hugovk # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ import six __version__ = '1.1.0' __author__ = 'Amr Hassan, hugovk' -__copyright__ = "Copyright (C) 2008-2010 Amr Hassan, 2013-2014 hugovk" +__copyright__ = "Copyright (C) 2008-2010 Amr Hassan, 2013-2015 hugovk" __license__ = "apache2" __email__ = 'amr.hassan@gmail.com' From be8ae40caf444a0af8a5f1a986783fef99f281ea Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 26 Apr 2015 20:10:24 +0300 Subject: [PATCH 11/18] Failing test for #124 --- tests/test_pylast.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/test_pylast.py b/tests/test_pylast.py index 8962ef3..e3581b9 100755 --- a/tests/test_pylast.py +++ b/tests/test_pylast.py @@ -1101,6 +1101,14 @@ class TestPyLast(unittest.TestCase): # Assert self.helper_only_one_thing_in_top_list(tags, pylast.Tag) + def test_network_get_top_tags_with_no_limit(self): + # Arrange + # Act + tags = self.network.get_top_tags() + + # Assert + self.helper_at_least_one_thing_in_top_list(tags, pylast.Tag) + def test_network_get_top_tracks_with_limit(self): # Arrange # Act From 926c01a97e9ca6c82e948d20cbc068f75591bc64 Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 26 Apr 2015 20:11:49 +0300 Subject: [PATCH 12/18] Don't compare with limit if limit is None. Fixes #124. --- pylast/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pylast/__init__.py b/pylast/__init__.py index fe6873e..51bb5a1 100644 --- a/pylast/__init__.py +++ b/pylast/__init__.py @@ -396,7 +396,7 @@ class _Network(object): seq = [] for node in doc.getElementsByTagName("tag"): - if len(seq) >= limit: + if limit and len(seq) >= limit: break tag = Tag(_extract(node, "name"), self) weight = _number(_extract(node, "count")) From 97ec6f84fc72c35d7ae84838a1ce8f565e18ebc1 Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 26 Apr 2015 20:14:09 +0300 Subject: [PATCH 13/18] Add EditorConfig --- .editorconfig | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..de5533f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,13 @@ +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 + +# 4 space indentation +[*.py] +indent_size = 4 +indent_style = space From 88a74273a0d852ae3b7888c2017849305caeef22 Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 26 Apr 2015 21:26:21 +0300 Subject: [PATCH 14/18] Sometimes Last.fm returns an error for dates[1]: No chart available for this user/date-range combination --- tests/test_pylast.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_pylast.py b/tests/test_pylast.py index e3581b9..ee14679 100755 --- a/tests/test_pylast.py +++ b/tests/test_pylast.py @@ -1236,7 +1236,7 @@ class TestPyLast(unittest.TestCase): self.helper_dates_valid(dates) # Act/Assert - self.helper_get_assert_charts(lastfm_user, dates[1]) + self.helper_get_assert_charts(lastfm_user, dates[0]) def test_track_top_fans(self): # Arrange From e26b542bec72a70ce53a5eb26a07bdeae08024e5 Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 26 Apr 2015 22:18:58 +0300 Subject: [PATCH 15/18] Retry failures up to four times, require at least one pass --- tests/test_pylast.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_pylast.py b/tests/test_pylast.py index ee14679..1574d13 100755 --- a/tests/test_pylast.py +++ b/tests/test_pylast.py @@ -31,7 +31,7 @@ def load_secrets(): return doc -@flaky +@flaky(max_runs=5, min_passes=1) class TestPyLast(unittest.TestCase): secrets = None From 5dcf8a2f70bc46ddf684abacc94033897c745333 Mon Sep 17 00:00:00 2001 From: hugovk Date: Mon, 27 Apr 2015 21:21:20 +0300 Subject: [PATCH 16/18] Remove commented function --- pylast/__init__.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pylast/__init__.py b/pylast/__init__.py index 51bb5a1..76459ee 100644 --- a/pylast/__init__.py +++ b/pylast/__init__.py @@ -192,19 +192,6 @@ class _Network(object): self.session_key = sk_gen.get_session_key( self.username, self.password_hash) - """def __repr__(self): - attributes = ("name", "homepage", "ws_server", "api_key", "api_secret", - "session_key", "submission_server", "username", "password_hash", - "domain_names", "urls") - - text = "pylast._Network(%s)" - args = [] - for attr in attributes: - args.append("=".join((attr, repr(getattr(self, attr))))) - - return text % ", ".join(args) - """ - def __str__(self): return "%s Network" % self.name From 615bccb227bcf67b7b95873e6c11df63608df678 Mon Sep 17 00:00:00 2001 From: hugovk Date: Mon, 27 Apr 2015 21:41:16 +0300 Subject: [PATCH 17/18] Remove artist.getImages and depracation note --- pylast/__init__.py | 8 -------- tests/test_pylast.py | 13 ------------- 2 files changed, 21 deletions(-) diff --git a/pylast/__init__.py b/pylast/__init__.py index 76459ee..45d627b 100644 --- a/pylast/__init__.py +++ b/pylast/__init__.py @@ -2077,14 +2077,6 @@ class Artist(_BaseObject, _Taggable): return self.network._get_url( domain_name, "artist") % {'artist': artist} - def get_images(self, order=IMAGES_ORDER_POPULARITY, limit=None): - """ - The artist.getImages method has been deprecated by Last.fm. - """ - raise WSError( - self.network, "27", - "The artist.getImages method has been deprecated by Last.fm.") - def shout(self, message): """ Post a shout diff --git a/tests/test_pylast.py b/tests/test_pylast.py index 1574d13..7a3f736 100755 --- a/tests/test_pylast.py +++ b/tests/test_pylast.py @@ -36,11 +36,6 @@ class TestPyLast(unittest.TestCase): secrets = None - # To remove Python 3's - # "DeprecationWarning: Please use assertRaisesRegex instead" - if sys.version_info[0] == 2: - assertRaisesRegex = unittest.TestCase.assertRaisesRegexp - def unix_timestamp(self): return int(time.time()) @@ -762,14 +757,6 @@ class TestPyLast(unittest.TestCase): # Assert self.assertEqual(name, "Last.fm Network") - def test_artist_get_images_deprecated(self): - # Arrange - artist = self.network.get_artist("Test Artist") - - # Act/Assert - with self.assertRaisesRegex(pylast.WSError, 'deprecated'): - artist.get_images() - def helper_validate_results(self, a, b, c): # Assert self.assertIsNotNone(a) From 4437508e0f5571a72312a881923ddca1d42c9638 Mon Sep 17 00:00:00 2001 From: hugovk Date: Tue, 28 Apr 2015 23:14:36 +0300 Subject: [PATCH 18/18] Remove unused import --- tests/test_pylast.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_pylast.py b/tests/test_pylast.py index 7a3f736..1980e7a 100755 --- a/tests/test_pylast.py +++ b/tests/test_pylast.py @@ -6,7 +6,6 @@ from flaky import flaky import os import pytest from random import choice -import sys import time import unittest