Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-agate-lookup for
openSUSE:Factory checked in at 2021-05-21 21:50:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-agate-lookup (Old)
and /work/SRC/openSUSE:Factory/.python-agate-lookup.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-agate-lookup"
Fri May 21 21:50:19 2021 rev:2 rq:894791 version:0.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-agate-lookup/python-agate-lookup.changes
2018-05-29 16:47:54.781448451 +0200
+++
/work/SRC/openSUSE:Factory/.python-agate-lookup.new.2988/python-agate-lookup.changes
2021-05-21 21:50:33.402099111 +0200
@@ -1,0 +2,8 @@
+Fri May 21 08:34:07 UTC 2021 - [email protected]
+
+- emphasize that tests are online only
+- use github tarball
+- deleted sources
+ - COPYING (not needed)
+
+-------------------------------------------------------------------
Old:
----
COPYING
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-agate-lookup.spec ++++++
--- /var/tmp/diff_new_pack.SDsVAr/_old 2021-05-21 21:50:33.814097405 +0200
+++ /var/tmp/diff_new_pack.SDsVAr/_new 2021-05-21 21:50:33.818097388 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-agate-lookup
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,8 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
@@ -22,19 +23,19 @@
Release: 0
License: MIT
Summary: Remote lookup tables for agate
-Url: http://agate-lookup.readthedocs.org/
+URL: http://agate-lookup.readthedocs.org/
Group: Development/Languages/Python
-Source:
https://files.pythonhosted.org/packages/source/a/agate-lookup/agate-lookup-%{version}.tar.gz
-Source10:
https://raw.githubusercontent.com/wireservice/agate-lookup/%{version}/COPYING
+Source:
https://github.com/wireservice/agate-lookup/archive/refs/tags/%{version}.tar.gz#/agate-lookup-%{version}.tar.gz
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-%if %{with test}
+# SECTION test requirements
BuildRequires: %{python_module agate >= 1.5.0}
BuildRequires: %{python_module PyYAML >= 3.11}
+BuildRequires: %{python_module pytest}
BuildRequires: %{python_module requests >= 2.9.1}
-%endif
+# /SECTION
Requires: python-agate >= 1.5.0
Requires: python-PyYAML >= 3.11
Requires: python-requests >= 2.9.1
@@ -47,7 +48,6 @@
%prep
%setup -q -n agate-lookup-%{version}
-cp %{SOURCE10} .
sed -i -e '/^#!\//, 1d' agatelookup/*.py
%build
@@ -57,10 +57,9 @@
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
-%if %{with test}
%check
-%python_exec setup.py test
-%endif
+# online tests
+#%%pytest
%files %{python_files}
%defattr(-,root,root,-)
++++++ agate-lookup-0.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/.gitignore
new/agate-lookup-0.3.1/.gitignore
--- old/agate-lookup-0.3.1/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.1/.gitignore 2016-12-19 23:10:55.000000000 +0100
@@ -0,0 +1,12 @@
+.DS_Store
+*.pyc
+*.swp
+*.swo
+.tox
+*.egg-info
+docs/_build
+dist
+.coverage
+build
+.proof
+.test.png
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/.travis.yml
new/agate-lookup-0.3.1/.travis.yml
--- old/agate-lookup-0.3.1/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.1/.travis.yml 2016-12-19 23:10:55.000000000 +0100
@@ -0,0 +1,12 @@
+language: python
+python:
+ - "2.7"
+ - "3.3"
+ - "3.4"
+ - "3.5"
+# command to install dependencies
+install:
+ - if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then pip install -r
requirements-py3.txt; else pip install -r requirements-py2.txt; fi
+# command to run tests
+script: nosetests tests
+sudo: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/AUTHORS.rst
new/agate-lookup-0.3.1/AUTHORS.rst
--- old/agate-lookup-0.3.1/AUTHORS.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.1/AUTHORS.rst 2016-12-19 23:10:55.000000000 +0100
@@ -0,0 +1,3 @@
+The following individuals have contributed code to agate-lookup:
+
+* `Christopher Groskopf <https://github.com/onyxfish>`_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/CHANGELOG.rst
new/agate-lookup-0.3.1/CHANGELOG.rst
--- old/agate-lookup-0.3.1/CHANGELOG.rst 1970-01-01 01:00:00.000000000
+0100
+++ new/agate-lookup-0.3.1/CHANGELOG.rst 2016-12-19 23:10:55.000000000
+0100
@@ -0,0 +1,37 @@
+0.3.1 - December 19, 2016
+-------------------------
+
+* Add missing module.
+
+0.3.0 - December 19, 2016
+-------------------------
+
+* Remove monkeypatching pattern.
+* Upgrade required agate to ``1.5.0``.
+
+0.2.1 - March 9, 2016
+---------------------
+
+* Reorganize docs.
+* Add caching to docs.
+* Reversed order of source and table keys in lookup method.
+
+0.2.0 - March 8, 2016
+---------------------
+
+* Update to latest `lookup` metadata format.
+* Implement local caching for offline usage. (#14)
+* Remove options to :class:`Source` for generating custom file paths.
+
+0.1.1 - March 8, 2016
+---------------------
+
+* Added CPI calculation example to docs.
+* Improvements to error handling.
+* Fetched lookup tables now automatically have row names assigned.
+* :meth:`TableLookup.from_table` class method implemented.
+
+0.1.0 - February 28, 2016
+-------------------------
+
+* Initial version.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/COPYING
new/agate-lookup-0.3.1/COPYING
--- old/agate-lookup-0.3.1/COPYING 1970-01-01 01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.1/COPYING 2016-12-19 23:10:55.000000000 +0100
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2016 Christopher Groskopf and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/PKG-INFO
new/agate-lookup-0.3.1/PKG-INFO
--- old/agate-lookup-0.3.1/PKG-INFO 2016-12-19 23:11:30.000000000 +0100
+++ new/agate-lookup-0.3.1/PKG-INFO 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-Metadata-Version: 1.1
-Name: agate-lookup
-Version: 0.3.1
-Summary: agate-lookup adds remote lookup tables to agate.
-Home-page: http://agate-lookup.readthedocs.org/
-Author: Christopher Groskopf
-Author-email: [email protected]
-License: MIT
-Description: .. image:: https://travis-ci.org/wireservice/agate-lookup.png
- :target: https://travis-ci.org/wireservice/agate-lookup
- :alt: Build status
-
- .. image:: https://img.shields.io/pypi/dw/agate-lookup.svg
- :target: https://pypi.python.org/pypi/agate-lookup
- :alt: PyPI downloads
-
- .. image:: https://img.shields.io/pypi/v/agate-lookup.svg
- :target: https://pypi.python.org/pypi/agate-lookup
- :alt: Version
-
- .. image:: https://img.shields.io/pypi/l/agate-lookup.svg
- :target: https://pypi.python.org/pypi/agate-lookup
- :alt: License
-
- .. image:: https://img.shields.io/pypi/pyversions/agate-lookup.svg
- :target: https://pypi.python.org/pypi/agate-lookup
- :alt: Support Python versions
-
- agate-lookup adds one-line access to `lookup
<https://github.com/wireservice/lookup>`_ tables to `agate
<https://github.com/wireservice/agate>`_.
-
- Important links:
-
- * agate http://agate.rtfd.org
- * Documentation: http://agate-lookup.rtfd.org
- * Repository: https://github.com/wireservice/agate-lookup
- * Issues: https://github.com/wireservice/agate-lookup/issues
-
-Platform: UNKNOWN
-Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Multimedia :: Graphics
-Classifier: Topic :: Scientific/Engineering :: Information Analysis
-Classifier: Topic :: Scientific/Engineering :: Visualization
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/agate_lookup.egg-info/PKG-INFO
new/agate-lookup-0.3.1/agate_lookup.egg-info/PKG-INFO
--- old/agate-lookup-0.3.1/agate_lookup.egg-info/PKG-INFO 2016-12-19
23:11:30.000000000 +0100
+++ new/agate-lookup-0.3.1/agate_lookup.egg-info/PKG-INFO 1970-01-01
01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-Metadata-Version: 1.1
-Name: agate-lookup
-Version: 0.3.1
-Summary: agate-lookup adds remote lookup tables to agate.
-Home-page: http://agate-lookup.readthedocs.org/
-Author: Christopher Groskopf
-Author-email: [email protected]
-License: MIT
-Description: .. image:: https://travis-ci.org/wireservice/agate-lookup.png
- :target: https://travis-ci.org/wireservice/agate-lookup
- :alt: Build status
-
- .. image:: https://img.shields.io/pypi/dw/agate-lookup.svg
- :target: https://pypi.python.org/pypi/agate-lookup
- :alt: PyPI downloads
-
- .. image:: https://img.shields.io/pypi/v/agate-lookup.svg
- :target: https://pypi.python.org/pypi/agate-lookup
- :alt: Version
-
- .. image:: https://img.shields.io/pypi/l/agate-lookup.svg
- :target: https://pypi.python.org/pypi/agate-lookup
- :alt: License
-
- .. image:: https://img.shields.io/pypi/pyversions/agate-lookup.svg
- :target: https://pypi.python.org/pypi/agate-lookup
- :alt: Support Python versions
-
- agate-lookup adds one-line access to `lookup
<https://github.com/wireservice/lookup>`_ tables to `agate
<https://github.com/wireservice/agate>`_.
-
- Important links:
-
- * agate http://agate.rtfd.org
- * Documentation: http://agate-lookup.rtfd.org
- * Repository: https://github.com/wireservice/agate-lookup
- * Issues: https://github.com/wireservice/agate-lookup/issues
-
-Platform: UNKNOWN
-Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Multimedia :: Graphics
-Classifier: Topic :: Scientific/Engineering :: Information Analysis
-Classifier: Topic :: Scientific/Engineering :: Visualization
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/agate_lookup.egg-info/SOURCES.txt
new/agate-lookup-0.3.1/agate_lookup.egg-info/SOURCES.txt
--- old/agate-lookup-0.3.1/agate_lookup.egg-info/SOURCES.txt 2016-12-19
23:11:30.000000000 +0100
+++ new/agate-lookup-0.3.1/agate_lookup.egg-info/SOURCES.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-README.rst
-setup.cfg
-setup.py
-agate_lookup.egg-info/PKG-INFO
-agate_lookup.egg-info/SOURCES.txt
-agate_lookup.egg-info/dependency_links.txt
-agate_lookup.egg-info/requires.txt
-agate_lookup.egg-info/top_level.txt
-agatelookup/__init__.py
-agatelookup/source.py
-agatelookup/table.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/agate-lookup-0.3.1/agate_lookup.egg-info/dependency_links.txt
new/agate-lookup-0.3.1/agate_lookup.egg-info/dependency_links.txt
--- old/agate-lookup-0.3.1/agate_lookup.egg-info/dependency_links.txt
2016-12-19 23:11:30.000000000 +0100
+++ new/agate-lookup-0.3.1/agate_lookup.egg-info/dependency_links.txt
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/agate-lookup-0.3.1/agate_lookup.egg-info/requires.txt
new/agate-lookup-0.3.1/agate_lookup.egg-info/requires.txt
--- old/agate-lookup-0.3.1/agate_lookup.egg-info/requires.txt 2016-12-19
23:11:30.000000000 +0100
+++ new/agate-lookup-0.3.1/agate_lookup.egg-info/requires.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-agate>=1.5.0
-requests>=2.9.1
-pyyaml>=3.11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/agate-lookup-0.3.1/agate_lookup.egg-info/top_level.txt
new/agate-lookup-0.3.1/agate_lookup.egg-info/top_level.txt
--- old/agate-lookup-0.3.1/agate_lookup.egg-info/top_level.txt 2016-12-19
23:11:30.000000000 +0100
+++ new/agate-lookup-0.3.1/agate_lookup.egg-info/top_level.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-agatelookup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/docs/Makefile
new/agate-lookup-0.3.1/docs/Makefile
--- old/agate-lookup-0.3.1/docs/Makefile 1970-01-01 01:00:00.000000000
+0100
+++ new/agate-lookup-0.3.1/docs/Makefile 2016-12-19 23:10:55.000000000
+0100
@@ -0,0 +1,130 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS =
+SPHINXBUILD = sphinx-build
+PAPER =
+BUILDDIR = _build
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp
epub latex latexpdf text man changes linkcheck doctest
+
+help:
+ @echo "Please use \`make <target>' where <target> is one of"
+ @echo " html to make standalone HTML files"
+ @echo " dirhtml to make HTML files named index.html in directories"
+ @echo " singlehtml to make a single large HTML file"
+ @echo " pickle to make pickle files"
+ @echo " json to make JSON files"
+ @echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " qthelp to make HTML files and a qthelp project"
+ @echo " devhelp to make HTML files and a Devhelp project"
+ @echo " epub to make an epub"
+ @echo " latex to make LaTeX files, you can set PAPER=a4 or
PAPER=letter"
+ @echo " latexpdf to make LaTeX files and run them through pdflatex"
+ @echo " text to make text files"
+ @echo " man to make manual pages"
+ @echo " changes to make an overview of all changed/added/deprecated
items"
+ @echo " linkcheck to check all external links for integrity"
+ @echo " doctest to run all doctests embedded in the documentation
(if enabled)"
+
+clean:
+ -rm -rf $(BUILDDIR)/*
+
+html:
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+ @echo
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+ @echo
+ @echo "Build finished; now you can process the pickle files."
+
+json:
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+ @echo
+ @echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the"
\
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/agatelookup.qhcp"
+ @echo "To view the help file:"
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/agatelookup.qhc"
+
+devhelp:
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+ @echo "To view the help file:"
+ @echo "# mkdir -p $$HOME/.local/share/devhelp/agatelookup"
+ @echo "# ln -s $(BUILDDIR)/devhelp
$$HOME/.local/share/devhelp/agatelookup"
+ @echo "# devhelp"
+
+epub:
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+ @echo
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+ @echo "Run \`make' in that directory to run these through (pdf)latex" \
+ "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through pdflatex..."
+ make -C $(BUILDDIR)/latex all-pdf
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+ @echo
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+ @echo
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+changes:
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+ @echo "Testing of doctests in the sources finished, look at the " \
+ "results in $(BUILDDIR)/doctest/output.txt."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/docs/conf.py
new/agate-lookup-0.3.1/docs/conf.py
--- old/agate-lookup-0.3.1/docs/conf.py 1970-01-01 01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.1/docs/conf.py 2016-12-19 23:10:55.000000000 +0100
@@ -0,0 +1,225 @@
+# -*- coding: utf-8 -*-
+#
+# This file is execfile()d with the current directory set to its containing
dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import os
+import sys
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath('..'))
+
+# -- General configuration
-----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
+autodoc_member_order = 'bysource'
+
+intersphinx_mapping = {
+ 'python': ('http://docs.python.org/3.5/', None),
+ 'agate': ('http://agate.readthedocs.org/en/latest/', None)
+}
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'agate-lookup'
+copyright = u'2016, Christopher Groskopf'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.3.1'
+# The full version, including alpha/beta/rc tags.
+release = '0.3.1'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all
documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output
---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+if not on_rtd: # only import and set the theme if we're building docs locally
+ import sphinx_rtd_theme
+ html_theme = 'sphinx_rtd_theme'
+ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further. For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents. If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar. Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it. The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'agatelookupdoc'
+
+
+# -- Options for LaTeX output
--------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass
[howto/manual]).
+latex_documents = [
+ ('index', 'agate-lookup.tex', u'agate-lookup Documentation',
+ u'Christopher Groskopf', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output
--------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/docs/index.rst
new/agate-lookup-0.3.1/docs/index.rst
--- old/agate-lookup-0.3.1/docs/index.rst 1970-01-01 01:00:00.000000000
+0100
+++ new/agate-lookup-0.3.1/docs/index.rst 2016-12-19 23:10:55.000000000
+0100
@@ -0,0 +1,188 @@
+======================
+agate-lookup |release|
+======================
+
+.. include:: ../README.rst
+
+Install
+=======
+
+To install:
+
+.. code-block:: bash
+
+ pip install agate-lookup
+
+For details on development or supported platforms see the `agate documentation
<http://agate.readthedocs.org>`_.
+
+Import
+======
+
+agate-lookup is an agate `extension
<http://agate.readthedocs.org/en/latest/extensions.html>`_. To use it, first
import it and patch its functionality into agate:
+
+.. code-block:: python
+
+ import agate
+ import agatelookup
+
+Importing agate-lookup adds methods to :class:`agate.Table
<agate.table.Table>`.
+
+Basic lookup
+============
+
+agate-lookup allows you to join your tables to data from the `lookup
<https://github.com/wireservice/lookup>`_ project. The basic mechanism for
doing this is the :meth:`.TableLookup.lookup` method. For example, if you have
this table:
+
++---------+------+
+| company | usps |
++=========+======+
+| Walmart | AR |
++---------+------+
+| Exxon | TX |
++---------+------+
+| Chevron | CA |
++---------+------+
+
+You could add the state name to the table by running:
+
+.. code-block:: python
+
+ joined = table.lookup('usps', 'state')
+
+The resulting table would be:
+
++---------+------+------------+
+| company | usps | state |
++=========+======+============+
+| Walmart | AR | Arkansas |
++---------+------+------------+
+| Exxon | TX | Texas |
++---------+------+------------+
+| Chevron | CA | California |
++---------+------+------------+
+
+If your table has different keys from the lookup table, you can specify them
using the :code:`table_key` argument. For example, if your table had the column
name :code:`postal` then you could achieve the same result by running:
+
+.. code-block:: python
+
+ joined = table.lookup('postal', 'state', lookup_key='usps')
+
+Multi-column lookup
+===================
+
+Some lookup tables have multiple key columns, for example :code:`year` and
:code:`month`. To join to a table like this, pass a sequence of column names as
the first argument. For example, consider this table:
+
++-------+-------+
+| usps | year |
++=======+=======+
+| AZ | 1985 |
++-------+-------+
+| WY | 2014 |
++-------+-------+
+| SC | 1994 |
++-------+-------+
+
+We can join the population of the state for each year with this code:
+
+.. code-block:: python
+
+ joined = table.lookup(['usps', 'year'], 'population')
+
++-------+------+-------------+
+| usps | year | population |
++=======+======+=============+
+| AZ | 1985 | 3,183,538 |
++-------+------+-------------+
+| WY | 2014 | 584,153 |
++-------+------+-------------+
+| SC | 1994 | 3,705,397 |
++-------+------+-------------+
+
+Versioned lookup
+================
+
+Some lookup tables have several versions. For example, the NAICS business code
classification is revised every 5 years. You can also select a particular
version of the lookup table using the :code:`version` argument. To join the
:code:`2012` edition of the NAICS codes, you would run:
+
+.. code-block:: python
+
+ joined = table.lookup('naics', 'description', version='2012')
+
+Fetch a table without joining
+=============================
+
+You can also fetch a lookup table without joining it. For example, to get the
Consumer Price Index by year and month:
+
+.. code-block:: python
+
+ cpi = agate.Table.from_lookup(['year', 'month'], 'cpi')
+
++-------+-------+--------+
+| year | month | cpi |
++=======+=======+========+
+| 1947 | 1 | 21.48 |
++-------+-------+--------+
+| 1947 | 2 | 21.62 |
++-------+-------+--------+
+| 1947 | 3 | 22.00 |
++-------+-------+--------+
+| ... | ... | ... |
++-------+-------+--------+
+
+Lookup tables automatically have :code:`row_names` assigned. In this case the
row names are a tuple of :code:`(year, month)`. We can use this to quickly
calculate inflation-adjusted prices in another table.
+
+.. code-block:: python
+
+ BASE_CPI = cpi.rows[('2015', '12')]['cpi']
+
+ deflator = lambda r: r['price'] * cpi.rows[(r['year'], r['month'])]['cpi']
/ BASE_CPI)
+
+ adjusted = table.compute([
+ ('real_price', agate.Formula(agate.Number(), deflator)
+ ])
+
+The :code:`adjusted` table will now have a :code:`real_price` column with
prices in December, 2015 dollars.
+
+Using a custom repository
+=========================
+
+By default, agate-lookup will use the `wireservice/lookup
<https://github.com/wireservice/lookup>`_ repository of lookup tables. Look
there to see what key/value combinations and versions you can use with lookup.
+
+You can specify your own repository of lookup tables by constructing an
instance of :class:`.Source` and passing it into the
:meth:`.TableLookup.lookup` method.
+
+Caching
+=======
+
+Lookup tables are cached each time they are downloaded. The default cache
location is :code:`~/lookup`. In order to ensure you have the latest version,
tables are redownloaded each time that they are used, unless a network
connection can not be made. If there is a connection issue, the cached copy
will be read from disk.
+
+You can override the default caching location by creating a custom
:class:`Source` and passing the :code:`cache` argument.
+
+API
+===
+
+.. autofunction:: agatelookup.table.lookup
+
+.. autofunction:: agatelookup.table.from_lookup
+
+.. autoclass:: agatelookup.source.Source
+ :members:
+
+Authors
+=======
+
+.. include:: ../AUTHORS.rst
+
+Changelog
+=========
+
+.. include:: ../CHANGELOG.rst
+
+License
+=======
+
+.. include:: ../COPYING
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/example.py
new/agate-lookup-0.3.1/example.py
--- old/agate-lookup-0.3.1/example.py 1970-01-01 01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.1/example.py 2016-12-19 23:10:55.000000000 +0100
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+import agate
+import agatelookup
+
+# Simple
+table = agate.Table([
+ ('WA',),
+ ('VA',),
+ ('NE',)
+], ['usps'])
+
+joined = table.lookup('usps', 'state')
+
+joined.print_table()
+
+# Versioned
+table = agate.Table([
+ ('1111',),
+ ('313320',),
+ ('522310',)
+], ['naics'], [agate.Text()])
+
+joined = table.lookup('naics', 'description', version='2012')
+
+joined.print_table()
+
+# Multiple keys
+table = agate.Table([
+ ('AZ', '1985'),
+ ('WY', '2014'),
+ ('SC', '1994')
+], ['usps', 'year'], [agate.Text(), agate.Text()])
+
+table.print_table()
+
+joined = table.lookup(['usps', 'year'], 'population')
+
+joined.print_table()
+
+# Multiple keys 2
+table = agate.Table([
+ ('1985', '3'),
+ ('2007', '5'),
+ ('2011', '6')
+], ['year', 'month'], [agate.Text(), agate.Text()])
+
+joined = table.lookup(['year', 'month'], 'cpi')
+
+joined.print_table()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/examples/usps/state.csv
new/agate-lookup-0.3.1/examples/usps/state.csv
--- old/agate-lookup-0.3.1/examples/usps/state.csv 1970-01-01
01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.1/examples/usps/state.csv 2016-12-19
23:10:55.000000000 +0100
@@ -0,0 +1,58 @@
+usps,state
+AL,Alabama
+AK,Alaska
+AZ,Arizona
+AR,Arkansas
+CA,California
+CO,Colorado
+CT,Connecticut
+DE,Delaware
+DC,District of Columbia
+FL,Florida
+GA,Georgia
+HI,Hawaii
+ID,Idaho
+IL,Illinois
+IN,Indiana
+IA,Iowa
+KS,Kansas
+KY,Kentucky
+LA,Louisiana
+ME,Maine
+MD,Maryland
+MA,Massachusetts
+MI,Michigan
+MN,Minnesota
+MS,Mississippi
+MO,Missouri
+MT,Montana
+NE,Nebraska
+NV,Nevada
+NH,New Hampshire
+NJ,New Jersey
+NM,New Mexico
+NY,New York
+NC,North Carolina
+ND,North Dakota
+OH,Ohio
+OK,Oklahoma
+OR,Oregon
+PA,Pennsylvania
+RI,Rhode Island
+SC,South Carolina
+SD,South Dakota
+TN,Tennessee
+TX,Texas
+UT,Utah
+VT,Vermont
+VA,Virginia
+WA,Washington
+WV,West Virginia
+WI,Wisconsin
+WY,Wyoming
+AS,American Samoa
+GU,Guam
+MP,Northern Mariana Islands
+PR,Puerto Rico
+UM,U.S. Minor Outlying Islands
+VI,U.S. Virgin Islands
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/examples/usps/state.csv.yml
new/agate-lookup-0.3.1/examples/usps/state.csv.yml
--- old/agate-lookup-0.3.1/examples/usps/state.csv.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.1/examples/usps/state.csv.yml 2016-12-19
23:10:55.000000000 +0100
@@ -0,0 +1,13 @@
+data: United States Postal System state abbreviations and US state names
+version: N/A
+sources:
+ - United States Census Bureau, http://www.census.gov/geo/reference/ansi.html
+contributors:
+ - Christopher Groskopf <[email protected]>
+columns:
+ usps:
+ name: USPS state abbreviation
+ type: Text
+ state:
+ name: State name
+ type: Text
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/requirements-py2.txt
new/agate-lookup-0.3.1/requirements-py2.txt
--- old/agate-lookup-0.3.1/requirements-py2.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/agate-lookup-0.3.1/requirements-py2.txt 2016-12-19 23:10:55.000000000
+0100
@@ -0,0 +1,11 @@
+unittest2==0.5.1
+nose>=1.1.2
+tox>=1.3
+Sphinx>=1.2.2
+sphinx_rtd_theme>=0.1.6
+wheel>=0.24.0
+ordereddict>=1.1
+agate>=1.5.0
+requests>=2.9.1
+pyyaml>=3.11
+mock>=1.3.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/requirements-py3.txt
new/agate-lookup-0.3.1/requirements-py3.txt
--- old/agate-lookup-0.3.1/requirements-py3.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/agate-lookup-0.3.1/requirements-py3.txt 2016-12-19 23:10:55.000000000
+0100
@@ -0,0 +1,9 @@
+nose>=1.1.2
+tox>=1.3
+Sphinx>=1.2.2
+sphinx_rtd_theme>=0.1.6
+wheel>=0.24.0
+agate>=1.5.0
+requests>=2.9.1
+pyyaml>=3.11
+mock>=1.3.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/setup.cfg
new/agate-lookup-0.3.1/setup.cfg
--- old/agate-lookup-0.3.1/setup.cfg 2016-12-19 23:11:30.000000000 +0100
+++ new/agate-lookup-0.3.1/setup.cfg 2016-12-19 23:10:55.000000000 +0100
@@ -1,8 +1,2 @@
[bdist_wheel]
universal = 1
-
-[egg_info]
-tag_build =
-tag_date = 0
-tag_svn_revision = 0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/tests/test_source.py
new/agate-lookup-0.3.1/tests/test_source.py
--- old/agate-lookup-0.3.1/tests/test_source.py 1970-01-01 01:00:00.000000000
+0100
+++ new/agate-lookup-0.3.1/tests/test_source.py 2016-12-19 23:10:55.000000000
+0100
@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+# -*- coding: utf8 -*-
+
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
+
+import agate
+import agatelookup
+
+class TestSource(agate.AgateTestCase):
+ def setUp(self):
+ self.source = agatelookup.Source()
+
+ def test_get_metadata(self):
+ meta = self.source.get_metadata('usps', 'state')
+
+ self.assertIn('Census Bureau', meta['sources'][0])
+
+ def test_get_table(self):
+ table = self.source.get_table('usps', 'state')
+
+ self.assertColumnNames(table, ['usps', 'state'])
+ self.assertColumnTypes(table, [agate.Text, agate.Text])
+ self.assertSequenceEqual(table.row_names[:2], ['AL', 'AK'])
+
+ def test_get_table_multiple_keys(self):
+ table = self.source.get_table(['year', 'month'], 'cpi')
+ print(table)
+
+ self.assertColumnNames(table, ['year', 'month', 'cpi'])
+ self.assertColumnTypes(table, [agate.Text, agate.Text, agate.Number])
+ self.assertSequenceEqual(table.row_names[:2], [('1947', '1'), ('1947',
'2')])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/tests/test_table.py
new/agate-lookup-0.3.1/tests/test_table.py
--- old/agate-lookup-0.3.1/tests/test_table.py 1970-01-01 01:00:00.000000000
+0100
+++ new/agate-lookup-0.3.1/tests/test_table.py 2016-12-19 23:10:55.000000000
+0100
@@ -0,0 +1,150 @@
+#!/usr/bin/env python
+# -*- coding: utf8 -*-
+
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
+
+import agate
+import agatelookup
+import mock
+import requests
+
+class TestLookup(agate.AgateTestCase):
+ def setUp(self):
+ self._source = agatelookup.Source(cache=False)
+
+ def test_lookup(self):
+ rows = (
+ ('WA',),
+ ('VA',),
+ ('TX',)
+ )
+
+ column_names = ['usps']
+ column_types = [agate.Text()]
+
+ table = agate.Table(rows, column_names, column_types)
+
+ result = table.lookup('usps', 'state', source=self._source)
+
+ self.assertColumnNames(result, ['usps', 'state'])
+ self.assertColumnTypes(result, [agate.Text, agate.Text])
+
+ self.assertSequenceEqual(result.rows[1].values(), ['VA', 'Virginia'])
+
+ def test_lookup_key(self):
+ rows = (
+ ('WA',),
+ ('VA',),
+ ('TX',)
+ )
+
+ column_names = ['postal']
+ column_types = [agate.Text()]
+
+ table = agate.Table(rows, column_names, column_types)
+
+ result = table.lookup('postal', 'state', lookup_key='usps',
source=self._source)
+
+ self.assertColumnNames(result, ['postal', 'state'])
+ self.assertColumnTypes(result, [agate.Text, agate.Text])
+
+ self.assertSequenceEqual(result.rows[1].values(), ['VA', 'Virginia'])
+
+ def test_lookup_version(self):
+ rows = (
+ ('1111',),
+ ('313320',),
+ ('522310',)
+ )
+
+ column_names = ['naics']
+ column_types = [agate.Text()]
+
+ table = agate.Table(rows, column_names, column_types)
+
+ result = table.lookup('naics', 'description', version='2012',
source=self._source)
+
+ self.assertColumnNames(result, ['naics', 'description'])
+ self.assertColumnTypes(result, [agate.Text, agate.Text])
+
+ self.assertSequenceEqual(result.rows[1].values(), ['313320', 'Fabric
Coating Mills'])
+
+ def test_lookup_multiple_keys(self):
+ rows = (
+ ('AZ', '1985'),
+ ('WY', '2014'),
+ ('SC', '1994')
+ )
+
+ column_names = ['usps', 'year']
+ column_types = [agate.Text(), agate.Text()]
+
+ table = agate.Table(rows, column_names, column_types)
+
+ result = table.lookup(['usps', 'year'], 'population',
source=self._source)
+
+ self.assertColumnNames(result, ['usps', 'year', 'population'])
+ self.assertColumnTypes(result, [agate.Text, agate.Text, agate.Number])
+
+ self.assertSequenceEqual(result.rows[1].values(), ['WY', '2014',
584153])
+
+ def test_lookup_no_match(self):
+ rows = (
+ ('WA',),
+ ('VA',),
+ ('FA',)
+ )
+
+ column_names = ['usps']
+ column_types = [agate.Text()]
+
+ table = agate.Table(rows, column_names, column_types)
+
+ result = table.lookup('usps', 'state', source=self._source)
+
+ self.assertColumnNames(result, ['usps', 'state'])
+ self.assertColumnTypes(result, [agate.Text, agate.Text])
+
+ self.assertSequenceEqual(result.rows[2].values(), ['FA', None])
+
+ def test_lookup_require_match(self):
+ rows = (
+ ('WA',),
+ ('VA',),
+ ('FA',)
+ )
+
+ column_names = ['usps']
+ column_types = [agate.Text()]
+
+ table = agate.Table(rows, column_names, column_types)
+
+ with self.assertRaises(ValueError):
+ result = table.lookup('usps', 'state', require_match=True,
source=self._source)
+
+ def test_from_lookup(self):
+ table = agate.Table.from_lookup('usps', 'state')
+
+ self.assertColumnNames(table, ['usps', 'state'])
+ self.assertColumnTypes(table, [agate.Text, agate.Text])
+ self.assertSequenceEqual(table.rows[1].values(), ['AK', 'Alaska'])
+
+ def test_connection_fails(self):
+ with mock.patch.object(requests, 'get') as mock_method:
+ mock_method.side_effect = requests.ConnectionError
+
+ with self.assertRaises(RuntimeError):
+ agate.Table.from_lookup('usps', 'state', source=self._source)
+
+ def test_cache(self):
+ source = agatelookup.Source(cache='examples')
+
+ with mock.patch.object(requests, 'get') as mock_method:
+ mock_method.side_effect = requests.ConnectionError
+
+ table = agate.Table.from_lookup('usps', 'state', source=source)
+
+ self.assertColumnNames(table, ['usps', 'state'])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/tox.ini
new/agate-lookup-0.3.1/tox.ini
--- old/agate-lookup-0.3.1/tox.ini 1970-01-01 01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.1/tox.ini 2016-12-19 23:10:55.000000000 +0100
@@ -0,0 +1,29 @@
+[tox]
+envlist = py27,py33,py34,py35,pypy
+
+[testenv]
+deps=
+ nose>=1.1.2
+ six>=1.6.1
+ mock>=1.3.0
+commands=nosetests
+
+[testenv:py27]
+deps=
+ {[testenv]deps}
+
+[testenv:py33]
+deps=
+ {[testenv]deps}
+
+[testenv:py34]
+deps=
+ {[testenv:py33]deps}
+
+[testenv:py35]
+deps=
+ {[testenv:py33]deps}
+
+[testenv:pypy]
+deps=
+ {[testenv:py33]deps}
