Skip to content
This repository was archived by the owner on Feb 2, 2024. It is now read-only.

Commit 542c8f5

Browse files
Remove scipy dependency (#798)
* Initial remove scipy from code * Remove scipy from README.txt
1 parent bf2becd commit 542c8f5

File tree

8 files changed

+6
-18
lines changed

8 files changed

+6
-18
lines changed

README.rst

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Building on Linux with setuptools
8888

8989
PYVER=<3.6 or 3.7>
9090
NUMPYVER=<1.16 or 1.17>
91-
conda create -n sdc-env -q -y -c intel/label/beta -c defaults -c intel -c conda-forge python=$PYVER numpy=$NUMPYVER numba=0.48.0 pandas=0.25.3 scipy pyarrow=0.15.1 gcc_linux-64 gxx_linux-64
91+
conda create -n sdc-env -q -y -c intel/label/beta -c defaults -c intel -c conda-forge python=$PYVER numpy=$NUMPYVER numba=0.48.0 pandas=0.25.3 pyarrow=0.15.1 gcc_linux-64 gxx_linux-64
9292
source activate sdc-env
9393
git clone https://github.com/IntelPython/sdc.git
9494
cd sdc
@@ -126,7 +126,7 @@ Building on Windows with setuptools
126126

127127
set PYVER=<3.6 or 3.7>
128128
set NUMPYVER=<1.16 or 1.17>
129-
conda create -n sdc-env -c intel/label/beta -c defaults -c intel -c conda-forge python=%PYVER% numpy=%NUMPYVER% numba=0.48.0 pandas=0.25.3 scipy pyarrow=0.15.1
129+
conda create -n sdc-env -c intel/label/beta -c defaults -c intel -c conda-forge python=%PYVER% numpy=%NUMPYVER% numba=0.48.0 pandas=0.25.3 pyarrow=0.15.1
130130
conda activate sdc-env
131131
set INCLUDE=%INCLUDE%;%CONDA_PREFIX%\Library\include
132132
set LIB=%LIB%;%CONDA_PREFIX%\Library\lib
@@ -156,10 +156,6 @@ Building Intel® SDC User's Guide documentation requires pre-installed Intel® S
156156
along with compatible `Pandas*`_ version as well as `Sphinx*`_ 2.2.1 or later.
157157

158158
Intel® SDC documentation includes Intel® SDC examples output which is pasted to functions description in the API Reference.
159-
In order to get the correct examples result it is required to install ``scipy`` package before documentation build:
160-
::
161-
162-
conda install scipy -c intel --override-channels
163159

164160
Use ``pip`` to install `Sphinx*`_ and extensions:
165161
::
@@ -325,9 +321,6 @@ Running unit tests
325321
------------------
326322
::
327323

328-
# Scipy is required for tests
329-
conda install -y scipy
330-
331324
python sdc/tests/gen_test_data.py
332325
python -m unittest
333326

buildscripts/build_doc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def publish_doc(sdc_utils):
9696
sdc_utils = SDC_Build_Utilities(args.python, args.sdc_channel)
9797
sdc_utils.log_info('Build Intel(R) SDC documentation', separate=True)
9898
sdc_utils.log_info(sdc_utils.line_double)
99-
sdc_utils.create_environment(['sphinx', 'sphinxcontrib-programoutput', 'scipy'])
99+
sdc_utils.create_environment(['sphinx', 'sphinxcontrib-programoutput'])
100100
sdc_utils.install_conda_package(['sdc'])
101101

102102
build_doc(sdc_utils)

buildscripts/run_benchmarks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def run_benchmarks(sdc_utils, args_list, num_threads_list):
5757
sdc_utils = SDC_Build_Utilities(args.python, args.sdc_channel)
5858
sdc_utils.log_info('Run Intel(R) SDC benchmarks', separate=True)
5959
sdc_utils.log_info(sdc_utils.line_double)
60-
sdc_utils.create_environment(['scipy', 'openpyxl', 'xlrd'])
60+
sdc_utils.create_environment(['openpyxl', 'xlrd'])
6161
sdc_utils.install_conda_package(['sdc'])
6262

6363
run_benchmarks(sdc_utils, args.args_list, args.num_threads_list)

buildscripts/run_examples.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def run_examples(sdc_utils):
8989
sdc_utils = SDC_Build_Utilities(args.python, args.sdc_channel)
9090
sdc_utils.log_info('Run Intel(R) SDC examples', separate=True)
9191
sdc_utils.log_info(sdc_utils.line_double)
92-
sdc_utils.create_environment(['scipy'])
92+
sdc_utils.create_environment()
9393
sdc_utils.install_conda_package(['sdc'])
9494

9595
run_examples(sdc_utils)

buildscripts/sdc-conda-recipe/meta.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ requirements:
3939
- setuptools
4040

4141
test:
42-
requires:
43-
- scipy
4442
imports:
4543
- sdc
4644

docs/source/conf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,7 @@
168168
intersphinx_mapping = {
169169
'pandas': ('https://pandas.pydata.org/pandas-docs/stable/', None),
170170
'python': ('http://docs.python.org/2', None),
171-
'numpy': ('http://docs.scipy.org/doc/numpy', None),
172-
'scipy': ('http://docs.scipy.org/doc/scipy/reference', None),
171+
'numpy': ('http://docs.scipy.org/doc/numpy', None)
173172
}
174173

175174
# -- Napoleon extension configuration (Numpy and Google docstring options) -------

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
scipy
21
numpy>=1.16
32
pandas==0.25.3
43
pyarrow==0.15.1

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ def run(self):
313313
packages=find_packages(),
314314
package_data={'sdc.tests': ['*.bz2'], },
315315
install_requires=[
316-
'scipy',
317316
'numpy>=1.16',
318317
'pandas==0.25.3',
319318
'pyarrow==0.15.1',

0 commit comments

Comments
 (0)