Skip to content

Commit 9d5c6a9

Browse files
authored
Merge pull request #1562 from croth1/modernize_docs
2 parents 2c658b8 + e268515 commit 9d5c6a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+50
-120
lines changed

.ci_scripts/environment.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ channels:
44
dependencies:
55
- python=3
66
- conda-smithy
7-
- sphinx<3
8-
- docutils<0.18
7+
- sphinx
98
- cloud_sptheme
109
- sphinxcontrib-fulltoc
1110
- make
1211
- xonsh
13-
- recommonmark
12+
- myst-parser
1413
- pyyaml
1514
- jinja2
1615
- requests

.ci_scripts/update_docs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ rm -rf docs/
2626
python .ci_scripts/generate_cfep_index.py
2727

2828
pushd src
29-
make html
29+
30+
# -W --keep-going: list all warnings but fail build in case there are any
31+
# -n: check validity of all links
32+
make html SPHINXOPTS="-W --keep-going -n"
3033
mv _build/html ../docs
3134
rm -rf _build
3235
popd

misc/DEV_MEETING_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# YYYY-MM-DD conda-forge core meeting
22

3-
****
43
## Attendees
54
List the attendees for the meeting
65

src/conf.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import datetime
1818

1919
import cloud_sptheme as csp
20-
import recommonmark.parser
2120

