Skip to content

Rename data-prototype to mpl-data-containers #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[run]
source =
data_prototype
mpl_data_containers
[report]
omit =
*/python?.?/*
Expand Down
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exclude =
build,
dist,
versioneer.py,
data_prototype/_version.py,
mpl_data_containers/_version.py,
docs/source/conf.py
setup.py
.eggs
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@ doc/_static/constrained_layout*.png

# setuptools_scm collateral

data_prototype/_version.py
mpl_data_containers/_version.py
22 changes: 10 additions & 12 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Types of Contributions
Report Bugs
~~~~~~~~~~~

Report bugs at https://github.com/tacaswell/data_prototype/issues.
Report bugs at https://github.com/matplotlib/data-prototype/issues.

If you are reporting a bug, please include:

Expand All @@ -35,14 +35,14 @@ is open to whoever wants to implement it.
Write Documentation
~~~~~~~~~~~~~~~~~~~

data_prototype could always use more documentation, whether
as part of the official data_prototype docs, in docstrings,
mpl_data_containers could always use more documentation, whether
as part of the official mpl_data_containers docs, in docstrings,
or even on the web in blog posts, articles, and such.

Submit Feedback
~~~~~~~~~~~~~~~

The best way to send feedback is to file an issue at https://github.com/tacaswell/data_prototype/issues.
The best way to send feedback is to file an issue at https://github.com/matplotlib/mpl_data_containers/issues.

If you are proposing a feature:

Expand All @@ -54,17 +54,17 @@ If you are proposing a feature:
Get Started!
------------

Ready to contribute? Here's how to set up `data_prototype` for local development.
Ready to contribute? Here's how to set up `mpl_data_containers` for local development.

1. Fork the `data_prototype` repo on GitHub.
1. Fork the `mpl_data_containers` repo on GitHub.
2. Clone your fork locally::

$ git clone [email protected]:your_name_here/data_prototype.git
$ git clone [email protected]:your_name_here/mpl_data_containers.git

3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development::

$ mkvirtualenv data_prototype
$ cd data_prototype/
$ mkvirtualenv mpl_data_containers
$ cd mpl_data_containers/
$ python setup.py develop

4. Create a branch for local development::
Expand Down Expand Up @@ -98,7 +98,5 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.
3. The pull request should work for Python 2.7, 3.3, 3.4, 3.5 and for PyPy. Check
https://travis-ci.org/tacaswell/data_prototype/pull_requests
and make sure that the tests pass for all supported Python versions.
3. The pull request should work for all supported python versions.

2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ recursive-exclude * *.py[co]

recursive-include docs *.rst conf.py Makefile make.bat

include data_prototype/_version.py
include mpl_data_containers/_version.py

# If including data files in the package, add them like:
# include path/to/data_file
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
==============
data_prototype
mpl_data_containers
==============
Comment on lines 1 to 3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Over/underline don't match.


Experimental code for the upcoming Matplotlib data refactor.
Expand Down
6 changes: 3 additions & 3 deletions docs/source/api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ API
Containers
==========

.. automodule:: data_prototype.containers
.. automodule:: mpl_data_containers.containers
:members:
:undoc-members:

Expand All @@ -16,10 +16,10 @@ Containers
Wrappers
========

.. automodule:: data_prototype.wrappers
.. automodule:: mpl_data_containers.wrappers
:members:
:undoc-members:

.. automodule:: data_prototype.patches
.. automodule:: mpl_data_containers.patches
:members:
:undoc-members:
32 changes: 19 additions & 13 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# data_prototype documentation build configuration file, created by
# mpl_data_containers documentation build configuration file, created by
# sphinx-quickstart on Thu Jun 28 12:35:56 2018.
#
# This file is execfile()d with the current directory set to its
Expand All @@ -23,7 +23,7 @@
# sys.path.insert(0, os.path.abspath('.'))
from pathlib import Path

import data_prototype
import mpl_data_containers

# are we running circle CI?
CIRCLECI = "CIRCLECI" in os.environ
Expand Down Expand Up @@ -72,7 +72,7 @@
],
"filename_pattern": "^((?!sgskip).)*$",
"gallery_dirs": ["gallery"],
"doc_module": ("data_prototype",),
"doc_module": ("mpl_data_containers",),
"reference_url": {
"matplotlib": None,
},
Expand Down Expand Up @@ -104,7 +104,7 @@
master_doc = "index"

# General information about the project.
project = "data_prototype"
project = "mpl_data_containers"
copyright = "2022, Thomas A Caswell"
author = "Thomas A Caswell"

Expand All @@ -114,9 +114,9 @@
#

# The short X.Y version.
version = data_prototype.__version__
version = mpl_data_containers.__version__
# The full version, including alpha/beta/rc tags.
release = data_prototype.__version__
release = mpl_data_containers.__version__

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -179,7 +179,7 @@
# -- Options for HTMLHelp output ------------------------------------------

# Output file base name for HTML help builder.
htmlhelp_basename = "data_prototype"
htmlhelp_basename = "mpl_data_containers"


# -- Options for LaTeX output ---------------------------------------------
Expand All @@ -205,8 +205,8 @@
latex_documents = [
(
master_doc,
"data_prototype.tex",
"data_prototype Documentation",
"mpl_data_containers.tex",
"mpl_data_containers Documentation",
"Contributors",
"manual",
),
Expand All @@ -218,7 +218,13 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, "data_prototype", "data_prototype Documentation", [author], 1)
(
master_doc,
"mpl_data_containers",
"mpl_data_containers Documentation",
[author],
1,
)
]


Expand All @@ -230,10 +236,10 @@
texinfo_documents = [
(
master_doc,
"data_prototype",
"data_prototype Documentation",
"mpl_data_containers",
"mpl_data_containers Documentation",
author,
"data_prototype",
"mpl_data_containers",
"Experimental code for the upcoming Matplotlib data refactor.",
"Miscellaneous",
),
Expand Down
4 changes: 2 additions & 2 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.

data_prototype Documentation
============================
mpl_data_containers Documentation
=================================

This is prototype development for the next generation of data structures for
Matplotlib. This is the version "to throw away". Everything in this
Expand Down
2 changes: 1 addition & 1 deletion docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Installation

At the command line::

$ pip install git+https://github.com/tacaswell/data-prototype.git@main
$ pip install git+https://github.com/matplotlib/data-prototype.git@main
6 changes: 3 additions & 3 deletions examples/2Dfunc.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import matplotlib.pyplot as plt
import numpy as np

from data_prototype.artist import CompatibilityAxes
from data_prototype.image import Image
from data_prototype.containers import FuncContainer
from mpl_data_containers.artist import CompatibilityAxes
from mpl_data_containers.image import Image
from mpl_data_containers.containers import FuncContainer

from matplotlib.colors import Normalize

Expand Down
12 changes: 6 additions & 6 deletions examples/animation.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
import matplotlib.pyplot as plt
from matplotlib.animation import FuncAnimation

from data_prototype.conversion_edge import Graph
from data_prototype.description import Desc
from mpl_data_containers.conversion_edge import Graph
from mpl_data_containers.description import Desc


from data_prototype.artist import CompatibilityAxes
from data_prototype.line import Line
from data_prototype.text import Text
from data_prototype.conversion_edge import FuncEdge
from mpl_data_containers.artist import CompatibilityAxes
from mpl_data_containers.line import Line
from mpl_data_containers.text import Text
from mpl_data_containers.conversion_edge import FuncEdge


class SinOfTime:
Expand Down
6 changes: 3 additions & 3 deletions examples/data_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import numpy as np
import pandas as pd

from data_prototype.artist import CompatibilityArtist as CA
from data_prototype.line import Line
from data_prototype.containers import DataFrameContainer
from mpl_data_containers.artist import CompatibilityArtist as CA
from mpl_data_containers.line import Line
from mpl_data_containers.containers import DataFrameContainer

th = np.linspace(0, 4 * np.pi, 256)

Expand Down
4 changes: 2 additions & 2 deletions examples/errorbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import numpy as np


from data_prototype.wrappers import ErrorbarWrapper
from data_prototype.containers import ArrayContainer
from mpl_data_containers.wrappers import ErrorbarWrapper
from mpl_data_containers.containers import ArrayContainer

x = np.arange(10)
y = x**2
Expand Down
6 changes: 3 additions & 3 deletions examples/first.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import numpy as np
import pandas as pd

from data_prototype.artist import CompatibilityAxes
from data_prototype.line import Line
from data_prototype.containers import FuncContainer, SeriesContainer
from mpl_data_containers.artist import CompatibilityAxes
from mpl_data_containers.line import Line
from mpl_data_containers.containers import FuncContainer, SeriesContainer


fc = FuncContainer({"x": (("N",), lambda x: x), "y": (("N",), lambda x: np.sin(1 / x))})
Expand Down
4 changes: 2 additions & 2 deletions examples/hist.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import matplotlib.pyplot as plt
import numpy as np

from data_prototype.wrappers import StepWrapper
from data_prototype.containers import HistContainer
from mpl_data_containers.wrappers import StepWrapper
from mpl_data_containers.containers import HistContainer

hc = HistContainer(
np.concatenate([np.random.randn(5000), 0.1 * np.random.randn(500) + 5]), 25
Expand Down
6 changes: 3 additions & 3 deletions examples/lissajous.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import matplotlib.markers as mmarkers
from matplotlib.animation import FuncAnimation

from data_prototype.conversion_edge import Graph
from data_prototype.description import Desc
from mpl_data_containers.conversion_edge import Graph
from mpl_data_containers.description import Desc

from data_prototype.wrappers import PathCollectionWrapper
from mpl_data_containers.wrappers import PathCollectionWrapper


class Lissajous:
Expand Down
6 changes: 3 additions & 3 deletions examples/mandelbrot.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
import matplotlib.pyplot as plt
import numpy as np

from data_prototype.artist import CompatibilityAxes
from data_prototype.image import Image
from data_prototype.containers import FuncContainer
from mpl_data_containers.artist import CompatibilityAxes
from mpl_data_containers.image import Image
from mpl_data_containers.containers import FuncContainer

from matplotlib.colors import Normalize

Expand Down
12 changes: 6 additions & 6 deletions examples/mapped.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

from matplotlib.colors import Normalize

from data_prototype.artist import CompatibilityAxes
from data_prototype.line import Line
from data_prototype.containers import ArrayContainer
from data_prototype.description import Desc
from data_prototype.conversion_edge import FuncEdge
from data_prototype.text import Text
from mpl_data_containers.artist import CompatibilityAxes
from mpl_data_containers.line import Line
from mpl_data_containers.containers import ArrayContainer
from mpl_data_containers.description import Desc
from mpl_data_containers.conversion_edge import FuncEdge
from mpl_data_containers.text import Text


cmap = plt.colormaps["viridis"]
Expand Down
10 changes: 5 additions & 5 deletions examples/mulivariate_cmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
import matplotlib.pyplot as plt
import numpy as np

from data_prototype.image import Image
from data_prototype.artist import CompatibilityAxes
from data_prototype.description import Desc
from data_prototype.containers import FuncContainer
from data_prototype.conversion_edge import FuncEdge
from mpl_data_containers.image import Image
from mpl_data_containers.artist import CompatibilityAxes
from mpl_data_containers.description import Desc
from mpl_data_containers.containers import FuncContainer
from mpl_data_containers.conversion_edge import FuncEdge

from matplotlib.colors import hsv_to_rgb

Expand Down
6 changes: 3 additions & 3 deletions examples/new_patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
import matplotlib.pyplot as plt


from data_prototype.artist import CompatibilityAxes
from data_prototype.patches import Patch
from data_prototype.containers import ArrayContainer
from mpl_data_containers.artist import CompatibilityAxes
from mpl_data_containers.patches import Patch
from mpl_data_containers.containers import ArrayContainer

from matplotlib.path import Path

Expand Down
Loading