Skip to content

Commit 860baa8

Browse files
committed
Merge branch 'release/v0.22.0'
2 parents a16f51e + bc7fe97 commit 860baa8

Some content is hidden

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

50 files changed

+1707
-589
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ deps/custom_preamble.tex
3131
deps/deps.jl
3232
deps/*.svg
3333

34-
Manifest.toml
35-
3634
scratch.jl
3735

3836
##### End of file

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,22 @@ env:
2121
- JULIA_DEBUG="all"
2222
- PREDICTMD_OPEN_PLOTS_DURING_TESTS="true"
2323
matrix:
24-
- GROUP="travis-1"
24+
- GROUP="travis-1" COMPILED_MODULES="no"
25+
- GROUP="travis-1" COMPILED_MODULES="yes"
2526

2627
git:
2728
depth: 99999999
2829

2930
julia:
30-
- "0.7"
3131
- "1.0"
32+
- "1.1"
3233
- "nightly"
3334

3435
language: julia
3536

3637
matrix:
3738
allow_failures:
38-
- julia: "1.0"
39+
- julia: "1.1"
3940
- julia: "nightly"
4041
fast_finish: true
4142

CONTRIBUTING.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ git version 2.16.1
7373
If you do, proceed to Step 2. If you instead receive an error message,
7474
download and install Git:
7575

76-
- Windows: [https://git-scm.com/download/win](https://git-scm.com/download/win)
7776
- macOS: [https://git-scm.com/download/mac](https://git-scm.com/download/mac)
7877
- GNU/Linux: [https://git-scm.com/download/linux](https://git-scm.com/download/linux)
7978

@@ -128,7 +127,6 @@ If you do, then you are good to go. If you instead receive the
128127
message ```git: 'flow' is not a git command```, download and
129128
install git-flow:
130129

131-
- Windows: [https://github.com/nvie/gitflow/wiki/Windows](https://github.com/nvie/gitflow/wiki/Windows)
132130
- macOS: [https://github.com/nvie/gitflow/wiki/Mac-OS-X](https://github.com/nvie/gitflow/wiki/Mac-OS-X)
133131
- GNU/Linux: [https://github.com/nvie/gitflow/wiki/Linux](https://github.com/nvie/gitflow/wiki/Linux)
134132

@@ -160,7 +158,6 @@ Compression: Uncompressed, ZIP, ZLIB, BZIP2
160158
```
161159
If you do, then go to Step 2. If you instead see an error,
162160
download and install GPG:
163-
- Windows: [https://gpg4win.org/download.html](https://gpg4win.org/download.html)
164161
- macOS: [https://gpgtools.org/](https://gpgtools.org/)
165162
- GNU/Linux: [https://gnupg.org/download/#sec-1-2](https://gnupg.org/download/#sec-1-2)
166163

@@ -506,7 +503,7 @@ scroll down to find the release branch, and then click the
506503
trash can icon to delete the branch.
507504

508505
#### Step 23:
509-
The final step is to go to the Zenodo entry for the newly created release and put in the correct information. First go to [https://www.predictmd.net/zenodo](https://www.predictmd.net/zenodo), and then click on the yellow "Edit" button to edit the most recent release. Then, fill out the following fields with the specified values:
506+
The final step is to go to the Zenodo entry for the newly created release and put in the correct information. First go to [https://predictmd.net/zenodo](https://predictmd.net/zenodo), and then click on the yellow "Edit" button to edit the most recent release. Then, fill out the following fields with the specified values:
510507

511508
##### Upload type:
512509
* Software
@@ -549,8 +546,8 @@ The final step is to go to the Zenodo entry for the newly created release and pu
549546

550547
| Identifier | Relationship |
551548
| ---- | ---- |
552-
| `https://www.predictmd.net` | compiled/created this upload |
553-
| `https://www.predictmd.net/vMAJOR.MINOR.PATCH` | documents this upload |
549+
| `https://predictmd.net` | compiled/created this upload |
550+
| `https://predictmd.net/vMAJOR.MINOR.PATCH` | documents this upload |
554551
| `https://github.com/bcbi/PredictMD.jl/releases/tag/vMAJOR.MINOR.PATCH` | is an alternate identifier of this upload |
555552
| `https://github.com/bcbi/PredictMD.jl/tree/vMAJOR.MINOR.PATCH` | is an alternate identifier of this upload |
556553

0 commit comments

Comments
 (0)