Browse code

fix syntax error

Bas Nijholt authored on 17/09/2020 22:55:18
Showing 1 changed files
... ...
@@ -5,14 +5,14 @@ channels:
5 5
 
6 6
 dependencies:
7 7
   - python
8
-  - sortedcollections=2.2.2
8
+  - sortedcollections=1.2.1
9 9
   - scikit-optimize=0.8.1
10 10
   - scikit-learn=0.23.2
11 11
   - scipy=1.5.2
12 12
   - holoviews=1.13.3
13
-  - bokeh=2.2.1=
13
+  - bokeh=2.2.1
14 14
   - plotly=4.10.0
15
-  - ipywidget7.5.1
15
+  - ipywidgets=7.5.1
16 16
   - jupyter_sphinx=0.3.1
17 17
   - atomicwrites=1.4.0
18 18
   - sphinx_fontawesome=0.0.6
Browse code

pin versions in docs/environment.yml

Bas Nijholt authored on 17/09/2020 22:24:03
Showing 1 changed files
... ...
@@ -5,18 +5,18 @@ channels:
5 5
 
6 6
 dependencies:
7 7
   - python
8
-  - sortedcollections
9
-  - scikit-optimize
10
-  - scikit-learn
11
-  - scipy
12
-  - holoviews
13
-  - bokeh
14
-  - plotly
15
-  - ipywidgets
16
-  - jupyter_sphinx
17
-  - atomicwrites
18
-  - sphinx_fontawesome
19
-  - sphinx
20
-  - m2r2
8
+  - sortedcollections=2.2.2
9
+  - scikit-optimize=0.8.1
10
+  - scikit-learn=0.23.2
11
+  - scipy=1.5.2
12
+  - holoviews=1.13.3
13
+  - bokeh=2.2.1=
14
+  - plotly=4.10.0
15
+  - ipywidget7.5.1
16
+  - jupyter_sphinx=0.3.1
17
+  - atomicwrites=1.4.0
18
+  - sphinx_fontawesome=0.0.6
19
+  - sphinx=3.2.1
20
+  - m2r2=0.2.5
21 21
   - pip:
22 22
     - sphinx_rtd_theme
Browse code

release strict pinning

Bas Nijholt authored on 01/09/2020 10:13:40
Showing 1 changed files
... ...
@@ -7,13 +7,13 @@ dependencies:
7 7
   - python
8 8
   - sortedcollections
9 9
   - scikit-optimize
10
-  - scikit-learn <=0.23.1  # because of https://github.com/scikit-optimize/scikit-optimize/issues/931, remove dep when fixed
10
+  - scikit-learn
11 11
   - scipy
12 12
   - holoviews
13 13
   - bokeh
14 14
   - plotly
15 15
   - ipywidgets
16
-  - jupyter_sphinx ==0.2.3 # because of https://github.com/jupyter/jupyter-sphinx/issues/126
16
+  - jupyter_sphinx
17 17
   - atomicwrites
18 18
   - sphinx_fontawesome
19 19
   - sphinx
Browse code

pin jupyter_sphinx to 0.2.3 See https://github.com/jupyter/jupyter-sphinx/issues/126

Bas Nijholt authored on 07/08/2020 15:54:06
Showing 1 changed files
... ...
@@ -13,7 +13,7 @@ dependencies:
13 13
   - bokeh
14 14
   - plotly
15 15
   - ipywidgets
16
-  - jupyter_sphinx
16
+  - jupyter_sphinx ==0.2.3 # because of https://github.com/jupyter/jupyter-sphinx/issues/126
17 17
   - atomicwrites
18 18
   - sphinx_fontawesome
19 19
   - sphinx
Browse code

pin scikit-learn <=0.23.1 in environment.yml files

Bas Nijholt authored on 07/08/2020 13:55:47
Showing 1 changed files
... ...
@@ -7,6 +7,7 @@ dependencies:
7 7
   - python
8 8
   - sortedcollections
9 9
   - scikit-optimize
