Skip to content

Commit

Permalink
Merge pull request #6 from coq-community/compat-boilerplate
Browse files Browse the repository at this point in the history
Compatibility with 8.18 and beyond
  • Loading branch information
palmskog committed Nov 19, 2023
2 parents be26e1a + 51dcd67 commit 87d3c24
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/docker-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
matrix:
image:
- 'coqorg/coq:dev'
- 'coqorg/coq:8.18'
- 'coqorg/coq:8.17'
- 'coqorg/coq:8.16'
- 'coqorg/coq:8.15'
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Follow the instructions on https://github.com/coq-community/templates to regener
[![Code of Conduct][conduct-shield]][conduct-link]
[![Zulip][zulip-shield]][zulip-link]

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

[contributing-shield]: https://img.shields.io/badge/contributions-welcome-%23f7931e.svg
[contributing-link]: https://github.com/coq-community/manifesto/blob/master/CONTRIBUTING.md
Expand Down
6 changes: 4 additions & 2 deletions Reals/Hopital.v
Original file line number Diff line number Diff line change
Expand Up @@ -2785,10 +2785,12 @@ apply limit_div_pos_inv.
apply limit_div_neg_ext with (fun x => (f x) / (- g x)).
intros. field. apply g_not_0. apply H.
assert (Dg' : forall x, open_interval a b x -> derivable_pt (- g) x). intros. reg. apply Dg; intuition.
apply Hopital_gpinf_Lninf_right with Df Dg'; try assumption; try reg; try (now intuition). apply limit_div_pos_inv.
apply Hopital_gpinf_Lninf_right with Df Dg'; try assumption; try reg.
intros; apply continuity_pt_opp; apply Cg; assumption.
apply limit_div_pos_inv.
apply limit_div_neg_ext with g. intros. unfold opp_fct. ring. apply Zg.
intros. intro. apply g'_not_0 with x Hopen. rewrite (pr_nu _ _ _ (derivable_pt_opp g x (Dg x Hopen))) in H.
rewrite derive_pt_opp in H. apply Ropp_eq_0_compat in H. rewrite <- H. ring.
rewrite derive_pt_opp in H. apply Ropp_eq_0_compat in H. rewrite <- H. ring.
intros m Hm. destruct (Hlimder m Hm) as [alp [Halp Hsolve]].
exists alp. split. assumption.
intros. specialize (Hsolve x Hopen H).
Expand Down
2 changes: 1 addition & 1 deletion coq-coqtail.opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ and complex analysis."""
build: [make "-j%{jobs}%"]
install: [make "install"]
depends: [
"coq" {(>= "8.11" & < "8.18~") | (= "dev")}
"coq" {>= "8.11"}
]

tags: [
Expand Down
3 changes: 2 additions & 1 deletion meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,14 @@ license:

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

tested_coq_nix_versions:
- coq_version: 'master'

tested_coq_opam_versions:
- version: dev
- version: '8.18'
- version: '8.17'
- version: '8.16'
- version: '8.15'
Expand Down

0 comments on commit 87d3c24

Please sign in to comment.