diff --git a/README.rst b/README.rst index 06a813dd..77859d4a 100644 --- a/README.rst +++ b/README.rst @@ -48,24 +48,6 @@ After installing scikit-ued you can use it like any other Python module as ``sku Each version is tested against **Python 3.6**. If you are using a different version, tests can be run using the standard library's `unittest` module. -Installation on Windows ------------------------ - -Some of scikit-ued's dependencies require compilation. If you are experiencing problems installing scikit-ued on Windows, here are some potential solutions: - -* Install a C/C++ compiler. The easiest way to do so is to install the `Visual Studio Build Tools `_. More information is available on the `Python Wiki `_. Don't forget to upgrade setuptools to the latest version as well to avoid common problems:: - - pip install --upgrade setuptools - -* Download the wheels from scikit-ued's `wheelhouse `_. These are pre-compiled dependencies that will only work on Windows. To install a wheel, you can use pip:: - - pip install some-pkg.whl - -* Install the dependencies using the `conda package manager `_. Most notably, spglib and pycifrw are both available in the conda-forge channel:: - - conda config --add channels conda-forge - conda install spglib pycifrw numpy scipy ... - Optional dependencies --------------------- diff --git a/docs/source/installation.rst b/docs/source/installation.rst index d80b8b3d..8456428e 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -33,22 +33,6 @@ repository:: cd scikit-ued python setup.py install -Installation on Windows ------------------------ - -Some of scikit-ued's dependencies require compilation. - -If you are experiencing problems installing scikit-ued on Windows, you should consider installing scikit-ued from the conda package manager. -If you are unable to do this, here are some options: - - * Install a C/C++ compiler. The easiest way to do so is to install the `Visual Studio Build Tools `_. More information is available on the `Python Wiki `_. Don't forget to upgrade setuptools to the latest version as well to avoid common problems:: - - pip install --upgrade setuptools - - * Download the wheels from scikit-ued's `wheelhouse `_. These are pre-compiled dependencies that will only work on Windows. To install a wheel, you can use pip:: - - pip install some-pkg.whl - Testing ======= diff --git a/wheelhouse/Pillow-5.1.0-cp36-cp36m-win_amd64.whl b/wheelhouse/Pillow-5.1.0-cp36-cp36m-win_amd64.whl deleted file mode 100644 index 0183f879..00000000 Binary files a/wheelhouse/Pillow-5.1.0-cp36-cp36m-win_amd64.whl and /dev/null differ diff --git a/wheelhouse/PyCifRW-4.4-cp36-cp36m-win_amd64.whl b/wheelhouse/PyCifRW-4.4-cp36-cp36m-win_amd64.whl deleted file mode 100644 index 44133d84..00000000 Binary files a/wheelhouse/PyCifRW-4.4-cp36-cp36m-win_amd64.whl and /dev/null differ diff --git a/wheelhouse/PyWavelets-0.5.2-cp36-none-win_amd64.whl b/wheelhouse/PyWavelets-0.5.2-cp36-none-win_amd64.whl deleted file mode 100644 index 690e86b2..00000000 Binary files a/wheelhouse/PyWavelets-0.5.2-cp36-none-win_amd64.whl and /dev/null differ diff --git a/wheelhouse/cloudpickle-0.5.3-py2.py3-none-any.whl b/wheelhouse/cloudpickle-0.5.3-py2.py3-none-any.whl deleted file mode 100644 index 9346cc1b..00000000 Binary files a/wheelhouse/cloudpickle-0.5.3-py2.py3-none-any.whl and /dev/null differ diff --git a/wheelhouse/dask-0.17.5-py3-none-any.whl b/wheelhouse/dask-0.17.5-py3-none-any.whl deleted file mode 100644 index e4e33f1a..00000000 Binary files a/wheelhouse/dask-0.17.5-py3-none-any.whl and /dev/null differ diff --git a/wheelhouse/decorator-4.3.0-py2.py3-none-any.whl b/wheelhouse/decorator-4.3.0-py2.py3-none-any.whl deleted file mode 100644 index 00fd1045..00000000 Binary files a/wheelhouse/decorator-4.3.0-py2.py3-none-any.whl and /dev/null differ diff --git a/wheelhouse/networkx-2.1-py2.py3-none-any.whl b/wheelhouse/networkx-2.1-py2.py3-none-any.whl deleted file mode 100644 index d2fb385e..00000000 Binary files a/wheelhouse/networkx-2.1-py2.py3-none-any.whl and /dev/null differ diff --git a/wheelhouse/npstreams-1.5.1-py3-none-any.whl b/wheelhouse/npstreams-1.5.1-py3-none-any.whl deleted file mode 100644 index fb6055c7..00000000 Binary files a/wheelhouse/npstreams-1.5.1-py3-none-any.whl and /dev/null differ diff --git a/wheelhouse/numpy-1.14.3-cp36-none-win_amd64.whl b/wheelhouse/numpy-1.14.3-cp36-none-win_amd64.whl deleted file mode 100644 index bfe79a99..00000000 Binary files a/wheelhouse/numpy-1.14.3-cp36-none-win_amd64.whl and /dev/null differ diff --git a/wheelhouse/scikit_image-0.14.0-cp36-none-win_amd64.whl b/wheelhouse/scikit_image-0.14.0-cp36-none-win_amd64.whl deleted file mode 100644 index 78cbb847..00000000 Binary files a/wheelhouse/scikit_image-0.14.0-cp36-none-win_amd64.whl and /dev/null differ diff --git a/wheelhouse/scikit_ued-1.0.0.0-py3-none-any.whl b/wheelhouse/scikit_ued-1.0.0.0-py3-none-any.whl deleted file mode 100644 index 1e564eb9..00000000 Binary files a/wheelhouse/scikit_ued-1.0.0.0-py3-none-any.whl and /dev/null differ diff --git a/wheelhouse/scipy-1.1.0-cp36-none-win_amd64.whl b/wheelhouse/scipy-1.1.0-cp36-none-win_amd64.whl deleted file mode 100644 index 7afa0555..00000000 Binary files a/wheelhouse/scipy-1.1.0-cp36-none-win_amd64.whl and /dev/null differ diff --git a/wheelhouse/six-1.11.0-py2.py3-none-any.whl b/wheelhouse/six-1.11.0-py2.py3-none-any.whl deleted file mode 100644 index 59960239..00000000 Binary files a/wheelhouse/six-1.11.0-py2.py3-none-any.whl and /dev/null differ diff --git a/wheelhouse/spglib-1.10.3.65-cp36-cp36m-win_amd64.whl b/wheelhouse/spglib-1.10.3.65-cp36-cp36m-win_amd64.whl deleted file mode 100644 index 23cadd6c..00000000 Binary files a/wheelhouse/spglib-1.10.3.65-cp36-cp36m-win_amd64.whl and /dev/null differ diff --git a/wheelhouse/tifffile-0.14.0-cp36-cp36m-win_amd64.whl b/wheelhouse/tifffile-0.14.0-cp36-cp36m-win_amd64.whl deleted file mode 100644 index 0efc3d0b..00000000 Binary files a/wheelhouse/tifffile-0.14.0-cp36-cp36m-win_amd64.whl and /dev/null differ diff --git a/wheelhouse/toolz-0.9.0-py3-none-any.whl b/wheelhouse/toolz-0.9.0-py3-none-any.whl deleted file mode 100644 index 2eed41c6..00000000 Binary files a/wheelhouse/toolz-0.9.0-py3-none-any.whl and /dev/null differ