Merge pull request #40 from TomSlater/master

Update version (0.4.0)

Author: TomSlater

ParticleSpy/ParticleAnalysis.py

@@ -58,7 +58,7 @@ def ParticleAnalysis(acquisition,parameters,particles=None,mask=np.zeros((1))):
         #morphology.remove_small_objects(labeled,30,in_place=True)
     elif mask.sum()==0:
         labeled = process(image,parameters)
-        plt.imshow(labeled)
+        #plt.imshow(labeled)
         #labels = np.unique(labeled).tolist() #some labeled number have been removed by "remove_small_holes" function
     else:
         labeled = label(mask)

docs/conf.py

@@ -20,13 +20,13 @@
 # -- Project information -----------------------------------------------------
 
 project = 'ParticleSpy'
-copyright = '2019, ePSIC'
+copyright = '2020, ePSIC'
 author = 'ePSIC'
 
 # The short X.Y version
-version = '0.2.0'
+version = '0.4.0'
 # The full version, including alpha/beta/rc tags
-release = '0.2.0'
+release = '0.4.0'
 
 
 # -- General configuration ---------------------------------------------------

setup.py

@@ -19,13 +19,13 @@
 setuptools.setup(
     name="particlespy",
     package_dir={'particlespy':'particlespy'},
-    version="0.3.0",
+    version="0.4.0",
     author="Thomas Slater",
     author_email="tjaslater@gmail.com",
     description="A package to perform particle segmentation and analysis",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/ePSIC-DLS/ParticleSpy",
+    url="https://github.com/ePSIC-DLS/particlespy",
     packages=setuptools.find_packages(),
     install_requires=install_requires,   
     include_package_data=True,