Skip to content

Commit 7d6def0

Browse files
authored
Merge pull request #124 from math-comp/meta_yml
Update meta.yml and require Rocq 9.0
2 parents 16e6606 + a96dd3c commit 7d6def0

6 files changed

Lines changed: 14 additions & 23 deletions

File tree

.github/workflows/docker-action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ jobs:
1818
strategy:
1919
matrix:
2020
image:
21-
- 'mathcomp/mathcomp:2.4.0-coq-8.20'
2221
- 'mathcomp/mathcomp:2.4.0-rocq-prover-9.0'
2322
- 'mathcomp/mathcomp:2.4.0-rocq-prover-9.1'
24-
- 'mathcomp/mathcomp:2.5.0-coq-8.20'
2523
- 'mathcomp/mathcomp:2.5.0-rocq-prover-9.0'
2624
- 'mathcomp/mathcomp:2.5.0-rocq-prover-9.1'
2725
- 'mathcomp/mathcomp-dev:rocq-prover-9.0'

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ KNOWNTARGETS := Makefile.coq
66
# on them always get rebuilt
77
KNOWNFILES := Makefile _CoqProject
88

9-
COQMAKEFILE?=$(shell command -v coq_makefile || echo "$(COQBIN)rocq makefile")
10-
119
.DEFAULT_GOAL := invoke-coqmakefile
1210

1311
Makefile.coq: Makefile _CoqProject
14-
$(COQMAKEFILE) -f _CoqProject -o Makefile.coq
12+
$(COQBIN)rocq makefile -f _CoqProject -o Makefile.coq
1513

1614
invoke-coqmakefile: Makefile.coq
1715
$(MAKE) --no-print-directory -f Makefile.coq $(filter-out $(KNOWNTARGETS),$(MAKECMDGOALS))

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ coefficients range over commutative rings and integral domains.
2121
- Author(s):
2222
- Pierre-Yves Strub (initial)
2323
- License: [CeCILL-B Free Software License Agreement](CeCILL-B)
24-
- Compatible Rocq/Coq versions: 8.20 or later
24+
- Compatible Rocq/Coq versions: 9.0 or later
2525
- Additional dependencies:
2626
- [MathComp](https://math-comp.github.io) ssreflect 2.4 or later
2727
- [MathComp](https://math-comp.github.io) algebra
@@ -37,7 +37,7 @@ is via [OPAM](https://opam.ocaml.org/doc/Install.html):
3737

3838
```shell
3939
opam repo add rocq-released https://rocq-prover.org/opam/released
40-
opam install coq-mathcomp-multinomials
40+
opam install rocq-mathcomp-multinomials
4141
```
4242

4343
To instead build and install manually, you need to make sure that all the

coq-mathcomp-multinomials.opam

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# This file was generated from `meta.yml`, please do not edit manually.
2-
# Follow the instructions on https://github.com/coq-community/templates to regenerate.
3-
41
opam-version: "2.0"
52
maintainer: "pierre-yves@strub.nu"
63
version: "dev"

meta.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
fullname: A Multivariate polynomial Library for the Mathematical Components Library
33
shortname: multinomials
4-
opam_name: coq-mathcomp-multinomials
4+
opam_name: rocq-mathcomp-multinomials
55
organization: math-comp
66
action: true
77

@@ -25,20 +25,16 @@ license:
2525
file: CeCILL-B
2626

2727
supported_coq_versions:
28-
text: 8.20 or later
29-
opam: '{>= "8.20"}'
28+
text: 9.0 or later
29+
opam: '{>= "9.0"}'
3030

3131
tested_coq_nix_versions:
3232

3333
tested_coq_opam_versions:
34-
- version: '2.4.0-coq-8.20'
35-
repo: 'mathcomp/mathcomp'
3634
- version: '2.4.0-rocq-prover-9.0'
3735
repo: 'mathcomp/mathcomp'
3836
- version: '2.4.0-rocq-prover-9.1'
3937
repo: 'mathcomp/mathcomp'
40-
- version: '2.5.0-coq-8.20'
41-
repo: 'mathcomp/mathcomp'
4238
- version: '2.5.0-rocq-prover-9.0'
4339
repo: 'mathcomp/mathcomp'
4440
- version: '2.5.0-rocq-prover-9.1'
@@ -52,12 +48,12 @@ tested_coq_opam_versions:
5248

5349
dependencies:
5450
- opam:
55-
name: coq-mathcomp-ssreflect
51+
name: rocq-mathcomp-ssreflect
5652
version: '{>= "2.4"}'
5753
description: |-
5854
[MathComp](https://math-comp.github.io) ssreflect 2.4 or later
5955
- opam:
60-
name: coq-mathcomp-algebra
56+
name: rocq-mathcomp-algebra
6157
description: |-
6258
[MathComp](https://math-comp.github.io) algebra
6359
- opam:

rocq-mathcomp-multinomials.opam

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This file was generated from `meta.yml`, please do not edit manually.
2+
# Follow the instructions on https://github.com/coq-community/templates to regenerate.
3+
14
opam-version: "2.0"
25
maintainer: "pierre-yves@strub.nu"
36
version: "dev"
@@ -16,10 +19,9 @@ coefficients range over commutative rings and integral domains."""
1619
build: [make "-j%{jobs}%"]
1720
install: [make "install"]
1821
depends: [
19-
("coq" {>= "8.20" & < "8.21~"}
20-
| "rocq-core" {>= "9.0"})
21-
"coq-mathcomp-ssreflect" {>= "2.4"}
22-
"coq-mathcomp-algebra"
22+
"rocq-core" {>= "9.0"}
23+
"rocq-mathcomp-ssreflect" {>= "2.4"}
24+
"rocq-mathcomp-algebra"
2325
"coq-mathcomp-bigenough"
2426
"coq-mathcomp-finmap"
2527
]

0 commit comments

Comments
 (0)