2221
# If extensions (or modules to document with autodoc) are in another directory,
2322
# add these directories to sys.path here. If the directory is relative to the
@@ -33,6 +32,7 @@
3332
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
3433
# ones.
3534
extensions = [
35+
'myst_parser',
3636
'sphinx.ext.todo',
3737
'sphinxcontrib.fulltoc',
3838
'sphinxcontrib.newsfeed',
@@ -41,10 +41,6 @@
4141
# Add any paths that contain templates here, relative to this directory.
4242
templates_path = ['_templates']
4343

44-
# Transpile markdown into rest
45-
source_parsers = {
46-
'.md': 'recommonmark.parser.CommonMarkParser',
47-
}
4844

4945
# The suffix(es) of source filenames.
5046
# You can specify multiple suffix as a list of string:
@@ -86,7 +82,7 @@
8682
# List of patterns, relative to source directory, that match files and
8783
# directories to ignore when looking for source files.
8884
# This patterns also effect to html_static_path and html_extra_path
89-
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
85+
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', 'README.md']
9086

9187
# The reST default role (used for this markup: `text`) to use for all
9288
# documents.

src/maintainer/adding_pkgs.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -754,10 +754,9 @@ Jinja expressions serve following purposes in the meta.yaml:
754754

755755
- They allow defining variables to avoid code duplication. Using a variable for the ``version`` allows changing the version only once with every update.
756756

757-
.. code-block:: yaml
757+
.. code-block:: yaml+jinja
758758

759759
{% set version = "3.7.3" %}
760-
[...]
761760

762761
package:
763762
name: python
@@ -769,7 +768,7 @@ Jinja expressions serve following purposes in the meta.yaml:
769768

770769
- They can call `conda-build functions <https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#conda-build-specific-jinja2-functions>`__ for automatic code generation. Examples are the compilers, cdt packages or the ``pin_compatible`` function.
771770

772-
.. code-block:: yaml
771+
.. code-block:: yaml+jinja
773772

774773
requirements:
775774
build:

src/maintainer/pinning_deps.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ be added by hand. To do this, follow these steps:
106106

107107
#. Create a new migration yaml by copying `example.exyaml <https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/master/recipe/migrations/example.exyaml>`__ in the ``conda-forge/conda-forge-pinning`` repository.
108108
#. Change the migration yaml to reflect the package and version to be migrated
109-
#. Write a :ref:`migrator <pin_migrator>` for propagating the pin changes.
109+
#. Write a migrator for propagating the pin changes.
110110
#. Propose the changes as a :term:`PR` to `conda-forge/conda-forge-pinning-feedstock`_.
111111
#. Once accepted the migration will begin. The migration status can be monitored at https://conda-forge.org/status.
112112
#. After the migration is complete, a new PR can be issued to `conda-forge/conda-forge-pinning-feedstock`_ to:

src/orga/minutes/2016-04-22.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: **How do we want to express recipes for particular VS versions.**
88

99
* New conda-build release - may be necessary for VS builds: [](https://github.com/conda/conda-build/releases/tag/1.20.1)[https://github.com/conda/conda-build/releases/tag/1.20.1](https://github.com/conda/conda-build/releases/tag/1.20.1)
1010

11-
* Rebuild Eigen to test that the latest version works - if so we can drop [John Kirkham](https://conda-forge.hackpad.com/ep/profile/wv6uvIZX6h0)'s conda-smithy branch that tries to fix appveyor.
11+
* Rebuild Eigen to test that the latest version works - if so we can drop [John Kirkham](https://conda-forge.hackpad.comhttps://conda-forge.hackpad.com/ep/profile/wv6uvIZX6h0)'s conda-smithy branch that tries to fix appveyor.
1212
* This has all been done and works now. In some cases Python 3.4 64-bit builds on Windows have issues. That is still not understood.
1313

1414
* Current guidance at [](https://github.com/conda-forge/staged-recipes/wiki/VC-features)[https://github.com/conda-forge/staged-recipes/wiki/VC-features](https://github.com/conda-forge/staged-recipes/wiki/VC-features) and [](https://github.com/conda/conda/wiki/VC-features)[https://github.com/conda/conda/wiki/VC-features](https://github.com/conda/conda/wiki/VC-features).

src/orga/minutes/2016-04-29.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Agenda:
1212

1313
* Question about conda-smithy/conda-build-all requirements. Please see reference to "Question 4.5" in [this comment](https://github.com/conda/conda-build/pull/848#issuecomment-215523101)
1414

15-
* Internal pinning mechanism. [Phil Elson](/ep/profile/AviM60TiesB) wrote some nice scripts here and they are very helpful.
15+
* Internal pinning mechanism. [Phil Elson](https://conda-forge.hackpad.com/ep/profile/AviM60TiesB) wrote some nice scripts here and they are very helpful.
1616
* Questions:
1717

1818
* How can we figure out what things need pinning?
@@ -52,7 +52,7 @@ Notes:
5252
* Let's give webex a shot
5353
* Dependency tracking
5454

55-
* Currently baking in versions into the recipe, automated with script from [Phil Elson](/ep/profile/AviM60TiesB)
55+
* Currently baking in versions into the recipe, automated with script from [Phil Elson](https://conda-forge.hackpad.com/ep/profile/AviM60TiesB)
5656
* Version choices are decided manually at the moment
5757
* [](https://github.com/conda-forge/staged-recipes/wiki/Pinned-dependencies)https://github.com/conda-forge/staged-recipes/wiki/Pinned-dependencies
5858
* What if we want to change a pinned version, say zlib 1.2 to 1.3?
@@ -92,7 +92,7 @@ Notes:
9292
* Helpful when resolving problems, detecting when system Python
9393
* Put it in, not too hard and will help downstream organizations
9494

95-
All of the contents below were discussed between [Phil Elson](/ep/profile/AviM60TiesB) and [John Kirkham](/ep/profile/wv6uvIZX6h0). Many of the items have already been planned before and just need the details ironed out. Anything that required large group discussion was not decided in anyway.
95+
All of the contents below were discussed between [Phil Elson](https://conda-forge.hackpad.com/ep/profile/AviM60TiesB) and [John Kirkham](https://conda-forge.hackpad.com/ep/profile/wv6uvIZX6h0). Many of the items have already been planned before and just need the details ironed out. Anything that required large group discussion was not decided in anyway.
9696

9797
* Yum requirements
9898

@@ -107,13 +107,13 @@ All of the contents below were discussed between [Phil Elson](/ep/profile/AviM60
107107
* Adding a devtoolset to the container (for now).
108108

109109
* This was already merged (adds devtoolset-2).
110-
* [Phil](/ep/profile/AviM60TiesB) has rebuilt this.
111-
* [John](/ep/profile/wv6uvIZX6h0) tested the image with a trivial C++11 [program](https://github.com/jakirkham/hello_tests/blob/5b2f6b0c5682ecd84bee3be9cb73d790265f6002/hello.cxx) and that worked fine.
110+
* [Phil](https://conda-forge.hackpad.com/ep/profile/AviM60TiesB) has rebuilt this.
111+
* [John](https://conda-forge.hackpad.com/ep/profile/wv6uvIZX6h0) tested the image with a trivial C++11 [program](https://github.com/jakirkham/hello_tests/blob/5b2f6b0c5682ecd84bee3be9cb73d790265f6002/hello.cxx) and that worked fine.
112112
* Automatic builds are not working. Will likely contact Docker to fix. However, this only matters if this problem still happens after moving the images.
113113

114114
* Movement of Docker images to common spaces (Docker Hub org, GitHub org).
115115

116-
* [John](/ep/profile/wv6uvIZX6h0) will add the PRs to move Obvious-CI's Docker image to the org and from Obvious-CI.
116+
* [John](https://conda-forge.hackpad.com/ep/profile/wv6uvIZX6h0) will add the PRs to move Obvious-CI's Docker image to the org and from Obvious-CI.
117117
* Docker Hub org is already setup
118118
* Repo on GitHub is ready to go.
119119
* Need to setup autobuilds for the image(s).

src/orga/minutes/2016-05-13.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Hangout link: [](https://hangouts.google.com/call/v5olhwzpfzgzpoq5i3wthjpqpie)[h
88

99
* Jonathan Helmus
1010
* Michael Sarahan
11-
* [John Kirkham](/ep/profile/wv6uvIZX6h0)
11+
* [John Kirkham](https://conda-forge.hackpad.com/ep/profile/wv6uvIZX6h0)
1212
* Phil Elson
1313
* Eric Dill
1414
* Anthony Scopatz

src/orga/minutes/2016-06-03.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Hangout link: [](https://hangouts.google.com/call/v5olhwzpfzgzpoq5i3wthjpqpie) [
66

77
**Attendees**
88

9-
Ray, Matt, Jonathan, Phil, Jonas, Michael, Philippe, John, [Bjorn Gruning](https://conda-forge.hackpad.com/ep/profile/DMmBLyb21HK), Jan
9+
Ray, Matt, Jonathan, Phil, Jonas, Michael, Philippe, John, [Bjorn Gruning](https://conda-forge.hackpad.comhttps://conda-forge.hackpad.com/ep/profile/DMmBLyb21HK), Jan
1010

1111
**Standing items**
1212

@@ -52,7 +52,7 @@ Ray, Matt, Jonathan, Phil, Jonas, Michael, Philippe, John, [Bjorn Gruning](https
5252

5353
* Another thing to consider here might be a new piece of metadata. For instance, we could specify the primary language of a package. We could then specify to `conda install` that we want this language of a package. Possible syntax might include something that looks like that of the above. Not sure how we want to handled conflicts if we want to error, warn and install everything, or something else.
5454

55-
* A simpler idea that we might consider that includes some of the ideas [Michael](https://conda-forge.hackpad.com/ep/profile/yHQTJXZ4gyS) mentioned above, but could be implemented without changes to `conda` or package metadata would be to place packages in labeled channels. That way all Python packages would be in `conda-forge/label/python`. This way one could simply add this labeled channel and get all the `python` packages one wants. It's still a little fragile when enabling multiple labels, but maybe this can leverage the channel resolution stuff that Michael Grant has worked on.
55+
* A simpler idea that we might consider that includes some of the ideas [Michael](https://conda-forge.hackpad.comhttps://conda-forge.hackpad.com/ep/profile/yHQTJXZ4gyS) mentioned above, but could be implemented without changes to `conda` or package metadata would be to place packages in labeled channels. That way all Python packages would be in `conda-forge/label/python`. This way one could simply add this labeled channel and get all the `python` packages one wants. It's still a little fragile when enabling multiple labels, but maybe this can leverage the channel resolution stuff that Michael Grant has worked on.
5656

5757
* PR reviews
5858

0 commit comments

Comments
 (0)