Skip to content

Commit 068caaa

Browse files
authored
Merge pull request #52 from thery/rocq
Changes Coq into Rocq
2 parents 8847774 + bb2a416 commit 068caaa

File tree

4 files changed

+26
-30
lines changed

4 files changed

+26
-30
lines changed

.github/workflows/docker-action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
strategy:
2020
matrix:
2121
image:
22-
- 'rocq/rocq-prover:dev'
2322
- 'coqorg/coq:8.19'
2423
- 'coqorg/coq:8.18'
2524
- 'coqorg/coq:8.17'
@@ -28,9 +27,11 @@ jobs:
2827
- 'coqorg/coq:8.14'
2928
- 'coqorg/coq:8.13'
3029
- 'coqorg/coq:8.12'
30+
- 'rocq/rocq-prover:dev'
31+
- 'rocq/rocq-prover:9.0'
3132
fail-fast: false
3233
steps:
33-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3435
- uses: coq-community/docker-coq-action@v1
3536
with:
3637
opam_file: 'coq-huffman.opam'

README.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ Follow the instructions on https://github.com/coq-community/templates to regener
88
[![Contributing][contributing-shield]][contributing-link]
99
[![Code of Conduct][conduct-shield]][conduct-link]
1010
[![Zulip][zulip-shield]][zulip-link]
11-
[![coqdoc][coqdoc-shield]][coqdoc-link]
1211

13-
[docker-action-shield]: https://github.com/coq-community/huffman/actions/workflows/docker-action.yml/badge.svg?branch=master
14-
[docker-action-link]: https://github.com/coq-community/huffman/actions/workflows/docker-action.yml
12+
[docker-action-shield]: https://github.com/rocq-community/huffman/actions/workflows/docker-action.yml/badge.svg?branch=master
13+
[docker-action-link]: https://github.com/rocq-community/huffman/actions/workflows/docker-action.yml
1514

1615
[contributing-shield]: https://img.shields.io/badge/contributions-welcome-%23f7931e.svg
1716
[contributing-link]: https://github.com/coq-community/manifesto/blob/master/CONTRIBUTING.md
@@ -22,11 +21,9 @@ Follow the instructions on https://github.com/coq-community/templates to regener
2221
[zulip-shield]: https://img.shields.io/badge/chat-on%20zulip-%23c1272d.svg
2322
[zulip-link]: https://coq.zulipchat.com/#narrow/stream/237663-coq-community-devs.20.26.20users
2423

25-
[coqdoc-shield]: https://img.shields.io/badge/docs-coqdoc-blue.svg
26-
[coqdoc-link]: https://coq-community.org/huffman/docs/latest/coqdoc/toc.html
2724

2825

29-
This projects contains a Coq proof of the correctness of the Huffman coding algorithm,
26+
This projects contains a Rocq proof of the correctness of the Huffman coding algorithm,
3027
as described in David A. Huffman's paper A Method for the Construction of Minimum-Redundancy
3128
Codes, Proc. IRE, pp. 1098-1101, September 1952.
3229