10
+  - scikit-learn <=0.23.1  # because of https://github.com/scikit-optimize/scikit-optimize/issues/931, remove dep when fixed
10 11
   - scipy
11 12
   - holoviews
12 13
   - bokeh
Browse code

use m2r2 because m2r is unmaintained

Bas Nijholt authored on 07/08/2020 13:14:20
Showing 1 changed files
... ...
@@ -15,7 +15,7 @@ dependencies:
15 15
   - jupyter_sphinx
16 16
   - atomicwrites
17 17
   - sphinx_fontawesome
18
-  - sphinx=2.4.4  # because https://github.com/miyakogi/m2r/pull/55
19
-  - m2r
18
+  - sphinx
19
+  - m2r2
20 20
   - pip:
21 21
     - sphinx_rtd_theme
Browse code

attempt to fix documentation

Bas Nijholt authored on 08/04/2020 18:14:56
Showing 1 changed files
... ...
@@ -4,17 +4,18 @@ channels:
4 4
   - conda-forge
5 5
 
6 6
 dependencies:
7
-  - python=3.7.3
8
-  - sortedcollections=1.1.2
9
-  - scikit-optimize=0.5.2
10
-  - scipy=1.2.1
11
-  - holoviews=1.11.3
12
-  - bokeh=1.0.4
13
-  - plotly=3.9.0
14
-  - ipywidgets=7.4.2
15
-  - jupyter_sphinx=0.2.2
16
-  - atomicwrites=1.3.0
17
-  - pyviz_comms=0.7.2
7
+  - python
8
+  - sortedcollections
9
+  - scikit-optimize
10
+  - scipy
11
+  - holoviews
12
+  - bokeh
13
+  - plotly
14
+  - ipywidgets
15
+  - jupyter_sphinx
16
+  - atomicwrites
17
+  - sphinx_fontawesome
18
+  - sphinx=2.4.4  # because https://github.com/miyakogi/m2r/pull/55
19
+  - m2r
18 20
   - pip:
19
-    - sphinx_fontawesome==0.0.6
20
-    - m2r==0.2.1
21
+    - sphinx_rtd_theme
Browse code

pin pyviz_comms=0.7.2

HoloViews didn't have a strict pinning for it.
In the new version https://github.com/holoviz/pyviz_comms/blob/v0.7.2/pyviz_comms/__init__.py#L102
was removed, while holoviews=1.11.3 seems to depend on it.

Bas Nijholt authored on 07/04/2020 10:08:22
Showing 1 changed files
... ...
@@ -14,6 +14,7 @@ dependencies:
14 14
   - ipywidgets=7.4.2
15 15
   - jupyter_sphinx=0.2.2
16 16
   - atomicwrites=1.3.0
17
+  - pyviz_comms=0.7.2
17 18
   - pip:
18 19
     - sphinx_fontawesome==0.0.6
19 20
     - m2r==0.2.1
Browse code

update jupyter-sphinx requirement

Joseph Weston authored on 21/11/2019 13:04:42
Showing 1 changed files
... ...
@@ -12,9 +12,8 @@ dependencies:
12 12
   - bokeh=1.0.4
13 13
   - plotly=3.9.0
14 14
   - ipywidgets=7.4.2
15
-  # - jupyter_sphinx=0.2.1
15
+  - jupyter_sphinx=0.2.2
16 16
   - atomicwrites=1.3.0
17 17
   - pip:
18
-    - git+https://github.com/jbweston/jupyter-sphinx.git@feature/disable-stderr  # XXX: removed when merged in
19 18
     - sphinx_fontawesome==0.0.6
20 19
     - m2r==0.2.1
Browse code

Merge remote-tracking branch 'origin/stable-0.8'

Bas Nijholt authored on 31/08/2019 15:00:04
Showing 0 changed files
Browse code

jupyter_execute_disable_stderr=True to not make sphinx fail on a DeprecationWarning

Bas Nijholt authored on 29/07/2019 13:10:43
Showing 1 changed files
... ...
@@ -12,7 +12,8 @@ dependencies:
12 12
   - bokeh=1.0.4
13 13
   - plotly=3.9.0
