Skip to content

Commit b1d0de5

Browse files
authored
Upgrade environment on 2020-10-30
merges manubot/rootstock#383 pandoc-eqnos upgrade addresses the following error: UnboundLocalError: local variable 'ret' referenced before assignment tomduck/pandoc-eqnos#43 Hold back pandoc due to the lack of panflute support. Switch commands in build/README.md to be relative to the repo root.
1 parent e8b5c34 commit b1d0de5

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

build/README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,32 @@ To change the options, either edit the YAML files directly or add additional `--
2020

2121
Note: currently, **Windows is not supported**.
2222

23-
Install the [conda](https://conda.io) environment specified in [`environment.yml`](environment.yml) by running the following commands from this directory:
23+
Install the [conda](https://conda.io) environment specified in [`environment.yml`](environment.yml) by running the following commands
24+
(from the repository's root directory):
2425

2526
```sh
2627
# Install the environment
27-
conda env create --file environment.yml
28+
conda env create --file build/environment.yml
2829
```
2930

3031
If the `manubot` environment is already installed, but needs to be updated to reflect changes to `environment.yml`, use one of the following options:
3132

3233
```shell
3334
# option 1: update the existing environment.
34-
conda env update --file environment.yml
35+
conda env update --file build/environment.yml
3536

3637
# option 2: remove and reinstall the manubot environment.
3738
# Slower than option 1, but guarantees a fresh environment.
3839
conda env remove --name manubot
39-
conda env create --file environment.yml
40+
conda env create --file build/environment.yml
4041
```
4142

4243
Activate with `conda activate manubot` (assumes `conda` version of [at least](https://github.com/conda/conda/blob/9d759d8edeb86569c25f6eb82053f09581013a2a/CHANGELOG.md#440-2017-12-20) 4.4).
4344
The environment should successfully install on both Linux and macOS.
4445
However, it will fail on Windows due to the [`pango`](https://anaconda.org/conda-forge/pango) dependency.
4546

46-
Because the build process is dependent on having the appropriate version of the `manubot` Python package, it is necessary to use the version specified in `environment.yml`.
47+
Because the build process is dependent on having the appropriate version of the `manubot` Python package,
48+
it is necessary to use the version specified in `environment.yml`.
4749
The latest `manubot` release on PyPI may not be compatible with the latest version of this rootstock repository.
4850

4951
## Building PDFs

build/environment.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ dependencies:
1010
- jsonschema=3.2.0
1111
- pandoc=2.9.2
1212
- pango=1.40.14
13-
- pip=20.0
14-
- psutil=5.7.0
15-
- python=3.7.6
13+
- pip=20.2
14+
- psutil=5.7.3
15+
- python=3.7.8
1616
- pyyaml=5.3
17-
- requests=2.23.0
18-
- watchdog=0.10.2
19-
- yamllint=1.21.0
17+
- requests=2.24.0
18+
- watchdog=0.10.3
19+
- yamllint=1.25.0
2020
- pip:
2121
- errorhandler==2.0.1
22-
- git+https://github.com/manubot/manubot@31968197d1ccd96a46bf092cdba4b575764bb954
22+
- git+https://github.com/manubot/manubot@7c03b4a7d42506b3241e58cd5643a028443b9b9d
2323
- opentimestamps-client==0.7.0
2424
- opentimestamps==0.4.1
25-
- pandoc-eqnos==2.1.1
26-
- pandoc-fignos==2.2.0
27-
- pandoc-tablenos==2.1.1
28-
- pandoc-xnos==2.2.0
25+
- pandoc-eqnos==2.3.0
26+
- pandoc-fignos==2.3.1
27+
- pandoc-tablenos==2.2.2
28+
- pandoc-xnos==2.4.3
2929
- pybase62==0.4.3
3030
- pysha3==1.0.2
3131
- python-bitcoinlib==0.10.2

0 commit comments

Comments
 (0)