Skip to content

Commit

Permalink
Bump MathComp version to >= 1.12.0 (#3)
Browse files Browse the repository at this point in the history
* Bump MathComp version to 1.12.0

* Cleanup
  • Loading branch information
pi8027 authored Dec 16, 2021
1 parent c484e1f commit 5b40420
Show file tree
Hide file tree
Showing 49 changed files with 1,508 additions and 2,432 deletions.
29 changes: 0 additions & 29 deletions .github/workflows/coq-ci.yml

This file was deleted.

44 changes: 44 additions & 0 deletions .github/workflows/docker-action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# This file was generated from `meta.yml`, please do not edit manually.
# Follow the instructions on https://github.com/coq-community/templates to regenerate.
name: Docker CI

on:
push:
branches:
- master
pull_request:
branches:
- '**'

jobs:
build:
# the OS must be GNU/Linux to be able to use the docker-coq-action
runs-on: ubuntu-latest
strategy:
matrix:
image:
- 'mathcomp/mathcomp:1.12.0-coq-8.11'
- 'mathcomp/mathcomp:1.12.0-coq-8.12'
- 'mathcomp/mathcomp:1.12.0-coq-8.13'
- 'mathcomp/mathcomp:1.12.0-coq-8.14'
- 'mathcomp/mathcomp:1.13.0-coq-8.11'
- 'mathcomp/mathcomp:1.13.0-coq-8.12'
- 'mathcomp/mathcomp:1.13.0-coq-8.13'
- 'mathcomp/mathcomp:1.13.0-coq-8.14'
- 'mathcomp/mathcomp:1.13.0-coq-dev'
- 'mathcomp/mathcomp-dev:coq-8.11'
- 'mathcomp/mathcomp-dev:coq-8.12'
- 'mathcomp/mathcomp-dev:coq-8.13'
- 'mathcomp/mathcomp-dev:coq-8.14'
- 'mathcomp/mathcomp-dev:coq-dev'
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: coq-community/docker-coq-action@v1
with:
opam_file: 'coq-mathcomp-apery.opam'
custom_image: ${{ matrix.image }}

# See also:
# https://github.com/coq-community/docker-coq-action#readme
# https://github.com/erikmd/docker-coq-github-action-demo
18 changes: 11 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<!---
This file was generated from `meta.yml`, please do not edit manually.
Follow the instructions on https://github.com/coq-community/templates to regenerate.
--->
# Apery

[![CI][action-shield]][action-link]
[![Docker CI][docker-action-shield]][docker-action-link]

[action-shield]: https://github.com/math-comp/apery/workflows/CI/badge.svg?branch=master
[action-link]: https://github.com/math-comp/apery/actions?query=workflow%3ACI
[docker-action-shield]: https://github.com/math-comp/apery/workflows/Docker%20CI/badge.svg?branch=master
[docker-action-link]: https://github.com/math-comp/apery/actions?query=workflow:"Docker%20CI"



Expand All @@ -23,13 +27,13 @@ remains the sole trusted code base.
- Assia Mahboubi (initial)
- Thomas Sibut-Pinote (initial)
- License: [CeCILL-C](Licence_CeCILL-C_V1-en.txt)
- Compatible Coq versions: 8.11
- Compatible Coq versions: 8.11 or later
- Additional dependencies:
- [MathComp ssreflect 1.10](https://math-comp.github.io)
- [MathComp ssreflect 1.12 or later](https://math-comp.github.io)
- [MathComp algebra](https://math-comp.github.io)
- [MathComp field](https://math-comp.github.io)
- [CoqEAL 1.0.3 or later](https://github.com/CoqEAL/CoqEAL)
- [MathComp real closed fields 1.0.4 or later](https://github.com/math-comp/real-closed)
- [CoqEAL 1.0.5 or later](https://github.com/CoqEAL/CoqEAL)
- [MathComp real closed fields 1.1.2 or later](https://github.com/math-comp/real-closed)
- [MathComp bigenough 1.0.0 or later](https://github.com/math-comp/bigenough)
- Coq namespace: `mathcomp.apery`
- Related publication(s):
Expand Down
13 changes: 8 additions & 5 deletions coq-mathcomp-apery.opam
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# This file was generated from `meta.yml`, please do not edit manually.
# Follow the instructions on https://github.com/coq-community/templates to regenerate.

opam-version: "2.0"
maintainer: "[email protected]"
version: "dev"
Expand All @@ -17,15 +20,15 @@ computer algebra program (in this case in Maple/Algolib). These
relations are formally checked a posteriori, so that Coq's kernel
remains the sole trusted code base."""

build: [make "-j%{jobs}%" ]
build: [make "-j%{jobs}%"]
install: [make "install"]
depends: [
"coq" {>= "8.11" & < "8.12~"}
"coq-mathcomp-ssreflect" {>= "1.10" & < "1.11~"}
"coq" {(>= "8.11" & < "8.15~") | (= "dev")}
"coq-mathcomp-ssreflect" {(>= "1.12" & < "1.14~") | (= "dev")}
"coq-mathcomp-algebra"
"coq-mathcomp-field"
"coq-coqeal" {>= "1.0.3"}
"coq-mathcomp-real-closed" {>= "1.0.4"}
"coq-coqeal" {>= "1.0.5"}
"coq-mathcomp-real-closed" {>= "1.1.2"}
"coq-mathcomp-bigenough" {>= "1.0.0"}
]

Expand Down
7 changes: 2 additions & 5 deletions include/ops_header.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Require Import Psatz.
Require Import Field.
Require Import ZArith.

From mathcomp Require Import all_ssreflect all_algebra.
Expand All @@ -15,7 +13,6 @@ Set Implicit Arguments.
Unset Strict Implicit.
Unset Printing Implicit Defensive.

Import GRing.Theory.
Import Num.Theory.
Import Order.TTheory GRing.Theory Num.Theory.

Open Scope ring_scope.
Local Open Scope ring_scope.
44 changes: 35 additions & 9 deletions meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,45 @@ license:
file: Licence_CeCILL-C_V1-en.txt

supported_coq_versions:
text: 8.11
opam: '{>= "8.11" & < "8.12~"}'
text: 8.11 or later
opam: '{(>= "8.11" & < "8.15~") | (= "dev")}'

tested_coq_opam_versions:
- version: '1.10.0-coq-8.11'
- version: '1.12.0-coq-8.11'
repo: 'mathcomp/mathcomp'
- version: '1.12.0-coq-8.12'
repo: 'mathcomp/mathcomp'
- version: '1.12.0-coq-8.13'
repo: 'mathcomp/mathcomp'
- version: '1.12.0-coq-8.14'
repo: 'mathcomp/mathcomp'
- version: '1.13.0-coq-8.11'
repo: 'mathcomp/mathcomp'
- version: '1.13.0-coq-8.12'
repo: 'mathcomp/mathcomp'
- version: '1.13.0-coq-8.13'
repo: 'mathcomp/mathcomp'
- version: '1.13.0-coq-8.14'
repo: 'mathcomp/mathcomp'
- version: '1.13.0-coq-dev'
repo: 'mathcomp/mathcomp'
- version: 'coq-8.11'
repo: 'mathcomp/mathcomp-dev'
- version: 'coq-8.12'
repo: 'mathcomp/mathcomp-dev'
- version: 'coq-8.13'
repo: 'mathcomp/mathcomp-dev'
- version: 'coq-8.14'
repo: 'mathcomp/mathcomp-dev'
- version: 'coq-dev'
repo: 'mathcomp/mathcomp-dev'

dependencies:
- opam:
name: coq-mathcomp-ssreflect
version: '{>= "1.10" & < "1.11~"}'
version: '{(>= "1.12" & < "1.14~") | (= "dev")}'
description: |-
[MathComp ssreflect 1.10](https://math-comp.github.io)
[MathComp ssreflect 1.12 or later](https://math-comp.github.io)
- opam:
name: coq-mathcomp-algebra
description: |-
Expand All @@ -66,14 +92,14 @@ dependencies:
[MathComp field](https://math-comp.github.io)
- opam:
name: coq-coqeal
version: '{>= "1.0.3"}'
version: '{>= "1.0.5"}'
description: |-
[CoqEAL 1.0.3 or later](https://github.com/CoqEAL/CoqEAL)
[CoqEAL 1.0.5 or later](https://github.com/CoqEAL/CoqEAL)
- opam:
name: coq-mathcomp-real-closed
version: '{>= "1.0.4"}'
version: '{>= "1.1.2"}'
description: |-
[MathComp real closed fields 1.0.4 or later](https://github.com/math-comp/real-closed)
[MathComp real closed fields 1.1.2 or later](https://github.com/math-comp/real-closed)
- opam:
name: coq-mathcomp-bigenough
version: '{>= "1.0.0"}'
Expand Down
Loading

0 comments on commit 5b40420

Please sign in to comment.