14 14
   - ipywidgets=7.4.2
15
-  - jupyter_sphinx=0.2.0
15
+  # - jupyter_sphinx=0.2.1
16 16
   - pip:
17
+    - git+https://github.com/jbweston/jupyter-sphinx.git@feature/disable-stderr  # XXX: removed when merged in
17 18
     - sphinx_fontawesome==0.0.6
18 19
     - m2r==0.2.1
Browse code

use jupyter_sphinx v0.2.0 from conda instead of my branch

Bas Nijholt authored on 10/07/2019 19:07:47
Showing 1 changed files
... ...
@@ -12,7 +12,7 @@ dependencies:
12 12
   - bokeh=1.0.4
13 13
   - plotly=3.9.0
14 14
   - ipywidgets=7.4.2
15
+  - jupyter_sphinx=0.2.0
15 16
   - pip:
16
-    - git+https://github.com/basnijholt/jupyter-sphinx.git@widgets_execute
17 17
     - sphinx_fontawesome==0.0.6
18 18
     - m2r==0.2.1
Browse code

ensure atomic writes when saving a file

Right now, if a program crashes in the middle of saving, you lose
all your data.

Right now, if a program crashes in the middle of saving, you lose
all your data. This ensures that the old file is first moved, then
the new file is saved, and only then the old file is removed.

Bas Nijholt authored on 21/06/2019 00:04:07
Showing 1 changed files
... ...
@@ -12,6 +12,7 @@ dependencies:
12 12
   - bokeh=1.0.4
13 13
   - plotly=3.9.0
14 14
   - ipywidgets=7.4.2
15
+  - atomicwrites=1.3.0
15 16
   - pip:
16 17
     - git+https://github.com/basnijholt/jupyter-sphinx.git@widgets_execute
17 18
     - sphinx_fontawesome==0.0.6
Browse code

