Skip to content

Commit 7a2860d

Browse files
authored
Merge pull request #6508 from kit-ty-kate/rel-2.4.0-alpha2
Release 2.4.0~alpha2
2 parents 2122d55 + 2397d76 commit 7a2860d

12 files changed

+58
-43
lines changed

CHANGES

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,46 @@ repositories (changes that are automatically handled by the format upgrade tools
33
are not marked). Those prefixed with "(+)" are new command/option (since
44
2.1.0~alpha2).
55

6+
2.4.0~alpha2:
7+
* Do not include compiler packages flagged with `avoid-version`/`deprecated`
8+
in the generated invariant when calling `opam switch create [name] <version>`
9+
[#6494 @kit-ty-kate]
10+
* Cygwin: Fallback to the existing `setup-x86_64.exe` if its upgrade failed
11+
to be fetched [#6482 @kit-ty-kate - fix #6495, partial fix #6474]
12+
* Regression fixes from `2.4.0~alpha1`:
13+
* Fix a crash when updating a repository that is deleting or adding empty
14+
files [#6490 @kit-ty-kate]
15+
* Fix an extreme performance issue (takes several hours) when applying a
16+
large repository update [#6490 @kit-ty-kate]
17+
* Fix a crash when updating a git repository that moved a file to a new
18+
directory [#6490 @kit-ty-kate]
19+
* Fix a memory leak happening when running large numbers of commands or
20+
opening large number of opam files [#6485 @hannesm - fix #6484]
21+
* Remove handling of the `OPAMSTATS` environment variable [#6485 @hannesm]
22+
* Build changes:
23+
* Update the requirement for the `patch` library to `3.0.0~alpha2`
24+
[#6490 @kit-ty-kate]
25+
* Upgrade the downloaded-if-missing `patch` library to `3.0.0~alpha2`
26+
[#6490 @kit-ty-kate]
27+
* Improve and extend the testsuite [#6490 #6494 @rjbou @kit-ty-kate]
28+
* Improve and extend the test infrastructure [#6277 @rjbou @kit-ty-kate]
29+
* API changes in `opam-client`:
30+
* `OpamClientConfig`: remove `STATS` variant and related `print_stats`
31+
field in config record [#6485 @hannesm]
32+
* `OpamArg.environment_variable`: make `STATS` as removed from cli 2.3
33+
[#6485 @rjbou]
34+
* API changes in `opam-format`:
35+
* `OpamFile`: remove `Stats` module [#6485 @hannesm]
36+
* API changes in `opam-core`:
37+
* `OpamSystem`: remove `print_stats` function [#6485 @hannesm]
38+
* `OpamSystem`: add the `rmdir_cleanup` function [#6490 @kit-ty-kate]
39+
* `OpamSystem.dir_is_empty`: Speedup and change its type to handle
40+
unreachable directories better [#6490 @kit-ty-kate]
41+
* `OpamSystem.internal_patch`: remove parent directories when all of their
42+
content has been moved somewhere else [#6490 @kit-ty-kate]
43+
* `OpamSystem.internal_patch`: fix moving files to new directories when
44+
receiving a git diff [#6490 @kit-ty-kate]
45+
646
2.4.0~alpha1:
747
* (*) Remove `ocaml-system` from the list of default compilers chosen at
848
`opam init` time [#6307 @kit-ty-kate - fix #3509]

configure

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl The line below must be formatted AC_INIT([opam],[VERSION]) with no extra spaces
2-
AC_INIT([opam],[2.4.0~alpha2~dev])
2+
AC_INIT([opam],[2.4.0~alpha2])
33
AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
44

55
AC_CONFIG_MACRO_DIR([m4])

master_changes.md

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ moved, etc.), please update the _API updates_ part (it helps opam library
1111
users)
1212

1313
## Version
14-
* Bump the version number to `2.4.0~alpha2~dev` [#6476 @kit-ty-kate]
1514

1615
## Global CLI
17-
* Remove handling of the `OPAMSTATS` environment variable [#6485 @hannesm]
1816

1917
## Plugins
2018

@@ -33,7 +31,6 @@ users)
3331
## UI
3432

3533
## Switch
36-
* Do not include compiler packages flagged with `avoid-version`/`deprecated` in the invariant when calling `opam switch create [name] <version>` [#6494 @kit-ty-kate]
3734

3835
## Config
3936

@@ -46,9 +43,6 @@ users)
4643
## Var/Option
4744

4845
## Update / Upgrade
49-
* Fix a crash when updating a repository that is deleting or adding empty files [#6490 @kit-ty-kate]
50-
* Fix an extreme performance issue (takes several hours) when applying a large repository update [#6490 @kit-ty-kate]
51-
* Fix a crash when updating a git repository that moved a file to a new directory [#6490 @kit-ty-kate]
5246

5347
## Tree
5448

@@ -69,7 +63,6 @@ users)
6963
## Opamfile
7064

7165
## External dependencies
72-
* Cygwin: Fallback to the existing `setup-x86_64.exe` if its upgrade failed to be fetched [#6482 @kit-ty-kate - fix #6495, partial fix #6474]
7366

7467
## Format upgrade
7568

@@ -78,13 +71,10 @@ users)
7871
## VCS
7972

8073
## Build
81-
* Update the requirement for the `patch` library to `3.0.0~alpha2` [#6490 @kit-ty-kate]
82-
* Upgrade the downloaded-if-missing `patch` to `3.0.0~alpha2` [#6490 @kit-ty-kate]
8374

8475
## Infrastructure
8576

8677
## Release scripts
87-
* Add `2.4.0~alpha1` to the install scripts [#6475 @kit-ty-kate]
8878

8979
## Install script
9080

@@ -103,37 +93,28 @@ users)
10393
## Shell
10494

10595
## Internal
106-
* Fix a memory leak happening when running large numbers of commands or opening large number of opam files [#6485 @hannesm - fix #6484]
10796

10897
## Internal: Unix
10998

11099
## Internal: Windows
111100

112101
## Test
113-
* patchDiff: add some tests showing the handling of empty files and new directories [#6490 @rjbou]
114-
* patchDiff: test the diff parser when generated using `git diff` [#6490 @rjbou]
115102

116103
## Benchmarks
117104

118105
## Reftests
119106
### Tests
120-
* Show the behaviour of `opam switch create` in presence of `avoid-version`/`deprecated` packages [#6494 @kit-ty-kate]
121-
* Add some tests showing the behaviour of the internal patch implementation [#6490 @rjbou]
122107

123108
### Engine
124109

125110
## Github Actions
126-
* Add depext job for depext test on Altlinux [#6277 @rjbou]
127-
* Upgrade the opam binary used for the depexts run to `2.4.0~alpha1` [#6277 @kit-ty-kate]
128111

129112
## Doc
130113

131114
## Security fixes
132115

133116
# API updates
134117
## opam-client
135-
* `OpamClientConfig`: remove `STATS` variant and related `print_stats` field in config record [#6485 @hannesm]
136-
* `OpamArg.environment_variable`: make `STATS` as removed from cli 2.3 [#6485 @rjbou]
137118

138119
## opam-repository
139120

@@ -142,11 +123,5 @@ users)
142123
## opam-solver
143124

144125
## opam-format
145-
* `OpamFile`: remove `Stats` module [#6485 @hannesm]
146126

147127
## opam-core
148-
* `OpamSystem`: remove `print_stats` function [#6485 @hannesm]
149-
* `OpamSystem`: add the `rmdir_cleanup` function [#6490 @kit-ty-kate]
150-
* `OpamSystem.dir_is_empty`: Speedup and change its type to handle unreachable directories better [#6490 @kit-ty-kate]
151-
* `OpamSystem.internal_patch`: remove parent directories when all of their content has been moved somewhere else [#6490 @kit-ty-kate]
152-
* `OpamSystem.internal_patch`: fix moving files to new directories when receiving a git diff [#6490 @kit-ty-kate]

opam-client.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.4.0~alpha2~dev"
2+
version: "2.4.0~alpha2"
33
synopsis: "Client library for opam 2.4"
44
description: """
55
Actions on the opam root, switches, installations, and front-end.

opam-core.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.4.0~alpha2~dev"
2+
version: "2.4.0~alpha2"
33
synopsis: "Core library for opam 2.4"
44
description:
55
"Small standard library extensions, and generic system interaction modules used by opam."

opam-devel.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.4.0~alpha2~dev"
2+
version: "2.4.0~alpha2"
33
synopsis: "Bootstrapped development binary for opam 2.4"
44
description: """
55
This package compiles (bootstraps) opam. For consistency and safety of the installation, the binaries are not installed into the PATH, but into lib/opam-devel, from where the user can manually install them system-wide.

opam-format.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.4.0~alpha2~dev"
2+
version: "2.4.0~alpha2"
33
synopsis: "Format library for opam 2.4"
44
description: """
55
Definition of opam datastructures and its file interface.

opam-installer.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.4.0~alpha2~dev"
2+
version: "2.4.0~alpha2"
33
synopsis: "Installation of files to a prefix, following opam conventions"
44
description: """
55
opam-installer is a small tool that can read *.install files, as defined by opam [1], and execute them to install or remove package files without going through opam.

opam-repository.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.4.0~alpha2~dev"
2+
version: "2.4.0~alpha2"
33
synopsis: "Repository library for opam 2.4"
44
description: """
55
This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.

0 commit comments

Comments
 (0)