Merge pull request #2 from gpoulin/master

Add .gitignore and .mailmap
2013-09-11 23:19:09 -07:00 · 2013-09-11 23:19:09 -07:00 · ef1f003370
commit ef1f003370
parent f6ed67fc33 85572d5f7a
4 changed files with 72 additions and 47 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,4 @@
+__pycache__
+build
+*.pyc
+*.swp
--- a/.mailmap
+++ b/.mailmap
@ -0,0 +1,12 @@
+Luke Campagnola <lcampagn@email.unc.edu> Luke Campagnola <>
+Luke Campagnola <lcampagn@email.unc.edu> Luke Campagnola <luke.campagnola@gmail.com>
+Megan Kratz <meganbkratz@gmail.com> meganbkratz@gmail.com <>
+Megan Kratz <meganbkratz@gmail.com> Megan Kratz <megankratz@megancomputer.local>
+Megan Kratz <meganbkratz@gmail.com> Megan Kratz <megankratz@wireless152023024102.med.unc.edu>
+Megan Kratz <meganbkratz@gmail.com> Megan Kratz <megankratz@wireless152023025209.med.unc.edu>
+Megan Kratz <meganbkratz@gmail.com> Megan Kratz <megankratz@p152023031037.med.unc.edu>
+Megan Kratz <meganbkratz@gmail.com> Megan Kratz <megankratz@wire152019114033.med.unc.edu>
+Megan Kratz <meganbkratz@gmail.com> Megan Kratz <megankratz@wireless152023024078.med.unc.edu>
+Ingo Breßler <dev@ingobressler.net> Ingo Breßler <ingo.bressler@bam.de>
+Ingo Breßler <dev@ingobressler.net> Ingo B. <dev@ingobressler.net>
+
--- a/README.md
+++ b/README.md
@ -0,0 +1,56 @@
+PyQtGraph
+=========
+
+A pure-Python graphics library for PyQt/PySide
+Copyright 2012 Luke Campagnola, University of North Carolina at Chapel Hill
+http://www.pyqtgraph.org
+
+Maintainer
+----------
+   * Luke Campagnola   ('luke.campagnola@%s.com' % 'gmail')
+
+Contributors
+------------
+   * Megan Kratz
+   * Paul Manis
+   * Ingo Breßler
+   * Christian Gavin
+   * Michael Cristopher Hogg
+   * Ulrich Leutner
+   * Felix Schill
+   * Guillaume Poulin
+
+Requirements
+------------
+    PyQt 4.7+ or PySide
+    python 2.6, 2.7, or 3.x
+    numpy, scipy
+    For 3D graphics: pyopengl
+    Known to run on Windows, Linux, and Mac.
+
+Support
+-------
+    Post at the mailing list / forum:
+    https://groups.google.com/forum/?fromgroups#!forum/pyqtgraph
+
+Installation Methods
+--------------------
+    * To use with a specific project, simply copy the pyqtgraph subdirectory
+      anywhere that is importable from your project
+    * To install system-wide from source distribution:
+         `$ python setup.py install`
+    * For instalation packages, see the website (pyqtgraph.org)
+
+Documentation
+-------------
+    There are many examples; run `python -m pyqtgraph.examples` for a menu.
+    Some (incomplete) documentation exists at this time.
+    * Easiest place to get documentation is at
+      http://www.pyqtgraph.org/documentation
+    * If you acquired this code as a .tar.gz file from the website, then you can also look in
+      doc/html.
+    * If you acquired this code via GitHub, then you can build the documentation using sphinx.
+      From the documentation directory, run:
+          `$ make html`
+    Please feel free to pester Luke or post to the forum if you need a specific
+    section of documentation.
--- a/README.txt
+++ b/README.txt
@ -1,47 +0,0 @@
-PyQtGraph - A pure-Python graphics library for PyQt/PySide
-Copyright 2012 Luke Campagnola, University of North Carolina at Chapel Hill
-http://www.pyqtgraph.org
-
-Maintainer:
-    Luke Campagnola   ('luke.campagnola@%s.com' % 'gmail')
-
-Contributors:
-    Megan Kratz
-    Paul Manis
-    Ingo Breßler
-    Christian Gavin
-    Michael Cristopher Hogg
-    Ulrich Leutner
-    Felix Schill
-    Guillaume Poulin
-
-Requirements:
-    PyQt 4.7+ or PySide
-    python 2.6, 2.7, or 3.x
-    numpy, scipy
-    For 3D graphics: pyopengl
-    Known to run on Windows, Linux, and Mac.
-
-Support:
-    Post at the mailing list / forum:
-    https://groups.google.com/forum/?fromgroups#!forum/pyqtgraph
-
-Installation Methods:
-    - To use with a specific project, simply copy the pyqtgraph subdirectory 
-      anywhere that is importable from your project 
-    - To install system-wide from source distribution:
-         $ python setup.py install
-    - For instalation packages, see the website (pyqtgraph.org)    
-
-Documentation:
-    There are many examples; run "python -m pyqtgraph.examples" for a menu.
-    Some (incomplete) documentation exists at this time.
-    - Easiest place to get documentation is at 
-      http://www.pyqtgraph.org/documentation
-    - If you acquired this code as a .tar.gz file from the website, then you can also look in 
-      doc/html.
-    - If you acquired this code via BZR, then you can build the documentation using sphinx.
-      From the documentation directory, run:
-          $ make html  
-    Please feel free to pester Luke or post to the forum if you need a specific 
-    section of documentation.