change pyclowder2 -> pyclowder

Author: robkooper

Dockerfile

@@ -22,7 +22,7 @@ RUN apt-get -q -q update \
     && pip install --upgrade setuptools \
     && rm -rf /var/lib/apt/lists/* /tmp/get-pip.py
 
-# instal pyclowder2
+# instal pyclowder
 COPY pyclowder /tmp/pyclowder/pyclowder
 COPY setup.py description.rst /tmp/pyclowder/
 

README.md

@@ -12,17 +12,17 @@ create new extractors.
 
 ## Setup
 
-Install pyClowder2 on your system by cloning this repo:
+Install pyClowder on your system by cloning this repo:
 
 ```
-git clone https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/pyclowder2.git
-cd pyclowder2
+git clone https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/pyclowder.git
+cd pyclowder
 pip install -r requirements.txt
 python setup.py install
 ```
 or directly from Bitbucket:
 ```
-pip install -r https://opensource.ncsa.illinois.edu/bitbucket/projects/CATS/repos/pyclowder2/raw/requirements.txt git+https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/pyclowder2.git
+pip install -r https://opensource.ncsa.illinois.edu/bitbucket/projects/CATS/repos/pyclowder/raw/requirements.txt git+https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/pyclowder.git
 ```
 
 ## Example Extractor

description.rst

@@ -14,12 +14,12 @@ Use the following command to install::
 Because this system is still under rapid development, you may want to
 install by cloning the repo using the following commands::
 
-    git clone https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/pyclowder2.git
-    cd pyclowder2
+    git clone https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/pyclowder.git
+    cd pyclowder
     pip install -r requirements.txt
     python setup.py install
 
 Or you can install directly from NCSA's Bitbucket::
 
-    pip install -r https://opensource.ncsa.illinois.edu/bitbucket/projects/CATS/repos/pyclowder2/raw/requirements.txt git+https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/pyclowder2.git
+    pip install -r https://opensource.ncsa.illinois.edu/bitbucket/projects/CATS/repos/pyclowder/raw/requirements.txt git+https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/pyclowder.git
 

sample-extractors/README.md

@@ -2,7 +2,7 @@ This folder contains example extractors:
 
 * wordcount: A simple extractor that takes a text file and counts the number of characters, words and lines.
 * echo: A simple extractor that shows how check_message can be used to tell the extractor not to download the actual file.
-* wordcount-simpleextractor: this is wordcount extractor which uses the power of new added module simpleextractor in Pyclowder2.
+* wordcount-simpleextractor: this is wordcount extractor which uses the power of new added module simpleextractor in Pyclowder.
 Additional files in this folder are:
 
 * example.conf: an example of the ubuntu upstart file

sample-extractors/simple-extractor/README.md

@@ -11,7 +11,7 @@ the message broker. The other environment variable ```EXTRACTION_MODULE``` is th
 needs to be wrapped as an extractor as quickly as possible.
 2. This extractor CURRENTLY outputs JSON format metadata or a list of preview files. If your extractor generates 
 any additional information like generated files, datasets, collections, thumbnails, etc., this method cannot be use and 
-you have to write your extractor the normal way using [PyClowder2](https://opensource.ncsa.illinois.edu/bitbucket/projects/CATS/repos/pyclowder2/browse)
+you have to write your extractor the normal way using [PyClowder](https://opensource.ncsa.illinois.edu/bitbucket/projects/CATS/repos/pyclowder/browse)
 3. [Docker](https://www.docker.com/) is the recommended way of developing / wrapping your code using the Simple Extractor.
 
 ## Steps for Writing an Extractor Using the Simple Extractor

sample-extractors/simple-r-extractor/README.md

@@ -108,7 +108,7 @@ extractor framework to initialize the extractor as well as upload information to
 ```
 
 Once the image with the extractor is build you can test this extractor in the clowder environment. To do this you will
-need to start clowder first. This can be done using a single [docker-compose file](https://opensource.ncsa.illinois.edu/bitbucket/projects/CATS/repos/pyclowder2/raw/docker-compose.yml).
+need to start clowder first. This can be done using a single [docker-compose file](https://opensource.ncsa.illinois.edu/bitbucket/projects/CATS/repos/pyclowder/raw/docker-compose.yml).
 You can start the full clowder stack using `docker-compose up -p clowder` in the same folder where you downloaded the 
 docker-compose file. After some time you will have an instance of clowder running that you can access using:
 http://localhost:9000/ (if you use docker with virtualbox the url will probably be http://192.168.99.100:9000/).

setup.py

@@ -18,15 +18,16 @@ def description():
 
       url='https://clowder.ncsa.illinois.edu',
       project_urls={
-        'Source': 'https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/pyclowder2.git',
+        'Source': 'https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/pyclowder.git',
       },
 
       license='BSD',
       classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: BSD License',
-        'Programming Language :: Python :: 2.7'
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3'
       ],
       keywords=['clowder', 'data management system'],