diff options
author | Jarrod Millman <jarrod.millman@gmail.com> | 2021-05-13 12:21:08 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-13 12:21:08 -0700 |
commit | 56abf2edfb4c061e027dba1d98adaf3d98e38f4b (patch) | |
tree | 1083fa4938a2324c4684dcd70493fb5522fbfbba | |
parent | ba7992d8cb8fd0ae08a1a23144db4f3e23178673 (diff) | |
download | networkx-56abf2edfb4c061e027dba1d98adaf3d98e38f4b.tar.gz |
Remove mayavi and cartopy dependencies (#4800)
-rw-r--r-- | .circleci/config.yml | 17 | ||||
-rw-r--r-- | .github/workflows/deploy-docs.yml | 8 | ||||
-rw-r--r-- | doc/conf.py | 7 | ||||
-rw-r--r-- | examples/3d_drawing/mayavi2_spring.py (renamed from examples/3d_drawing/plot_mayavi2_spring.py) | 0 | ||||
-rw-r--r-- | requirements/example-requirements.txt | 3 | ||||
-rw-r--r-- | requirements/example.txt | 6 |
6 files changed, 0 insertions, 41 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index de4b2263..2d21effc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,26 +26,10 @@ jobs: sudo apt-get install texlive texlive-latex-extra latexmk texlive-xetex fonts-freefont-otf xindy - run: - name: Install cartopy dependencies - command: | - sudo apt-get install libgeos-dev libproj-dev - - - run: name: Install pysal dependencies command: | sudo apt-get install libspatialindex-dev - - run: - name: Install mayavi dependencies - command : | - sudo apt-get --no-install-recommends install -y libxkbcommon-x11-0 optipng libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 xcb libxcb-xfixes0 libxcb-xinerama0 libxcb-shape0 xvfb - - - run: - name: Configure for headless mayavi - command: | - echo "export DISPLAY=:99" >> $BASH_ENV - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x200x24 -ac +extension GLX +render -noreset; - - restore_cache: keys: - pip-cache-v1 @@ -58,7 +42,6 @@ jobs: pip install --upgrade pip wheel setuptools pip install -r requirements.txt pip install -r requirements/extra.txt - pip install -r requirements/example-requirements.txt pip install -r requirements/example.txt pip install -r requirements/doc.txt pip list diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 687d6a8c..9fccc06c 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -25,21 +25,13 @@ jobs: sudo apt-get install libgdal-dev graphviz graphviz-dev sudo apt-get install texlive texlive-latex-extra latexmk texlive-xetex sudo apt-get install fonts-freefont-otf xindy - sudo apt-get install libgeos-dev libproj-dev sudo apt-get install libspatialindex-dev - - name: Mayavi setup - run: | - sudo apt-get --no-install-recommends install -y libxkbcommon-x11-0 optipng libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 xcb libxcb-xfixes0 libxcb-xinerama0 libxcb-shape0 - export DISPLAY=:99 - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x200x24 -ac +extension GLX +render -noreset; - - name: Install packages run: | pip install --upgrade pip wheel setuptools pip install -r requirements.txt pip install -r requirements/extra.txt - pip install -r requirements/example-requirements.txt pip install -r requirements/example.txt pip install -U -r requirements/doc.txt export CPLUS_INCLUDE_PATH=/usr/include/gdal diff --git a/doc/conf.py b/doc/conf.py index 65c3359c..1112b281 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,13 +51,6 @@ sphinx_gallery_conf = { "backreferences_dir": "modules/generated", "image_scrapers": ("matplotlib",), } -# Add mayavi scraper, if available -try: - import mayavi - - sphinx_gallery_conf["image_scrapers"] += ("mayavi",) -except ImportError: - pass # Add pygraphviz png scraper, if available try: from pygraphviz.scraper import PNGScraper diff --git a/examples/3d_drawing/plot_mayavi2_spring.py b/examples/3d_drawing/mayavi2_spring.py index bec09694..bec09694 100644 --- a/examples/3d_drawing/plot_mayavi2_spring.py +++ b/examples/3d_drawing/mayavi2_spring.py diff --git a/requirements/example-requirements.txt b/requirements/example-requirements.txt deleted file mode 100644 index 8dec5347..00000000 --- a/requirements/example-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# For mayavi -vtk>=9.0 -pyqt5==5.15.1 diff --git a/requirements/example.txt b/requirements/example.txt index 75a589ec..bea4d088 100644 --- a/requirements/example.txt +++ b/requirements/example.txt @@ -1,12 +1,6 @@ -Cartopy==0.18 -# Required for Cartopy ---no-binary shapely -shapely -# Required for Cartopy osmnx>=0.16 momepy>=0.4 contextily>=1.0 -mayavi>=4.7 seaborn>=0.11 cairocffi>=1.2 python-igraph>=0.8.3 |