Merge pull request #394 from JrGoodle/src

Rename clowder directory to src

.circleci/config.yml

@@ -16,7 +16,7 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "clowder/requirements.txt" }}
+          - v1-dependencies-{{ checksum "src/requirements.txt" }}
           # fallback to using the latest cache if no exact match is found
           - v1-dependencies-
 
@@ -25,7 +25,7 @@ jobs:
           command: |
             python3 -m venv venv
             . venv/bin/activate
-            sudo pip install -r clowder/requirements.txt
+            sudo pip install -r src/requirements.txt
             sudo pip install https://github.com/JrGoodle/codecov-python/releases/download/encoding-fix/codecov-2.0.9-py2.py3-none-any.whl
 
       - run:
@@ -37,7 +37,7 @@ jobs:
       - save_cache:
           paths:
             - ./venv
-          key: v1-dependencies-{{ checksum "clowder/requirements.txt" }}
+          key: v1-dependencies-{{ checksum "src/requirements.txt" }}
 
       - add_ssh_keys:
           fingerprints:

.coveragerc

@@ -8,5 +8,5 @@ omit =
 
 [paths]
 source =
-    clowder/clowder
-    /home/travis/build/*/clowder/clowder
+    src/clowder
+    /home/travis/build/*/src/clowder

CONTRIBUTING.md

@@ -12,7 +12,7 @@ $ cd clowder
 Add the directory you cloned the repo into to `PYTHONPATH` in your shell profile. For example, if cloned into `$HOME/clowder`
 
 ```bash
-export PYTHONPATH=$PYTHONPATH:$HOME/clowder/clowder
+export PYTHONPATH=$PYTHONPATH:$HOME/src/clowder
 ```
 
 ## Building

appveyor.yml

@@ -21,8 +21,8 @@ environment:
 
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  - pip install -r clowder\requirements.txt
-  - pip install -e clowder
+  - pip install -r src\requirements.txt
+  - pip install -e src
   - pip install https://github.com/JrGoodle/codecov-python/releases/download/encoding-fix/codecov-2.0.9-py2.py3-none-any.whl
 
 build: off
@@ -35,7 +35,7 @@ test_script:
   # Note that you must use the environment variable %PYTHON% to refer to
   # the interpreter you're using - Appveyor does not do anything special
   # to put the Python version you want to use on PATH.
-  # - "build.cmd %PYTHON%\\python.exe clowder\\setup.py"
+  # - "build.cmd %PYTHON%\\python.exe src\\setup.py"
   - cd examples\cats
   - coverage run --rcfile=%APPVEYOR_BUILD_FOLDER%\.coveragerc -m clowder.clowder_app init https://github.com/jrgoodle/cats.git
   - coverage run --rcfile=%APPVEYOR_BUILD_FOLDER%\.coveragerc -m clowder.clowder_app herd

script/clean

@@ -5,7 +5,7 @@ REPO_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.." || exit 1
 clean_clowder_repo() {
     echo "Cleaning clowder command files"
     echo "Removing clowder_repo.egg-info"
-    local clowder_path=$REPO_PATH/clowder
+    local clowder_path=$REPO_PATH/src
     sudo -H rm -rf $clowder_path/clowder_repo.egg-info
     echo "Removing dist"
     sudo -H rm -rf $clowder_path/dist

script/deploy

@@ -14,9 +14,9 @@ fi
 export GITHUB_USER='JrGoodle'
 export GITHUB_REPO='clowder'
 
-cd "${TRAVIS_BUILD_DIR}/clowder" || exit 1
+cd "${TRAVIS_BUILD_DIR}/src" || exit 1
 
-SETUP_PY="${TRAVIS_BUILD_DIR}/clowder/setup.py"
+SETUP_PY="${TRAVIS_BUILD_DIR}/src/setup.py"
 VERSION=$(awk "/version='/" "${SETUP_PY}" | sed -n -e "s/^.*version='//p" | tr -d "',")
 echo "VERSION=${VERSION}"
 TAG="${VERSION}"
@@ -48,7 +48,7 @@ else
 
     echo "Uploading artifacts to GitHub Releases"
     echo '--------------------------------------'
-    pushd "${TRAVIS_BUILD_DIR}/clowder/dist" || exit 1
+    pushd "${TRAVIS_BUILD_DIR}/src/dist" || exit 1
     artifacts=( "clowder_repo-${VERSION}-py3-none-any.whl" \
                  "clowder-repo-${VERSION}.tar.gz" )
     for artifact in "${artifacts[@]}"; do

script/setup

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-cd "$( dirname "${BASH_SOURCE[0]}" )/../clowder" || exit 1
+cd "$( dirname "${BASH_SOURCE[0]}" )/../src" || exit 1
 
 VERSION=${1:-python3}
 

script/travis/install

@@ -13,5 +13,5 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
     sudo -H $PIP install twine wheel
 fi
 
-sudo $PIP install -r clowder/requirements.txt
+sudo $PIP install -r src/requirements.txt
 sudo $PIP install https://github.com/JrGoodle/codecov-python/releases/download/encoding-fix/codecov-2.0.9-py2.py3-none-any.whl

script/update

@@ -4,11 +4,11 @@ cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" || exit 1
 
 if [ "$1" == 'version' ]; then
     cd ..
-    OLD_VERSION=$(awk "/version='/" clowder/setup.py | sed -n -e "s/^.*version='//p" | tr -d "',")
+    OLD_VERSION=$(awk "/version='/" src/setup.py | sed -n -e "s/^.*version='//p" | tr -d "',")
     NEW_VERSION=$2
 
-    perl -pi -e "s/$OLD_VERSION/$NEW_VERSION/g" clowder/setup.py || exit 1
-    perl -pi -e "s/$OLD_VERSION/$NEW_VERSION/g" clowder/clowder/cmd.py || exit 1
+    perl -pi -e "s/$OLD_VERSION/$NEW_VERSION/g" src/setup.py || exit 1
+    perl -pi -e "s/$OLD_VERSION/$NEW_VERSION/g" src/clowder/cli/base_controller.py || exit 1
     perl -pi -e "s/$OLD_VERSION/$NEW_VERSION/g" docs/issue_template.md || exit 1
     exit
 fi
@@ -34,7 +34,7 @@ if [ "$1" == 'docs' ]; then
     cd ..
     rm docs/clowder.rst
     rm docs/clowder.*.rst
-    sphinx-apidoc -o docs clowder
+    sphinx-apidoc -o docs src
     rm docs/modules.rst
     rm docs/setup.rst
     exit