@@ -35,12 +32,12 @@ Codes, Proc. IRE, pp. 1098-1101, September 1952.
3532
- Author(s):
3633
- Laurent Théry (initial)
3734
- Karl Palmskog [<img src="https://zenodo.org/static/images/orcid.svg" height="14px" alt="ORCID logo" />](https://orcid.org/0000-0003-0228-1240)
38-
- Coq-community maintainer(s):
35+
- Rocq-community maintainer(s):
3936
- Karl Palmskog ([**@palmskog**](https://github.com/palmskog))
4037
- License: [GNU Lesser General Public License v2.1 or later](LICENSE)
41-
- Compatible Coq versions: 8.12 or later
38+
- Compatible Rocq/Coq versions: 8.12 or later
4239
- Additional dependencies: none
43-
- Coq namespace: `Huffman`
40+
- Rocq/Coq namespace: `Huffman`
4441
- Related publication(s):
4542
- [Formalising Huffman's algorithm](https://hal.archives-ouvertes.fr/hal-02149909)
4643
- [A Method for the Construction of Minimum-Redundancy Codes](http://compression.ru/download/articles/huff/huffman_1952_minimum-redundancy-codes.pdf) doi:[10.1109/JRPROC.1952.273898](https://doi.org/10.1109/JRPROC.1952.273898)
@@ -58,7 +55,7 @@ opam install coq-huffman
5855
To instead build and install manually, do:
5956

6057
``` shell
61-
git clone https://github.com/coq-community/huffman.git
58+
git clone https://github.com/rocq-community/huffman.git
6259
cd huffman
6360
make # or make -j <number-of-cores-on-your-machine>
6461
make install
@@ -99,4 +96,3 @@ decode code c;;
9996
```
10097

10198
[techreport]: https://hal.archives-ouvertes.fr/hal-02149909
102-
[coqdoc]: https://coq-community.org/huffman/docs/latest/coqdoc/toc.html

coq-huffman.opam

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@ opam-version: "2.0"
55
maintainer: "[email protected]"
66
version: "dev"
77

8-
homepage: "https://github.com/coq-community/huffman"
9-
dev-repo: "git+https://github.com/coq-community/huffman.git"
10-
bug-reports: "https://github.com/coq-community/huffman/issues"
11-
doc: "https://coq-community.github.io/huffman/"
8+
homepage: "https://github.com/rocq-community/huffman"
9+
dev-repo: "git+https://github.com/rocq-community/huffman.git"
10+
bug-reports: "https://github.com/rocq-community/huffman/issues"
1211
license: "LGPL-2.1-or-later"
1312

14-
synopsis: "Coq proof of the correctness of the Huffman coding algorithm"
13+
synopsis: "Rocq proof of the correctness of the Huffman coding algorithm"
1514
description: """
16-
This projects contains a Coq proof of the correctness of the Huffman coding algorithm,
15+
This projects contains a Rocq proof of the correctness of the Huffman coding algorithm,
1716
as described in David A. Huffman's paper A Method for the Construction of Minimum-Redundancy
1817
Codes, Proc. IRE, pp. 1098-1101, September 1952."""
1918

20-
build: ["dune" "build" "-p" name "-j" jobs]
19+
build: [make "-j%{jobs}%"]
20+
install: [make "install"]
2121
depends: [
22-
"dune" {>= "3.5"}
23-
"coq" {(>= "8.12" & < "8.20~") | (= "dev")}
22+
"coq" {(>= "8.12" & <= "9.1~") | (= "dev")}
2423
]
2524

2625
tags: [

meta.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
---
22
fullname: Huffman
33
shortname: huffman
4-
organization: coq-community
4+
organization: rocq-community
55
community: true
66
action: true
7-
coqdoc: true
8-
coqdoc_index: 'docs/latest/coqdoc/toc.html'
7+
coqdoc: false
98

10-
synopsis: Coq proof of the correctness of the Huffman coding algorithm
9+
synopsis: Rocq proof of the correctness of the Huffman coding algorithm
1110

1211
description: |-
13-
This projects contains a Coq proof of the correctness of the Huffman coding algorithm,
12+
This projects contains a Rocq proof of the correctness of the Huffman coding algorithm,
1413
as described in David A. Huffman's paper A Method for the Construction of Minimum-Redundancy
1514
Codes, Proc. IRE, pp. 1098-1101, September 1952.
1615
@@ -41,10 +40,12 @@ license:
4140

4241
supported_coq_versions:
4342
text: 8.12 or later
44-
opam: '{(>= "8.12" & < "8.20~") | (= "dev")}'
43+
opam: '{(>= "8.12" & <= "9.1~") | (= "dev")}'
4544

46-
tested_coq_opam_versions:
45+
tested_rocq_opam_versions:
4746
- version: 'dev'
47+
- version: '9.0'
48+
tested_coq_opam_versions:
4849
- version: '8.19'
4950
- version: '8.18'
5051
- version: '8.17'
@@ -102,5 +103,4 @@ documentation: |-
102103
```
103104
104105
[techreport]: https://hal.archives-ouvertes.fr/hal-02149909
105-
[coqdoc]: https://coq-community.org/huffman/docs/latest/coqdoc/toc.html
106106
---

0 commit comments

Comments
 (0)