Merge pull request #59 from CohenCyril/refactor

Simplifications, phase 1

.github/workflows/docker-action.yml

@@ -17,13 +17,8 @@ jobs:
     strategy:
       matrix:
         image:
-          - 'mathcomp/mathcomp:2.0.0-coq-8.16'
-          - 'mathcomp/mathcomp:2.0.0-coq-8.17'
-          - 'mathcomp/mathcomp:2.0.0-coq-8.18'
-          - 'mathcomp/mathcomp:2.1.0-coq-8.16'
           - 'mathcomp/mathcomp:2.1.0-coq-8.17'
           - 'mathcomp/mathcomp:2.1.0-coq-8.18'
-          - 'mathcomp/mathcomp:2.2.0-coq-8.16'
           - 'mathcomp/mathcomp:2.2.0-coq-8.17'
           - 'mathcomp/mathcomp:2.2.0-coq-8.18'
           - 'mathcomp/mathcomp:2.2.0-coq-8.19'

.nix/config.nix

@@ -31,7 +31,7 @@
 
   ## select an entry to build in the following `bundles` set
   ## defaults to "default"
-  default-bundle = "8.16";
+  default-bundle = "8.19";
 
   ## write one `bundles.name` attribute set per
   ## alternative configuration
@@ -47,13 +47,6 @@
       mathcomp-zify.override.version = "master";
       multinomials.override.version = "master";
     }; in {
-  "8.16".coqPackages = common-bundles // {
-    coq.override.version = "8.16";
-    mathcomp.override.version = "2.0.0";
-    multinomials.job = false;  # broken with dune on 8.16 in nixpkgs
-    coqeal.job = false;
-    mathcomp-apery.job = false;
-  };
   "8.17".coqPackages = common-bundles // {
     coq.override.version = "8.17";
     mathcomp.override.version = "2.1.0";

.nix/coq-nix-toolbox.nix

@@ -1 +1 @@
-"1cad18e8537b4f6d6ad97d6eb57fa61e3dbcad59"
+"abb4982c7d47a00005ede4bae2e2c47d895a41dc"

README.md

@@ -24,9 +24,9 @@ order theory of real closed field, through quantifier elimination.
   - Cyril Cohen (initial)
   - Assia Mahboubi (initial)
 - License: [CeCILL-B](CECILL-B)
-- Compatible Coq versions: Coq 8.16 or later
+- Compatible Coq versions: Coq 8.17 or later
 - Additional dependencies:
-  - [MathComp ssreflect 2.0 or later](https://math-comp.github.io)
+  - [MathComp ssreflect 2.1 or later](https://math-comp.github.io)
   - [MathComp algebra](https://math-comp.github.io)
   - [MathComp field](https://math-comp.github.io)
   - [MathComp bigenough 1.0.0 or later](https://github.com/math-comp/bigenough)

_CoqProject

@@ -18,3 +18,4 @@ theories/mxtens.v
 -arg -w -arg +undeclared-scope
 -arg -w -arg -ambiguous-paths
 -arg -w -arg -uniform-inheritance
+-arg -w -arg -deprecated-since-8.19

coq-mathcomp-real-closed.opam

@@ -21,8 +21,8 @@ order theory of real closed field, through quantifier elimination."""
 build: [make "-j%{jobs}%"]
 install: [make "install"]
 depends: [
-  "coq" {>= "8.16"}
-  "coq-mathcomp-ssreflect" {>= "2.0"}
+  "coq" {>= "8.17"}
+  "coq-mathcomp-ssreflect" {>= "2.1"}
   "coq-mathcomp-algebra" 
   "coq-mathcomp-field" 
   "coq-mathcomp-bigenough" {>= "1.0.0"}

meta.yml

@@ -39,24 +39,14 @@ license:
   file: CECILL-B
 
 supported_coq_versions:
-  text: Coq 8.16 or later
-  opam: '{>= "8.16"}'
+  text: Coq 8.17 or later
+  opam: '{>= "8.17"}'
 
 tested_coq_opam_versions:
-- version: '2.0.0-coq-8.16'
-  repo: 'mathcomp/mathcomp'
-- version: '2.0.0-coq-8.17'
-  repo: 'mathcomp/mathcomp'
-- version: '2.0.0-coq-8.18'
-  repo: 'mathcomp/mathcomp'
-- version: '2.1.0-coq-8.16'
-  repo: 'mathcomp/mathcomp'
 - version: '2.1.0-coq-8.17'
   repo: 'mathcomp/mathcomp'
 - version: '2.1.0-coq-8.18'
   repo: 'mathcomp/mathcomp'
-- version: '2.2.0-coq-8.16'
-  repo: 'mathcomp/mathcomp'
 - version: '2.2.0-coq-8.17'
   repo: 'mathcomp/mathcomp'
 - version: '2.2.0-coq-8.18'
@@ -77,9 +67,9 @@ tested_coq_opam_versions:
 dependencies:
 - opam:
     name: coq-mathcomp-ssreflect
-    version: '{>= "2.0"}'
+    version: '{>= "2.1"}'
   description: |-
-    [MathComp ssreflect 2.0 or later](https://math-comp.github.io)
+    [MathComp ssreflect 2.1 or later](https://math-comp.github.io)
 - opam:
     name: coq-mathcomp-algebra
   description: |-