Merge branch 'master' of https://github.com/pycroscopy/sidpy

� Conflicts: � setup.py
pycroscopy · Oct 9, 2020 · d29df0e · d29df0e
2 parents 7ec2262 + 3763aa2
commit d29df0e
Show file tree

Hide file tree

Showing 34 changed files with 12,408 additions and 1,101 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: python
 python:
   - '3.7'
-  - '2.7'
   - '3.8'
   - '3.6'
   - '3.5'

diff --git a/README.rst b/README.rst
@@ -27,4 +27,4 @@ sidpy
 
 Python utilities for storing, visualizing, and processing Spectroscopic and Imaging Data (SID)
 
-Please see our `website <https://pycroscopy.github.io/sidpy/basics.html>`_ for more information.
+Please see our `website <https://pycroscopy.github.io/sidpy/index.html>`_ for more information.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -46,7 +46,7 @@
 
 project = 'sidpy'
 copyright = '2020, Suhas Somnath, Gerd Duscher, and contributors'
-author = 'Suhas Somnath, Gerd Duscher, and contributors'
+author = 'Pycroscopy contributors'
 
 # The short X.Y version
 version = sidpy_version
@@ -301,7 +301,7 @@
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (master_doc, 'sidpy.tex', 'sidpy Documentation',
-     'Suhas Somnath, Gerd Duscher, and contributors', 'manual'),
+     'Pycroscopy contributors', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

diff --git a/examples/plot_utils/README.txt b/examples/plot_utils/README.txt
diff --git a/examples/plot_utils/plot_1d.py b/examples/plot_utils/plot_1d.py
diff --git a/examples/plot_utils/plot_2d.py b/examples/plot_utils/plot_2d.py
-Original file line number
+Diff line change
@@ -1,7 +1,6 @@
     language: python
     python:
       - '3.7'
-      - '2.7'
       - '3.8'
       - '3.6'
       - '3.5'
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,4 +27,4 @@ sidpy

		Python utilities for storing, visualizing, and processing Spectroscopic and Imaging Data (SID)

		Please see our `website <https://pycroscopy.github.io/sidpy/basics.html>`_ for more information.
		Please see our `website <https://pycroscopy.github.io/sidpy/index.html>`_ for more information.