pin everything in the docs/environment.yml file (#194)

The documentation is broken once again.

Bas Nijholt authored on 10/05/2019 03:25:35 • GitHub committed on 10/05/2019 03:25:35
Showing 1 changed files
... ...
@@ -1,18 +1,18 @@
1 1
 name: adaptive
2 2
 
3 3
 channels:
4
-- conda-forge
4
+  - conda-forge
5 5
 
6 6
 dependencies:
7
-  - python=3.7
7
+  - python=3.7.3
8
+  - sortedcollections=1.1.2
9
+  - scikit-optimize=0.5.2
10
+  - scipy=1.2.1
11
+  - holoviews=1.11.3
12
+  - bokeh=1.0.4
13
+  - plotly=3.9.0
14
+  - ipywidgets=7.4.2
8 15
   - pip:
9
-    - sortedcollections
10
-    - scipy
11
-    - holoviews==1.12*
12
-    - bokeh==1.1*
13
-    - plotly
14
-    - ipywidgets
15
-    - scikit-optimize
16 16
     - git+https://github.com/basnijholt/jupyter-sphinx.git@widgets_execute
17
-    - sphinx_fontawesome
18
-    - m2r
17
+    - sphinx_fontawesome==0.0.6
18
+    - m2r==0.2.1
Browse code

pin bokeh in the docs/environment.yml file

Bas Nijholt authored on 08/05/2019 02:55:15
Showing 1 changed files
... ...
@@ -4,16 +4,13 @@ channels:
4 4
 - conda-forge
5 5
 
6 6
 dependencies:
7
-  - python=3.6
7
+  - python=3.7
8 8
   - pip:
9 9
     - sortedcollections
10 10
     - scipy
11
-    - holoviews==1.11
12
-    - bokeh
11
+    - holoviews==1.12*
12
+    - bokeh==1.1*
13 13
     - plotly
14
-    - ipyparallel
15
-    - pandas  # until https://github.com/ioam/holoviews/issues/3430 is fixed
16
-    - distributed
17 14
     - ipywidgets
18 15
     - scikit-optimize
19 16
     - git+https://github.com/basnijholt/jupyter-sphinx.git@widgets_execute
Browse code

do not install adaptive from master in building docs

In the readthedocs.org settings we enabled to install the
repo code.

Bas Nijholt authored on 26/03/2019 16:00:20
Showing 1 changed files
... ...
@@ -17,6 +17,5 @@ dependencies:
17 17
     - ipywidgets
18 18
     - scikit-optimize
19 19
     - git+https://github.com/basnijholt/jupyter-sphinx.git@widgets_execute
20
-    - git+https://github.com/python-adaptive/adaptive.git@master  # temporary solution because jupyter-sphinx doesn't use the adaptive from the repo
21 20
     - sphinx_fontawesome
22 21
     - m2r
Browse code

pin holoviews=1.11 in environment.yml for RTD

Currently, the plots aren't displayed on RTD.

Bas Nijholt authored on 25/01/2019 15:11:17
Showing 1 changed files
... ...
@@ -6,19 +6,16 @@ channels:
6 6
 dependencies:
7 7
   - python=3.6
8 8
   - pip:
9
-    - sortedcontainers
9
+    - sortedcollections
10 10
     - scipy
11
-    - holoviews
12
-    - bokeh==0.13
11
+    - holoviews==1.11
12
+    - bokeh
13 13
     - plotly
14 14
     - ipyparallel
15
+    - pandas  # until https://github.com/ioam/holoviews/issues/3430 is fixed
15 16
     - distributed
16
-    - ipykernel>=4.8*
17
-    - jupyter_client>=5.2.2
18 17
     - ipywidgets
19 18
     - scikit-optimize
20
-    - nbconvert>=5.4*  # because my jupyter-sphinx branch depends on it
21
-    - sphinx_rtd_theme
22 19
     - git+https://github.com/basnijholt/jupyter-sphinx.git@widgets_execute
23 20
     - git+https://github.com/python-adaptive/adaptive.git@master  # temporary solution because jupyter-sphinx doesn't use the adaptive from the repo
24 21
     - sphinx_fontawesome
Browse code

pin bokeh=0.13 for now

Because it breaks the examples in the docs

Bas Nijholt authored on 25/10/2018 13:37:45
Showing 1 changed files
... ...
@@ -9,7 +9,7 @@ dependencies:
9 9
     - sortedcontainers
10 10
     - scipy
11 11
     - holoviews
12
-    - bokeh
12
+    - bokeh==0.13
13 13
     - plotly
14 14
     - ipyparallel
15 15
     - distributed
Browse code

improve 'notebook_extension' and add 'plotly' as a dependency

Bas Nijholt authored on 20/10/2018 13:04:45
Showing 1 changed files
... ...
@@ -10,6 +10,7 @@ dependencies:
10 10
     - scipy
11 11
     - holoviews
12 12
     - bokeh
13
+    - plotly
13 14
     - ipyparallel
14 15
     - distributed
15 16
     - ipykernel>=4.8*
Browse code

add the authors to the documentation

and remove the code to find the complete author list from git because
our CI job will ensure that all the contributors will be included
in that file.

Bas Nijholt authored on 19/10/2018 13:56:19
Showing 1 changed files
... ...
@@ -21,3 +21,4 @@ dependencies:
21 21
     - git+https://github.com/basnijholt/jupyter-sphinx.git@widgets_execute
22 22
     - git+https://github.com/python-adaptive/adaptive.git@master  # temporary solution because jupyter-sphinx doesn't use the adaptive from the repo
23 23
     - sphinx_fontawesome
24
+    - m2r
Browse code

try installing the docs environment using pip to avoid build timeouts

Related:
* https://github.com/rtfd/readthedocs.org/issues/4778
* https://docs.readthedocs.io/en/latest/guides/build-using-too-many-resources.html

Bas Nijholt authored on 18/10/2018 16:36:54
Showing 1 changed files
... ...
@@ -5,18 +5,19 @@ channels:
5 5
 
6 6
 dependencies:
7 7
   - python=3.6
8
-  - sortedcontainers
9
-  - scipy
10
-  - holoviews
11
-  - ipyparallel
12
-  - distributed
13
-  - ipykernel>=4.8*
14
-  - jupyter_client>=5.2.2
15
-  - ipywidgets
16
-  - scikit-optimize
17
-  - nbconvert>=5.4*  # because my jupyter-sphinx branch depends on it
18 8
   - pip:
19
-      - sphinx_rtd_theme
20
-      - git+https://github.com/basnijholt/jupyter-sphinx.git@widgets_execute
21
-      - git+https://github.com/python-adaptive/adaptive.git@master  # temporary solution because jupyter-sphinx doesn't use the adaptive from the repo
22
-      - sphinx_fontawesome
9
+    - sortedcontainers
10
+    - scipy
11
+    - holoviews
12
+    - bokeh
13
+    - ipyparallel
14
+    - distributed
15
+    - ipykernel>=4.8*
16
+    - jupyter_client>=5.2.2
17
+    - ipywidgets
18
+    - scikit-optimize
19
+    - nbconvert>=5.4*  # because my jupyter-sphinx branch depends on it
20
+    - sphinx_rtd_theme
21
+    - git+https://github.com/basnijholt/jupyter-sphinx.git@widgets_execute
22
+    - git+https://github.com/python-adaptive/adaptive.git@master  # temporary solution because jupyter-sphinx doesn't use the adaptive from the repo
23
+    - sphinx_fontawesome
Browse code

make the examples in the docs use actual HoloViews

Bas Nijholt authored on 18/10/2018 15:43:00
Showing 1 changed files
... ...
@@ -19,3 +19,4 @@ dependencies:
19 19
       - sphinx_rtd_theme
20 20
       - git+https://github.com/basnijholt/jupyter-sphinx.git@widgets_execute
21 21
       - git+https://github.com/python-adaptive/adaptive.git@master  # temporary solution because jupyter-sphinx doesn't use the adaptive from the repo
22
+      - sphinx_fontawesome
Browse code

small documentation improvements

Bas Nijholt authored on 18/10/2018 13:46:58
Showing 1 changed files
... ...
@@ -14,6 +14,8 @@ dependencies:
14 14
   - jupyter_client>=5.2.2
15 15
   - ipywidgets
16 16
   - scikit-optimize
17
+  - nbconvert>=5.4*  # because my jupyter-sphinx branch depends on it
17 18
   - pip:
18 19
       - sphinx_rtd_theme
19 20
       - git+https://github.com/basnijholt/jupyter-sphinx.git@widgets_execute
21
+      - git+https://github.com/python-adaptive/adaptive.git@master  # temporary solution because jupyter-sphinx doesn't use the adaptive from the repo
Browse code

add tutorials

Bas Nijholt authored on 17/10/2018 13:30:10
Showing 1 changed files
... ...
@@ -16,3 +16,4 @@ dependencies:
16 16
   - scikit-optimize
17 17
   - pip:
18 18
       - sphinx_rtd_theme
19
+      - git+https://github.com/basnijholt/jupyter-sphinx.git@widgets_execute
Browse code

add doc files

Bas Nijholt authored on 16/10/2018 18:10:12
Showing 1 changed files
... ...
@@ -13,6 +13,6 @@ dependencies:
13 13
   - ipykernel>=4.8*
14 14
   - jupyter_client>=5.2.2
15 15
   - ipywidgets
16
+  - scikit-optimize
16 17
   - pip:
17 18
       - sphinx_rtd_theme
18
-      - recommonmark
Browse code

add readthedocs environment

Joseph Weston authored on 09/10/2018 14:01:30 • Bas Nijholt committed on 16/10/2018 18:12:39
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,18 @@
1
+name: adaptive
2
+
3
+channels:
4
+- conda-forge
5
+
6
+dependencies:
7
+  - python=3.6
8
+  - sortedcontainers
9
+  - scipy
10
+  - holoviews
11
+  - ipyparallel
12
+  - distributed
13
+  - ipykernel>=4.8*
14
+  - jupyter_client>=5.2.2
15
+  - ipywidgets
16
+  - pip:
17
+      - sphinx_rtd_theme
18
+      - recommonmark