From 304774d78e7dca1b65453704f6eb291d42c5a06c Mon Sep 17 00:00:00 2001
From: Nikolay Ivanov <simply_nicky@nikolays-mbp.localdomain>
Date: Mon, 23 Nov 2020 22:32:47 +0100
Subject: [PATCH] removing channel_priority, readthedocs fixes
---
docs/conf.py | 8 +++++++-
docs/rtd_environment.yml | 1 -
environment.yml | 1 -
readthedocs.yml | 17 +++++------------
4 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index b5b943a..548ec88 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,9 +12,15 @@
#
import os
import sys
-sys.path.insert(0, os.path.abspath('../'))
+if (os.environ.get("READTHEDOCS") == "True") is False:
+ sys.path.insert(0, os.path.abspath('..'))
+else:
+ import site
+ p = site.getsitepackages()[0]
+ sys.path.insert(0, p)
+
# -- Project information -----------------------------------------------------
project = 'robust_speckle_tracking'
diff --git a/docs/rtd_environment.yml b/docs/rtd_environment.yml
index 4cc5081..0f28a7b 100644
--- a/docs/rtd_environment.yml
+++ b/docs/rtd_environment.yml
@@ -2,7 +2,6 @@ name: rst
channels:
- conda-forge
- defaults
-channel_priority: strict
dependencies:
- cython
- python=3.7
diff --git a/environment.yml b/environment.yml
index 6c016dc..677da42 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,7 +2,6 @@ name: rst
channels:
- conda-forge
- defaults
-channel_priority: strict
dependencies:
- cython
- python=3.7
diff --git a/readthedocs.yml b/readthedocs.yml
index b7e53ec..8e2bb68 100644
--- a/readthedocs.yml
+++ b/readthedocs.yml
@@ -1,19 +1,12 @@
# readthedocs.yml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Build documentation in the docs/ directory with Sphinx
-sphinx:
- configuration: docs/conf.py
+build:
+ image: latest
conda:
- environment: docs/rtd_environment.yml
+ environment: docs/rtd_environment.yml
python:
- version: 3.7
- install:
- - method: setuptools
- path: .
\ No newline at end of file
+ version: 3.7
+ setup_py_install: true
\ No newline at end of file
--
GitLab