Merge branch 'master' of https://github.com/fooof-tools/fooof

Author: TomDonoghue

CONTRIBUTING.md

@@ -12,11 +12,11 @@ This documents is a set of guidelines for contributing to FOOOF on GitHub. This
 
 ## Participation guidelines
 
-Please note that this project adheres to a [code of conduct](https://github.com/voytekresearch/fooof/CODE_OF_CONDUCT.md), that you are expected to uphold when participating in this project. 
+Please note that this project adheres to a [code of conduct](https://github.com/fooof-tools/fooof/blob/master/CODE_OF_CONDUCT.md), that you are expected to uphold when participating in this project. 
 
 ## How to report bugs
 
-If you are reporting a bug, please submit it to our [issue tracker](https://github.com/voytekresearch/fooof/issues). Please do your best to include the following:
+If you are reporting a bug, please submit it to our [issue tracker](https://github.com/fooof-tools/fooof/issues). Please do your best to include the following:
 
 1. A short, top-level summary of the bug (usually 1-2 sentences)
 2. A short, self-contained code snippet to reproduce the bug, ideally allowing a simple copy and paste to reproduce. Please do your best to reduce the code snippet to the minimum required.
@@ -25,7 +25,7 @@ If you are reporting a bug, please submit it to our [issue tracker](https://gith
 
 ## How to suggest changes or updates
 
-If there is a feature you would like to see, please submit it as an [issue](https://github.com/voytekresearch/fooof/issues), with a brief description of what you would like to see added / changed, and why. If it is feature that you would be willing to implement, please indicate that and, and follow the guidelines below for making a contribution. 
+If there is a feature you would like to see, please submit it as an [issue](https://github.com/fooof-tools/fooof/issues), with a brief description of what you would like to see added / changed, and why. If it is feature that you would be willing to implement, please indicate that and, and follow the guidelines below for making a contribution. 
 
 Note that, in terms of scope, FOOOF is quite specifically focused on it's core functionality of parameterizing neural power spectra, and helper utilities to visualize and work with model results, as well as tools to create synthetic power spectra. Procedures and utilities that do not deal with operating upon power spectra or FOOOF outputs directly will most likely be considered out of scope, and won't be added into FOOOF.
 

doc/conf.py

@@ -117,7 +117,7 @@
         ("Tutorial", "auto_tutorials/index"),
         ("Examples", "auto_examples/index"),
         ("Index", "contents"),
-        ("GitHub", "https://github.com/voytekresearch/fooof", True)
+        ("GitHub", "https://github.com/fooof-tools/fooof", True)
     ],
     'bootswatch_theme': "flatly",
 
@@ -219,4 +219,4 @@
         'numpy': 'http://docs.scipy.org/doc/numpy-1.9.1',
         'scipy': 'http://docs.scipy.org/doc/scipy-0.17.0/reference'
         }
-}
+}

setup.py

@@ -28,7 +28,7 @@
 of the FOOOF approach is that these peaks are characterized in terms of their specific center
 frequency, amplitude and bandwidth without requiring predefining specific bands of interest.
 In particular, it separates these peaks from a dynamic, and independently interesting 1/f
-background. This conception of the 1/f as potentially functional (and therefore worth carefully
+background. This conception of the 1/f as potenhttps://github.com/voytekresearch/fooof/releasestially functional (and therefore worth carefully
 modeling) is based on work from the Voytek lab and others that collectively shows that 1/f changes
 across task demands and participant demographics, and that it may index underlying
 excitation/inhibition (EI) balance.
@@ -50,7 +50,7 @@
     long_description = long_description,
     author = 'The Voytek Lab',
     author_email = 'voyteklab@gmail.com',
-    url = 'https://github.com/voytekresearch/fooof',
+    url = 'https://github.com/fooof-tools/fooof',
     packages = find_packages(),
     license = 'Apache License, 2.0',
     classifiers = [
@@ -67,7 +67,7 @@
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7'
     ],
-    download_url = 'https://github.com/voytekresearch/fooof/releases',
+    download_url = '',
     keywords = ['neuroscience', 'neural oscillations', 'power spectra', '1/f', 'electrophysiology'],
     install_requires = ['numpy', 'scipy>=0.19.0'],
     tests_require = ['pytest'],
@@ -76,4 +76,4 @@
         'tests'   : ['pytest'],
         'all'     : ['matplotlib', 'tqdm', 'pytest']
     }
-)
+)