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 2023-07-03 17:42:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-agate-lookup (Old)
and /work/SRC/openSUSE:Factory/.python-agate-lookup.new.13546 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-agate-lookup"
Mon Jul 3 17:42:19 2023 rev:3 rq:1096316 version:0.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-agate-lookup/python-agate-lookup.changes
2021-05-21 21:50:33.402099111 +0200
+++
/work/SRC/openSUSE:Factory/.python-agate-lookup.new.13546/python-agate-lookup.changes
2023-07-03 17:42:21.764569271 +0200
@@ -1,0 +2,6 @@
+Sat Jul 1 20:30:03 UTC 2023 - Dirk Müller <dmuel...@suse.com>
+
+- update to 0.3.2:
+ * Use ``yaml.safe_load``.
+
+-------------------------------------------------------------------
Old:
----
agate-lookup-0.3.1.tar.gz
New:
----
agate-lookup-0.3.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-agate-lookup.spec ++++++
--- /var/tmp/diff_new_pack.OjA03E/_old 2023-07-03 17:42:22.524573745 +0200
+++ /var/tmp/diff_new_pack.OjA03E/_new 2023-07-03 17:42:22.528573769 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-agate-lookup
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_with test
Name: python-agate-lookup
-Version: 0.3.1
+Version: 0.3.2
Release: 0
License: MIT
Summary: Remote lookup tables for agate
++++++ agate-lookup-0.3.1.tar.gz -> agate-lookup-0.3.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/.github/workflows/ci.yml
new/agate-lookup-0.3.2/.github/workflows/ci.yml
--- old/agate-lookup-0.3.1/.github/workflows/ci.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.2/.github/workflows/ci.yml 2023-06-14
01:07:57.000000000 +0200
@@ -0,0 +1,19 @@
+name: CI
+on: [push, pull_request]
+jobs:
+ build:
+ if: github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name != github.repository
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [macos-latest, windows-latest, ubuntu-latest]
+ python-version: [3.7, 3.8, 3.9, '3.10', '3.11', pypy-3.7]
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with:
+ python-version: ${{ matrix.python-version }}
+ cache: pip
+ cache-dependency-path: setup.py
+ - run: pip install .[test]
+ - run: pytest --cov agatelookup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/.github/workflows/lint.yml
new/agate-lookup-0.3.2/.github/workflows/lint.yml
--- old/agate-lookup-0.3.1/.github/workflows/lint.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.2/.github/workflows/lint.yml 2023-06-14
01:07:57.000000000 +0200
@@ -0,0 +1,19 @@
+name: Lint
+on: [push, pull_request]
+env:
+ BASEDIR:
https://raw.githubusercontent.com/open-contracting/standard-maintenance-scripts/main
+jobs:
+ build:
+ if: github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name != github.repository
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with:
+ python-version: '3.10'
+ cache: pip
+ cache-dependency-path: setup.py
+ - run: pip install --upgrade check-manifest flake8 isort setuptools
+ - run: check-manifest
+ - run: flake8 .
+ - run: isort . --check-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/.gitignore
new/agate-lookup-0.3.2/.gitignore
--- old/agate-lookup-0.3.1/.gitignore 2016-12-19 23:10:55.000000000 +0100
+++ new/agate-lookup-0.3.2/.gitignore 2023-06-14 01:07:57.000000000 +0200
@@ -2,7 +2,6 @@
*.pyc
*.swp
*.swo
-.tox
*.egg-info
docs/_build
dist
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/.readthedocs.yaml
new/agate-lookup-0.3.2/.readthedocs.yaml
--- old/agate-lookup-0.3.1/.readthedocs.yaml 1970-01-01 01:00:00.000000000
+0100
+++ new/agate-lookup-0.3.2/.readthedocs.yaml 2023-06-14 01:07:57.000000000
+0200
@@ -0,0 +1,11 @@
+version: 2
+build:
+ os: ubuntu-20.04
+ tools:
+ python: "3.9"
+python:
+ install:
+ - path: .
+ - requirements: docs/requirements.txt
+sphinx:
+ fail_on_warning: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/.travis.yml
new/agate-lookup-0.3.2/.travis.yml
--- old/agate-lookup-0.3.1/.travis.yml 2016-12-19 23:10:55.000000000 +0100
+++ new/agate-lookup-0.3.2/.travis.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-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/CHANGELOG.rst
new/agate-lookup-0.3.2/CHANGELOG.rst
--- old/agate-lookup-0.3.1/CHANGELOG.rst 2016-12-19 23:10:55.000000000
+0100
+++ new/agate-lookup-0.3.2/CHANGELOG.rst 2023-06-14 01:07:57.000000000
+0200
@@ -1,3 +1,8 @@
+0.3.2 - June 13, 2023
+---------------------
+
+* Use ``yaml.safe_load``.
+
0.3.1 - December 19, 2016
-------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/MANIFEST.in
new/agate-lookup-0.3.2/MANIFEST.in
--- old/agate-lookup-0.3.1/MANIFEST.in 1970-01-01 01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.2/MANIFEST.in 2023-06-14 01:07:57.000000000 +0200
@@ -0,0 +1,11 @@
+include *.py
+include *.rst
+include COPYING
+recursive-include docs *.py
+recursive-include docs *.rst
+recursive-include docs *.txt
+recursive-include docs Makefile
+recursive-include examples *.csv
+recursive-include examples *.yml
+recursive-include tests *.py
+exclude .readthedocs.yaml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/README.rst
new/agate-lookup-0.3.2/README.rst
--- old/agate-lookup-0.3.1/README.rst 2016-12-19 23:10:55.000000000 +0100
+++ new/agate-lookup-0.3.2/README.rst 2023-06-14 01:07:57.000000000 +0200
@@ -1,5 +1,5 @@
-.. image:: https://travis-ci.org/wireservice/agate-lookup.png
- :target: https://travis-ci.org/wireservice/agate-lookup
+.. image:: https://github.com/wireservice/agate-lookup/workflows/CI/badge.svg
+ :target: https://github.com/wireservice/agate-lookup/actions
:alt: Build status
.. image:: https://img.shields.io/pypi/dw/agate-lookup.svg
@@ -22,7 +22,7 @@
Important links:
-* agate http://agate.rtfd.org
-* Documentation: http://agate-lookup.rtfd.org
+* agate https://agate.rtfd.org
+* Documentation: https://agate-lookup.rtfd.org
* Repository: https://github.com/wireservice/agate-lookup
* Issues: https://github.com/wireservice/agate-lookup/issues
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/agatelookup/__init__.py
new/agate-lookup-0.3.2/agatelookup/__init__.py
--- old/agate-lookup-0.3.1/agatelookup/__init__.py 2016-12-19
23:10:55.000000000 +0100
+++ new/agate-lookup-0.3.2/agatelookup/__init__.py 2023-06-14
01:07:57.000000000 +0200
@@ -1,4 +1,4 @@
#!/usr/bin/env python
-from agatelookup.source import Source
import agatelookup.table
+from agatelookup.source import Source
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/agatelookup/source.py
new/agate-lookup-0.3.2/agatelookup/source.py
--- old/agate-lookup-0.3.1/agatelookup/source.py 2016-12-19
23:10:55.000000000 +0100
+++ new/agate-lookup-0.3.2/agatelookup/source.py 2023-06-14
01:07:57.000000000 +0200
@@ -1,13 +1,13 @@
#!/usr/bin/env python
-import io
import os
import agate
-import six
import requests
+import six
import yaml
+
def make_table_path(keys, value, version=None):
"""
Generate a path to find a given lookup table.
@@ -15,7 +15,7 @@
if isinstance(keys, (list, tuple)):
keys = '/'.join(keys)
- path = '%s/%s' % (keys, value)
+ path = f'{keys}/{value}'
if version:
path += '.%s' % version
@@ -24,6 +24,7 @@
return path
+
def make_metadata_path(keys, value, version=None):
"""
Generate a path to find a given lookup table.
@@ -31,7 +32,7 @@
if isinstance(keys, (list, tuple)):
keys = '/'.join(keys)
- path = '%s/%s' % (keys, value)
+ path = f'{keys}/{value}'
if version:
path += '.%s' % version
@@ -40,6 +41,7 @@
return path
+
def make_type_tester(meta):
"""
Uses parsed lookup table metadata to create a :class:`.agate.TypeTester`
@@ -53,7 +55,8 @@
return agate.TypeTester(force=force)
-class Source(object):
+
+class Source:
"""
A reference to an archive of lookup tables. This is a remote location with
lookup table and metadata files at a known path structure.
@@ -64,7 +67,8 @@
A path in which to store cached copies of any tables that are used, so
they can continue to be used offline.
"""
- def __init__(self, root='http://wireservice.github.io/lookup',
cache='~/.lookup'):
+
+ def __init__(self, root='https://wireservice.github.io/lookup',
cache='~/.lookup'):
self._root = root
self._cache = os.path.expanduser(cache) if cache else None
@@ -76,7 +80,7 @@
cache_path = os.path.join(self._cache, path)
if os.path.exists(cache_path):
- with io.open(cache_path, encoding='utf-8') as f:
+ with open(cache_path, encoding='utf-8') as f:
text = f.read()
return text
@@ -95,7 +99,7 @@
if not os.path.exists(folder):
os.makedirs(folder)
- with io.open(cache_path, 'w', encoding='utf-8') as f:
+ with open(cache_path, 'w', encoding='utf-8') as f:
f.write(text)
def get_metadata(self, keys, value, version=None):
@@ -105,7 +109,7 @@
See :meth:`Source.get_table` for parameter details.
"""
path = make_metadata_path(keys, value, version)
- url = '%s/%s' % (self._root, path)
+ url = f'{self._root}/{path}'
try:
r = requests.get(url)
@@ -116,8 +120,8 @@
text = self._read_cache(path)
try:
- data = yaml.load(text)
- except:
+ data = yaml.safe_load(text)
+ except yaml.YAMLError:
raise ValueError('Failed to read or parse YAML at %s' % url)
return data
@@ -145,10 +149,10 @@
tester = make_type_tester(meta)
path = make_table_path(keys, value, version)
- url = '%s/%s' % (self._root, path)
+ url = f'{self._root}/{path}'
if agate.utils.issequence(keys):
- row_names = lambda r: tuple(r[k] for k in keys)
+ def row_names(r): return tuple(r[k] for k in keys)
else:
row_names = keys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/agatelookup/table.py
new/agate-lookup-0.3.2/agatelookup/table.py
--- old/agate-lookup-0.3.1/agatelookup/table.py 2016-12-19 23:10:55.000000000
+0100
+++ new/agate-lookup-0.3.2/agatelookup/table.py 2023-06-14 01:07:57.000000000
+0200
@@ -10,6 +10,7 @@
DEFAULT_SOURCE = Source()
+
def lookup(self, key, value, lookup_key=None, version=None, source=None,
require_match=False):
"""
Fetch a lookup table from the remote source, matches it this table by
@@ -48,6 +49,7 @@
return self.join(table, key, lookup_key, require_match=require_match)
+
def from_lookup(cls, lookup_key, value, version=None, source=None):
"""
Fetch a lookup table, but don't join it to anything. See
@@ -58,5 +60,6 @@
return source.get_table(lookup_key, value, version)
+
agate.Table.lookup = lookup
agate.Table.from_lookup = classmethod(from_lookup)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/docs/conf.py
new/agate-lookup-0.3.2/docs/conf.py
--- old/agate-lookup-0.3.1/docs/conf.py 2016-12-19 23:10:55.000000000 +0100
+++ new/agate-lookup-0.3.2/docs/conf.py 2023-06-14 01:07:57.000000000 +0200
@@ -1,225 +1,41 @@
-# -*- coding: utf-8 -*-
+# Configuration file for the Sphinx documentation builder.
#
-# 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.
-
+# For the full list of built-in configuration values, see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html
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'
+# -- Project information -----------------------------------------------------
+#
https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
-# 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)
-}
+project = 'agate-lookup'
+copyright = '2016, Christopher Groskopf'
+version = '0.3.2'
+release = version
+
+# -- General configuration ---------------------------------------------------
+#
https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
+
+extensions = [
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.intersphinx'
+]
-# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
-# 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
+# -- Options for HTML output -------------------------------------------------
+#
https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
-# 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
+html_theme = 'furo'
-# 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'
+autodoc_member_order = 'bysource'
-# -- 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 = [
-]
+intersphinx_mapping = {
+ 'python': ('https://docs.python.org/3', None),
+ 'agate': ('https://agate.readthedocs.org/en/latest/', None)
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/docs/index.rst
new/agate-lookup-0.3.2/docs/index.rst
--- old/agate-lookup-0.3.1/docs/index.rst 2016-12-19 23:10:55.000000000
+0100
+++ new/agate-lookup-0.3.2/docs/index.rst 2023-06-14 01:07:57.000000000
+0200
@@ -13,12 +13,12 @@
pip install agate-lookup
-For details on development or supported platforms see the `agate documentation
<http://agate.readthedocs.org>`_.
+For details on development or supported platforms see the `agate documentation
<https://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:
+agate-lookup is an agate `extension
<https://agate.readthedocs.org/en/latest/extensions.html>`_. To use it, first
import it and patch its functionality into agate:
.. code-block:: python
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/docs/requirements.txt
new/agate-lookup-0.3.2/docs/requirements.txt
--- old/agate-lookup-0.3.1/docs/requirements.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/agate-lookup-0.3.2/docs/requirements.txt 2023-06-14
01:07:57.000000000 +0200
@@ -0,0 +1,3 @@
+furo
+sphinx>2
+docutils>=0.18
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/example.py
new/agate-lookup-0.3.2/example.py
--- old/agate-lookup-0.3.1/example.py 2016-12-19 23:10:55.000000000 +0100
+++ new/agate-lookup-0.3.2/example.py 2023-06-14 01:07:57.000000000 +0200
@@ -1,6 +1,7 @@
#!/usr/bin/env python
import agate
+
import agatelookup
# Simple
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/requirements-py2.txt
new/agate-lookup-0.3.2/requirements-py2.txt
--- old/agate-lookup-0.3.1/requirements-py2.txt 2016-12-19 23:10:55.000000000
+0100
+++ new/agate-lookup-0.3.2/requirements-py2.txt 1970-01-01 01:00:00.000000000
+0100
@@ -1,11 +0,0 @@
-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.2/requirements-py3.txt
--- old/agate-lookup-0.3.1/requirements-py3.txt 2016-12-19 23:10:55.000000000
+0100
+++ new/agate-lookup-0.3.2/requirements-py3.txt 1970-01-01 01:00:00.000000000
+0100
@@ -1,9 +0,0 @@
-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.2/setup.cfg
--- old/agate-lookup-0.3.1/setup.cfg 2016-12-19 23:10:55.000000000 +0100
+++ new/agate-lookup-0.3.2/setup.cfg 2023-06-14 01:07:57.000000000 +0200
@@ -1,2 +1,12 @@
+[flake8]
+max-line-length = 119
+per-file-ignores =
+ # imported but unused
+ agatelookup/__init__.py: F401
+ example.py: F401
+
+[isort]
+line_length = 119
+
[bdist_wheel]
universal = 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/setup.py
new/agate-lookup-0.3.2/setup.py
--- old/agate-lookup-0.3.1/setup.py 2016-12-19 23:10:55.000000000 +0100
+++ new/agate-lookup-0.3.2/setup.py 2023-06-14 01:07:57.000000000 +0200
@@ -1,21 +1,17 @@
-#!/usr/bin/env python
+from setuptools import find_packages, setup
-from setuptools import setup
-
-install_requires = [
- 'agate>=1.5.0',
- 'requests>=2.9.1',
- 'pyyaml>=3.11'
-]
+with open('README.rst') as f:
+ long_description = f.read()
setup(
name='agate-lookup',
- version='0.3.1',
+ version='0.3.2',
description='agate-lookup adds remote lookup tables to agate.',
- long_description=open('README.rst').read(),
+ long_description=long_description,
+ long_description_content_type='text/x-rst',
author='Christopher Groskopf',
author_email='chrisgrosk...@gmail.com',
- url='http://agate-lookup.readthedocs.org/',
+ url='https://agate-lookup.readthedocs.org/',
license='MIT',
classifiers=[
'Development Status :: 4 - Beta',
@@ -25,10 +21,11 @@
'Natural Language :: English',
'Operating System :: OS Independent',
'Programming Language :: Python',
- 'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3.3',
- 'Programming Language :: Python :: 3.4',
- 'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
+ 'Programming Language :: Python :: 3.9',
+ 'Programming Language :: Python :: 3.10',
+ 'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Multimedia :: Graphics',
@@ -36,8 +33,20 @@
'Topic :: Scientific/Engineering :: Visualization',
'Topic :: Software Development :: Libraries :: Python Modules',
],
- packages=[
- 'agatelookup'
+ packages=find_packages(exclude=['tests', 'tests.*']),
+ install_requires=[
+ 'agate>=1.5.0',
+ 'requests>=2.9.1',
+ 'pyyaml>=3.11'
],
- install_requires=install_requires
+ extras_require={
+ 'test': [
+ 'pytest',
+ 'pytest-cov',
+ ],
+ 'docs': [
+ 'Sphinx>=1.2.2',
+ 'sphinx_rtd_theme>=0.1.6',
+ ],
+ }
)
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.2/tests/test_source.py
--- old/agate-lookup-0.3.1/tests/test_source.py 2016-12-19 23:10:55.000000000
+0100
+++ new/agate-lookup-0.3.2/tests/test_source.py 2023-06-14 01:07:57.000000000
+0200
@@ -1,14 +1,10 @@
#!/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()
@@ -26,7 +22,7 @@
self.assertSequenceEqual(table.row_names[:2], ['AL', 'AK'])
def test_get_table_multiple_keys(self):
- table = self.source.get_table(['year', 'month'], 'cpi')
+ table = self.source.get_table(['year', 'month'], 'cpi.sa')
print(table)
self.assertColumnNames(table, ['year', 'month', 'cpi'])
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.2/tests/test_table.py
--- old/agate-lookup-0.3.1/tests/test_table.py 2016-12-19 23:10:55.000000000
+0100
+++ new/agate-lookup-0.3.2/tests/test_table.py 2023-06-14 01:07:57.000000000
+0200
@@ -1,16 +1,13 @@
#!/usr/bin/env python
-# -*- coding: utf8 -*-
-try:
- import unittest2 as unittest
-except ImportError:
- import unittest
+from unittest.mock import patch
import agate
-import agatelookup
-import mock
import requests
+import agatelookup # noqa: F401
+
+
class TestLookup(agate.AgateTestCase):
def setUp(self):
self._source = agatelookup.Source(cache=False)
@@ -123,7 +120,7 @@
table = agate.Table(rows, column_names, column_types)
with self.assertRaises(ValueError):
- result = table.lookup('usps', 'state', require_match=True,
source=self._source)
+ table.lookup('usps', 'state', require_match=True,
source=self._source)
def test_from_lookup(self):
table = agate.Table.from_lookup('usps', 'state')
@@ -133,7 +130,7 @@
self.assertSequenceEqual(table.rows[1].values(), ['AK', 'Alaska'])
def test_connection_fails(self):
- with mock.patch.object(requests, 'get') as mock_method:
+ with patch.object(requests, 'get') as mock_method:
mock_method.side_effect = requests.ConnectionError
with self.assertRaises(RuntimeError):
@@ -142,7 +139,7 @@
def test_cache(self):
source = agatelookup.Source(cache='examples')
- with mock.patch.object(requests, 'get') as mock_method:
+ with patch.object(requests, 'get') as mock_method:
mock_method.side_effect = requests.ConnectionError
table = agate.Table.from_lookup('usps', 'state', source=source)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/agate-lookup-0.3.1/tox.ini
new/agate-lookup-0.3.2/tox.ini
--- old/agate-lookup-0.3.1/tox.ini 2016-12-19 23:10:55.000000000 +0100
+++ new/agate-lookup-0.3.2/tox.ini 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-[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}
