Hello community, here is the log from the commit of package python-astral for openSUSE:Factory checked in at 2018-05-15 10:16:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-astral (Old) and /work/SRC/openSUSE:Factory/.python-astral.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-astral" Tue May 15 10:16:13 2018 rev:2 rq:607066 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-astral/python-astral.changes 2018-03-16 10:39:25.552949144 +0100 +++ /work/SRC/openSUSE:Factory/.python-astral.new/python-astral.changes 2018-05-15 10:34:39.885405474 +0200 @@ -1,0 +2,6 @@ +Mon May 14 13:20:23 UTC 2018 - [email protected] + +- update to version 1.6.1 + * minor fixes + +------------------------------------------------------------------- Old: ---- astral-1.6.tar.gz New: ---- astral-1.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-astral.spec ++++++ --- /var/tmp/diff_new_pack.UczG2S/_old 2018-05-15 10:34:40.577380060 +0200 +++ /var/tmp/diff_new_pack.UczG2S/_new 2018-05-15 10:34:40.581379913 +0200 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-astral -Version: 1.6 +Version: 1.6.1 Release: 0 Summary: Calculations for the position of the sun and moon License: Apache-2.0 ++++++ astral-1.6.tar.gz -> astral-1.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astral-1.6/LICENSE new/astral-1.6.1/LICENSE --- old/astral-1.6/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/astral-1.6.1/LICENSE 2017-05-22 11:33:06.000000000 +0200 @@ -0,0 +1,202 @@ + 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. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astral-1.6/MANIFEST.in new/astral-1.6.1/MANIFEST.in --- old/astral-1.6/MANIFEST.in 2018-01-22 17:25:05.000000000 +0100 +++ new/astral-1.6.1/MANIFEST.in 2018-03-15 13:15:13.000000000 +0100 @@ -2,3 +2,4 @@ include src/test/*.py global-exclude *.pyc include monkeypatch.py +include LICENSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astral-1.6/PKG-INFO new/astral-1.6.1/PKG-INFO --- old/astral-1.6/PKG-INFO 2018-02-22 17:51:58.000000000 +0100 +++ new/astral-1.6.1/PKG-INFO 2018-05-02 14:53:34.000000000 +0200 @@ -1,14 +1,26 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: astral -Version: 1.6 +Version: 1.6.1 Summary: Calculations for the position of the sun and moon. Home-page: https://github.com/sffjunkie/astral Author: Simon Kennedy Author-email: [email protected] License: Apache-2.0 +Project-URL: Documentation, https://astral.readthedocs.io/en/stable/index.html +Project-URL: Source, https://github.com/sffjunkie/astral +Project-URL: Issues, https://github.com/sffjunkie/astral/issues +Description-Content-Type: UNKNOWN Description: Astral ====== + |travis_status| |pypi_ver| + + .. |travis_status| image:: https://travis-ci.org/sffjunkie/astral.svg?branch=master + :target: https://travis-ci.org/sffjunkie/astral + + .. |pypi_ver| image:: https://img.shields.io/pypi/v/astral.svg + :target: https://pypi.org/project/astral/ + This is 'astral' a Python module which calculates * Times for various positions of the sun: dawn, sunrise, solar noon, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astral-1.6/README.rst new/astral-1.6.1/README.rst --- old/astral-1.6/README.rst 2018-01-24 13:20:36.000000000 +0100 +++ new/astral-1.6.1/README.rst 2018-03-20 14:22:25.000000000 +0100 @@ -1,6 +1,14 @@ Astral ====== +|travis_status| |pypi_ver| + +.. |travis_status| image:: https://travis-ci.org/sffjunkie/astral.svg?branch=master + :target: https://travis-ci.org/sffjunkie/astral + +.. |pypi_ver| image:: https://img.shields.io/pypi/v/astral.svg + :target: https://pypi.org/project/astral/ + This is 'astral' a Python module which calculates * Times for various positions of the sun: dawn, sunrise, solar noon, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astral-1.6/setup.cfg new/astral-1.6.1/setup.cfg --- old/astral-1.6/setup.cfg 2018-02-22 17:51:58.000000000 +0100 +++ new/astral-1.6.1/setup.cfg 2018-05-02 14:53:34.000000000 +0200 @@ -43,5 +43,4 @@ [egg_info] tag_build = tag_date = 0 -tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astral-1.6/setup.py new/astral-1.6.1/setup.py --- old/astral-1.6/setup.py 2018-02-22 15:35:18.000000000 +0100 +++ new/astral-1.6.1/setup.py 2018-05-02 14:00:57.000000000 +0200 @@ -19,12 +19,17 @@ long_description = description setup(name='astral', - version='1.6', + version='1.6.1', description=description, long_description=long_description, author='Simon Kennedy', author_email='[email protected]', url="https://github.com/sffjunkie/astral";, + project_urls={ + 'Documentation': 'https://astral.readthedocs.io/en/stable/index.html', + 'Source': 'https://github.com/sffjunkie/astral', + 'Issues': 'https://github.com/sffjunkie/astral/issues', + }, license='Apache-2.0', classifiers=[ "Intended Audience :: Developers", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astral-1.6/src/astral.py new/astral-1.6.1/src/astral.py --- old/astral-1.6/src/astral.py 2018-02-22 15:35:18.000000000 +0100 +++ new/astral-1.6.1/src/astral.py 2018-05-02 14:00:57.000000000 +0200 @@ -98,9 +98,9 @@ from urllib.parse import quote_plus try: - from urllib2 import urlopen, URLError + from urllib2 import URLError except ImportError: - from urllib.request import urlopen, URLError + from urllib.request import URLError try: import simplejson as json @@ -110,13 +110,13 @@ if sys.version_info[0] >= 3: ustr = str else: - ustr = unicode + ustr = unicode # pylint: disable=E0602 __all__ = ['Astral', 'Location', 'AstralGeocoder', 'GoogleGeocoder', 'AstralError'] -__version__ = "1.6" +__version__ = "1.6.1" __author__ = "Simon Kennedy <[email protected]>" SUN_RISING = 1 @@ -516,6 +516,7 @@ Iqaluit,Canada,63°44'N,68°31'W,America/Iqaluit,3 """ + class AstralError(Exception): """Astral base exception class""" @@ -1420,9 +1421,12 @@ self.cache = cache self.api_key = api_key self.geocache = {} - self._location_query_base = 'https://maps.googleapis.com/maps/api/geocode/json?address=%s&sensor=false' - self._timezone_query_base = 'https://maps.googleapis.com/maps/api/timezone/json?location=%f,%f×tamp=%d&sensor=false' - self._elevation_query_base = 'https://maps.googleapis.com/maps/api/elevation/json?locations=%f,%f&sensor=false' + self._location_query_base = ('https://maps.googleapis.com/maps/api/geocode/json' + '?address=%s&sensor=false') + self._timezone_query_base = ('https://maps.googleapis.com/maps/api/timezone/json?' + 'location=%f,%f×tamp=%d&sensor=false') + self._elevation_query_base = ('https://maps.googleapis.com/maps/api/elevation/json?' + 'locations=%f,%f&sensor=false') def __getitem__(self, key): if self.cache and key in self.geocache: @@ -1450,7 +1454,7 @@ url = self._location_query_base % quote_plus(key) if self.api_key: - url += '&key=%s'%self.api_key + url += '&key=%s' % self.api_key data = self._read_from_url(url) response = json.loads(data) if response['status'] == 'OK': @@ -1685,7 +1689,7 @@ noon = datetime.datetime(date.year, date.month, date.day, hour, minute, second) - noon = pytz.UTC.localize(noon) + noon = pytz.UTC.localize(noon) # pylint: disable=E1120 return noon @@ -1789,7 +1793,7 @@ midnight = datetime.datetime(date.year, date.month, date.day, hour, minute, second) - midnight = pytz.UTC.localize(midnight) + midnight = pytz.UTC.localize(midnight) # pylint: disable=E1120 return midnight @@ -2325,9 +2329,10 @@ sin2m = sin(mrad + mrad) sin3m = sin(mrad + mrad + mrad) - c = sinm * (1.914602 - juliancentury * \ - (0.004817 + 0.000014 * juliancentury)) + \ - sin2m * (0.019993 - 0.000101 * juliancentury) + sin3m * 0.000289 + c = sinm * (1.914602 - juliancentury * + (0.004817 + 0.000014 * juliancentury)) + \ + sin2m * (0.019993 - 0.000101 * juliancentury) + \ + sin3m * 0.000289 return c @@ -2470,7 +2475,7 @@ dt = datetime.datetime(date.year, date.month, date.day, hour, minute, second) - dt = pytz.UTC.localize(dt) + dt = pytz.UTC.localize(dt) # pylint: disable=E1120 return dt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/astral-1.6/src/test/test_GoogleGeocoder.py new/astral-1.6.1/src/test/test_GoogleGeocoder.py --- old/astral-1.6/src/test/test_GoogleGeocoder.py 2018-02-22 15:35:18.000000000 +0100 +++ new/astral-1.6.1/src/test/test_GoogleGeocoder.py 2018-02-27 11:32:37.000000000 +0100 @@ -4,28 +4,27 @@ from astral import GoogleGeocoder [email protected] -def test_GoogleLocator(): - locator = GoogleGeocoder() - l = locator['Eiffel Tower'] - assert l is not None - def read_contents(*names, **kwargs): return io.open( os.path.join(*names), encoding=kwargs.get("encoding", "utf8") ).read() -api_key = read_contents(os.path.dirname(__file__), '.api_key') [email protected] -def test_GoogleLocator_WithAPIKey(): - if api_key: - locator = GoogleGeocoder(api_key=api_key) - l = locator['Eiffel Tower'] - assert l is not None - else: - raise AssertionError('api_key not found') +try: + api_key = read_contents(os.path.dirname(__file__), '.api_key').strip() +except: + api_key = '' [email protected] [email protected](api_key != '', reason="api key file found") +def test_GoogleLocator(): + locator = GoogleGeocoder() + l = locator['Eiffel Tower'] + assert l is not None -if __name__ == '__main__': - test_GoogleLocator() [email protected] [email protected](api_key == '', reason="api key file not found") +def test_GoogleLocator_WithAPIKey(): + locator = GoogleGeocoder(api_key=api_key) + l = locator['Eiffel Tower'] + assert l is not None
