Merge pull request #22 from kmpaul/cleanup

Cleanup before release
dask · Jan 30, 2019 · 8e12b9e · 8e12b9e
2 parents 49971fe + bac1170
commit 8e12b9e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,17 +23,17 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: deps-{{ .Branch }}-2.7-mpich-{{ checksum "ci/environment-dev-2.7-mpich.yml" }}
+          key: deps-{{ .Branch }}-2.7-mpich-{{ checksum ".circleci/env-2.7-mpich.yml" }}
       - run:
           name: Install and activate conda environment
-          command: ./ci/install-circle.sh
+          command: .circleci/install.sh
       - run:
           name: Running tests
           command: |
             source activate ${ENV_NAME}
             pytest --junitxml=test-reports/junit.xml --cov=./ dask_mpi/tests/ --verbose
       - save_cache:
-          key: deps-{{ .Branch }}-2.7-mpich-{{ checksum "ci/environment-dev-2.7-mpich.yml" }}
+          key: deps-{{ .Branch }}-2.7-mpich-{{ checksum ".circleci/env-2.7-mpich.yml" }}
           paths:
             - "/opt/conda/envs/${ENV_NAME}/"
             - "/opt/conda/pkgs"
@@ -53,17 +53,17 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: deps-{{ .Branch }}-2.7-openmpi-{{ checksum "ci/environment-dev-2.7-openmpi.yml" }}
+          key: deps-{{ .Branch }}-2.7-openmpi-{{ checksum ".circleci/env-2.7-openmpi.yml" }}
       - run:
           name: Install and activate conda environment
-          command: ./ci/install-circle.sh
+          command: .circleci/install.sh
       - run:
           name: Running tests
           command: |
             source activate ${ENV_NAME}
             pytest --junitxml=test-reports/junit.xml --cov=./ dask_mpi/tests/ --verbose
       - save_cache:
-          key: deps-{{ .Branch }}-2.7-openmpi-{{ checksum "ci/environment-dev-2.7-openmpi.yml" }}
+          key: deps-{{ .Branch }}-2.7-openmpi-{{ checksum ".circleci/env-2.7-openmpi.yml" }}
           paths:
             - "/opt/conda/envs/${ENV_NAME}/"
             - "/opt/conda/pkgs"
@@ -80,17 +80,17 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: deps-{{ .Branch }}-3.6-mpich-{{ checksum "ci/environment-dev-3.6-mpich.yml" }}
+          key: deps-{{ .Branch }}-3.6-mpich-{{ checksum ".circleci/env-3.6-mpich.yml" }}
       - run:
           name: Install and activate conda environment
-          command: ./ci/install-circle.sh
+          command: .circleci/install.sh
       - run:
           name: Running tests
           command: |
             source activate ${ENV_NAME}
             pytest --junitxml=test-reports/junit.xml --cov=./ dask_mpi/tests/ --verbose
       - save_cache:
-          key: deps-{{ .Branch }}-3.6-mpich-{{ checksum "ci/environment-dev-3.6-mpich.yml" }}
+          key: deps-{{ .Branch }}-3.6-mpich-{{ checksum ".circleci/env-3.6-mpich.yml" }}
           paths:
             - "/opt/conda/envs/${ENV_NAME}/"
             - "/opt/conda/pkgs"
@@ -116,17 +116,17 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: deps-{{ .Branch }}-3.6-openmpi-{{ checksum "ci/environment-dev-3.6-openmpi.yml" }}
+          key: deps-{{ .Branch }}-3.6-openmpi-{{ checksum ".circleci/env-3.6-openmpi.yml" }}
       - run:
           name: Install and activate conda environment
-          command: ./ci/install-circle.sh
+          command: .circleci/install.sh
       - run:
           name: Running tests
           command: |
             source activate ${ENV_NAME}
             pytest --junitxml=test-reports/junit.xml --cov=./ dask_mpi/tests/ --verbose
       - save_cache:
-          key: deps-{{ .Branch }}-3.6-openmpi-{{ checksum "ci/environment-dev-3.6-openmpi.yml" }}
+          key: deps-{{ .Branch }}-3.6-openmpi-{{ checksum ".circleci/env-3.6-openmpi.yml" }}
           paths:
             - "/opt/conda/envs/${ENV_NAME}/"
             - "/opt/conda/pkgs"

diff --git a/ci/environment-dev-2.7-mpich.yml → .circleci/env-2.7-mpich.yml b/ci/environment-dev-2.7-mpich.yml → .circleci/env-2.7-mpich.yml
diff --git a/ci/environment-dev-2.7-openmpi.yml → .circleci/env-2.7-openmpi.yml b/ci/environment-dev-2.7-openmpi.yml → .circleci/env-2.7-openmpi.yml
diff --git a/ci/environment-dev-3.6-mpich.yml → .circleci/env-3.6-mpich.yml b/ci/environment-dev-3.6-mpich.yml → .circleci/env-3.6-mpich.yml
diff --git a/ci/environment-dev-3.6-openmpi.yml → .circleci/env-3.6-openmpi.yml b/ci/environment-dev-3.6-openmpi.yml → .circleci/env-3.6-openmpi.yml
diff --git a/ci/install-circle.sh → .circleci/install.sh b/ci/install-circle.sh → .circleci/install.sh
@@ -7,7 +7,7 @@ conda config --set always_yes true --set changeps1 false --set quiet true
 conda update -q conda
 conda config --set pip_interop_enabled True # Enable pip interoperability
 conda config --add channels conda-forge
-conda env create -f ci/environment-dev-${PYTHON}-${MPI}.yml --name=${ENV_NAME} --quiet
+conda env create -f .circleci/env-${PYTHON}-${MPI}.yml --name=${ENV_NAME} --quiet
 conda env list
 source activate ${ENV_NAME}
 pip install pip --upgrade

diff --git a/dask_mpi/tests/core_basic.py b/dask_mpi/tests/core_basic.py
@@ -2,7 +2,7 @@
 from distributed import Client
 from distributed.metrics import time
 
-from dask_mpi.core import initialize
+from dask_mpi import initialize
 
 initialize()