Skip to content

Commit 87d3c24

Browse files
authored
Merge pull request #6 from coq-community/compat-boilerplate
Compatibility with 8.18 and beyond
2 parents be26e1a + 51dcd67 commit 87d3c24

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

.github/workflows/docker-action.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
matrix:
1919
image:
2020
- 'coqorg/coq:dev'
21+
- 'coqorg/coq:8.18'
2122
- 'coqorg/coq:8.17'
2223
- 'coqorg/coq:8.16'
2324
- 'coqorg/coq:8.15'

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Follow the instructions on https://github.com/coq-community/templates to regener
99
[![Code of Conduct][conduct-shield]][conduct-link]
1010
[![Zulip][zulip-shield]][zulip-link]
1111

12-
[docker-action-shield]: https://github.com/coq-community/coqtail-math/workflows/Docker%20CI/badge.svg?branch=master
13-
[docker-action-link]: https://github.com/coq-community/coqtail-math/actions?query=workflow:"Docker%20CI"
12+
[docker-action-shield]: https://github.com/coq-community/coqtail-math/actions/workflows/docker-action.yml/badge.svg?branch=master
13+
[docker-action-link]: https://github.com/coq-community/coqtail-math/actions/workflows/docker-action.yml
1414

1515
[contributing-shield]: https://img.shields.io/badge/contributions-welcome-%23f7931e.svg
1616
[contributing-link]: https://github.com/coq-community/manifesto/blob/master/CONTRIBUTING.md

Reals/Hopital.v

+4-2
Original file line numberDiff line numberDiff line change
@@ -2785,10 +2785,12 @@ apply limit_div_pos_inv.
27852785
apply limit_div_neg_ext with (fun x => (f x) / (- g x)).
27862786
intros. field. apply g_not_0. apply H.
27872787
assert (Dg' : forall x, open_interval a b x -> derivable_pt (- g) x). intros. reg. apply Dg; intuition.
2788-
apply Hopital_gpinf_Lninf_right with Df Dg'; try assumption; try reg; try (now intuition). apply limit_div_pos_inv.
2788+
apply Hopital_gpinf_Lninf_right with Df Dg'; try assumption; try reg.
2789+
intros; apply continuity_pt_opp; apply Cg; assumption.
2790+
apply limit_div_pos_inv.
27892791
apply limit_div_neg_ext with g. intros. unfold opp_fct. ring. apply Zg.
27902792
intros. intro. apply g'_not_0 with x Hopen. rewrite (pr_nu _ _ _ (derivable_pt_opp g x (Dg x Hopen))) in H.
2791-
rewrite derive_pt_opp in H. apply Ropp_eq_0_compat in H. rewrite <- H. ring.
2793+
rewrite derive_pt_opp in H. apply Ropp_eq_0_compat in H. rewrite <- H. ring.
27922794
intros m Hm. destruct (Hlimder m Hm) as [alp [Halp Hsolve]].
27932795
exists alp. split. assumption.
27942796
intros. specialize (Hsolve x Hopen H).

coq-coqtail.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ and complex analysis."""
1919
build: [make "-j%{jobs}%"]
2020
install: [make "install"]
2121
depends: [
22-
"coq" {(>= "8.11" & < "8.18~") | (= "dev")}
22+
"coq" {>= "8.11"}
2323
]
2424

2525
tags: [

meta.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ license:
3535

3636
supported_coq_versions:
3737
text: 8.11 or later
38-
opam: '{(>= "8.11" & < "8.18~") | (= "dev")}'
38+
opam: '{>= "8.11"}'
3939

4040
tested_coq_nix_versions:
4141
- coq_version: 'master'
4242

4343
tested_coq_opam_versions:
4444
- version: dev
45+
- version: '8.18'
4546
- version: '8.17'
4647
- version: '8.16'
4748
- version: '8.15'

0 commit comments

Comments
 (0)