From 572deb7144cea98e46ae9ad3c8012fc653fc8664 Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Thu, 5 Dec 2019 11:20:32 +0200
Subject: [PATCH] Bump version to 3.0.1.0
Make cabal-testsuite version fixed, less bumping in the future.
---
Cabal/Cabal.cabal | 2 +-
Cabal/ChangeLog.md | 10 ++++++++++
Cabal/Makefile | 2 +-
Cabal/doc/conf.py | 2 +-
appveyor.yml | 2 +-
cabal-install/bootstrap.sh | 4 ++--
cabal-install/cabal-install.cabal | 4 ++--
cabal-install/cabal-install.cabal.pp | 4 ++--
cabal-install/changelog | 13 +++++++++++++
cabal-testsuite/cabal-testsuite.cabal | 5 +++--
solver-benchmarks/solver-benchmarks.cabal | 2 +-
travis-common.sh | 8 ++++----
travis-deploy.sh | 2 +-
validate.sh | 4 ++--
14 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
index 4d3ab6cdfa..12034e3310 100644
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
@@ -1,6 +1,6 @@
cabal-version: >=1.10
name: Cabal
-version: 3.0.0.0
+version: 3.0.1.0
copyright: 2003-2019, Cabal Development Team (see AUTHORS file)
license: BSD3
license-file: LICENSE
diff --git a/Cabal/ChangeLog.md b/Cabal/ChangeLog.md
index 04c23ef7a3..0634cf316d 100644
--- a/Cabal/ChangeLog.md
+++ b/Cabal/ChangeLog.md
@@ -1,3 +1,13 @@
+# 3.0.1.0 TBW
+ * Add GHC-8.8 flags to normaliseGhcFlags
+ ([#6379](https://github.com/haskell/cabal/pull/6379))
+ * Typo fixes
+ ([#6372](https://github.com/haskell/cabal/pull/6372))
+ * Limit version number parts to contain at most 9 digits
+ ([#6386](https://github.com/haskell/cabal/pull/6386)
+ * Fix boundless sublibrary depedency parse failure
+ ([#5846](https://github.com/haskell/cabal/issues/5846))
+
# 3.0.0.0 [Mikhail Glushenkov](mailto:mikhail.glushenkov@gmail.com) August 2019
* The 3.0 migration guide gives advice on adapting Custom setup
scripts to backwards-incompatible changes in this release:
diff --git a/Cabal/Makefile b/Cabal/Makefile
index 1cd2645d25..ae0c9e7012 100644
--- a/Cabal/Makefile
+++ b/Cabal/Makefile
@@ -1,4 +1,4 @@
-VERSION=3.0.0.0
+VERSION=3.0.1.0
#KIND=devel
KIND=rc
diff --git a/Cabal/doc/conf.py b/Cabal/doc/conf.py
index b64b0344b6..de8f61f0c9 100644
--- a/Cabal/doc/conf.py
+++ b/Cabal/doc/conf.py
@@ -13,7 +13,7 @@ import sphinx_rtd_theme
sys.path.insert(0, os.path.abspath('.'))
import cabaldomain
-version = "3.0.0.0"
+version = "3.0.1.0"
extensions = ['sphinx.ext.extlinks', 'sphinx.ext.todo']
diff --git a/appveyor.yml b/appveyor.yml
index 75c026ce38..07a76e103b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -55,7 +55,7 @@ build_script:
- cabal %CABOPTS% v2-test Cabal
- appveyor-retry cabal %CABOPTS% v2-build exe:cabal exe:cabal-tests --only-dependencies
- cabal %CABOPTS% v2-build exe:cabal
- - cabal %CABOPTS% v2-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.0.0.0\x\cabal\build\cabal\cabal.exe
+ - cabal %CABOPTS% v2-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.0.1.0\x\cabal\build\cabal\cabal.exe
- appveyor-retry cabal %CABOPTS% v2-build cabal-install:tests --only-dependencies
- cd cabal-install
- cabal %CABOPTS% v2-run cabal-install:memory-usage-tests
diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
index 2272c06363..a96b95bab7 100755
--- a/cabal-install/bootstrap.sh
+++ b/cabal-install/bootstrap.sh
@@ -224,8 +224,8 @@ NETWORK_URI_VER="2.6.1.0"; NETWORK_URI_VER_REGEXP="2\.6\.(0\.[2-9]|[1-9])"
# >= 2.6.0.2 && < 2.7
NETWORK_VER="2.7.0.0"; NETWORK_VER_REGEXP="2\.[0-7]\."
# >= 2.0 && < 2.7
-CABAL_VER="3.0.0.0"; CABAL_VER_REGEXP="3\.0\.[0-9]"
- # >= 2.5 && < 2.6
+CABAL_VER="3.0.1.0"; CABAL_VER_REGEXP="3\.0\.[1-9]"
+ # >= 3.0.1 && < 3.1
TRANS_VER="0.5.5.0"; TRANS_VER_REGEXP="0\.[45]\."
# >= 0.2.* && < 0.6
MTL_VER="2.2.2"; MTL_VER_REGEXP="[2]\."
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 0015aa253e..d2ce84672a 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -4,7 +4,7 @@ Cabal-Version: >= 1.10
-- To update this file, edit 'cabal-install.cabal.pp' and run
-- 'make cabal-install-prod' in the project's root folder.
Name: cabal-install
-Version: 3.0.0.0
+Version: 3.0.1.0
Synopsis: The command-line interface for Cabal and Hackage.
Description:
The \'cabal\' command-line program simplifies the process of managing
@@ -317,7 +317,7 @@ executable cabal
base16-bytestring >= 0.1.1 && < 0.2,
binary >= 0.7.3 && < 0.9,
bytestring >= 0.10.6.0 && < 0.11,
- Cabal == 3.0.*,
+ Cabal >= 3.0.1.0 && < 3.1,
containers >= 0.5.6.2 && < 0.7,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.4.1.1 && < 1.5,
diff --git a/cabal-install/cabal-install.cabal.pp b/cabal-install/cabal-install.cabal.pp
index 9f73d85986..489aa130ce 100644
--- a/cabal-install/cabal-install.cabal.pp
+++ b/cabal-install/cabal-install.cabal.pp
@@ -10,7 +10,7 @@ Cabal-Version: >= 1.10
-- To update this file, edit 'cabal-install.cabal.pp' and run
-- 'make cabal-install-prod' in the project's root folder.
Name: cabal-install
-Version: 3.0.0.0
+Version: 3.0.1.0
#
# NOTE: when updating build-depends, don't forget to update version regexps in bootstrap.sh.
#
@@ -22,7 +22,7 @@ Version: 3.0.0.0
base16-bytestring >= 0.1.1 && < 0.2,
binary >= 0.7.3 && < 0.9,
bytestring >= 0.10.6.0 && < 0.11,
- Cabal == 3.0.*,
+ Cabal >= 3.0.1.0 && < 3.1,
containers >= 0.5.6.2 && < 0.7,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.4.1.1 && < 1.5,
diff --git a/cabal-install/changelog b/cabal-install/changelog
index be79e30922..0e955fd7ae 100644
--- a/cabal-install/changelog
+++ b/cabal-install/changelog
@@ -1,5 +1,18 @@
-*-change-log-*-
+3.0.1.0 TBW December 2019
+ * Create store incoming directory
+ ([#4130](https://github.com/haskell/cabal/issues/4130))
+ * `fetchRepoTarball` output is not marked
+ ([#6385](https://github.com/haskell/cabal/pull/6385))
+ * Update `setupMinCabalVersionConstraint` for GHC-8.8
+ ([#6217](https://github.com/haskell/cabal/pull/6217))
+ * Use `lukko` for file locking
+ ([#6345](https://github.com/haskell/cabal/pull/6345))
+ * Use `hackage-security-0.6`
+ ([#6388](https://github.com/haskell/cabal/pull/6388))
+ * Other dependency upgrades
+
3.0.0.0 Mikhail Glushenkov <mikhail.glushenkov@gmail.com> August 2019
* `v2-haddock` fails on `haddock` failures (#5977)
* `v2-run` works when given `File.lhs` literate file. (#6134)
diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
index 5655827dc8..def1c5a3b4 100644
--- a/cabal-testsuite/cabal-testsuite.cabal
+++ b/cabal-testsuite/cabal-testsuite.cabal
@@ -1,6 +1,7 @@
cabal-version: 2.2
name: cabal-testsuite
-version: 3.0.0.0
+-- Don't change the version, it's pointless.
+version: 3
copyright: 2003-2019, Cabal Development Team (see AUTHORS file)
license: BSD-3-Clause
license-file: LICENSE
@@ -28,7 +29,7 @@ common shared
build-depends:
, base >= 4.6 && <4.14
-- this needs to match the in-tree lib:Cabal version
- , Cabal == 3.0.0.0
+ , Cabal == 3.0.1.0
ghc-options: -Wall -fwarn-tabs
diff --git a/solver-benchmarks/solver-benchmarks.cabal b/solver-benchmarks/solver-benchmarks.cabal
index 9644d8bd54..ab28af0ae7 100644
--- a/solver-benchmarks/solver-benchmarks.cabal
+++ b/solver-benchmarks/solver-benchmarks.cabal
@@ -1,5 +1,5 @@
name: solver-benchmarks
-version: 3.0.0.0
+version: 3
copyright: 2003-2017, Cabal Development Team (see AUTHORS file)
license: BSD3
license-file: LICENSE
diff --git a/travis-common.sh b/travis-common.sh
index 4190288fdd..9ea15bf75b 100644
--- a/travis-common.sh
+++ b/travis-common.sh
@@ -1,7 +1,7 @@
set -e
-CABAL_VERSION="3.0.0.0"
-CABAL_INSTALL_VERSION="3.0.0.0"
+CABAL_VERSION="3.0.1.0"
+CABAL_INSTALL_VERSION="3.0.1.0"
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
ARCH="x86_64-linux"
@@ -12,9 +12,9 @@ fi
CABAL_STORE_DB="${HOME}/.cabal/store/ghc-${GHCVER}/package.db"
CABAL_LOCAL_DB="${TRAVIS_BUILD_DIR}/dist-newstyle/packagedb/ghc-${GHCVER}"
CABAL_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/$ARCH/ghc-$GHCVER/Cabal-${CABAL_VERSION}"
-CABAL_TESTSUITE_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/$ARCH/ghc-$GHCVER/cabal-testsuite-${CABAL_VERSION}"
+CABAL_TESTSUITE_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/$ARCH/ghc-$GHCVER/cabal-testsuite-3"
CABAL_INSTALL_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/$ARCH/ghc-$GHCVER/cabal-install-${CABAL_INSTALL_VERSION}"
-SOLVER_BENCHMARKS_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/$ARCH/ghc-$GHCVER/solver-benchmarks-${CABAL_VERSION}"
+SOLVER_BENCHMARKS_BDIR="${TRAVIS_BUILD_DIR}/dist-newstyle/build/$ARCH/ghc-$GHCVER/solver-benchmarks-3"
CABAL_INSTALL_EXE=${CABAL_INSTALL_BDIR}/x/cabal/build/cabal/cabal
# ---------------------------------------------------------------------
diff --git a/travis-deploy.sh b/travis-deploy.sh
index 88d7ddbbb9..826796bba1 100755
--- a/travis-deploy.sh
+++ b/travis-deploy.sh
@@ -8,7 +8,7 @@ deploy() {
(cd cabal-website && git checkout --track -b gh-pages origin/gh-pages)
rm -rf cabal-website/doc
mkdir -p cabal-website/doc/html
- mv dist-newstyle/build/`uname -m`-$TRAVIS_OS_NAME/ghc-$GHCVER/Cabal-3.0.0.0/doc/html/Cabal \
+ mv dist-newstyle/build/`uname -m`-$TRAVIS_OS_NAME/ghc-$GHCVER/Cabal-3.0.1.0/doc/html/Cabal \
cabal-website/doc/html/Cabal
(cd cabal-website && git add --all .)
(cd cabal-website && \
diff --git a/validate.sh b/validate.sh
index ae19709440..6550e1ec1a 100755
--- a/validate.sh
+++ b/validate.sh
@@ -177,7 +177,7 @@ timed $CABALPLAN --version
#######################################################################
# NOTE: This should match cabal-testsuite version
-CABAL_VERSION="3.0.0.0"
+CABAL_VERSION="3.0.1.0"
if [ "$(uname)" = "Linux" ]; then
ARCH="x86_64-linux"
@@ -193,7 +193,7 @@ fi
BASEHC=ghc-$($HC --numeric-version)
BUILDDIR=dist-newstyle-validate-$BASEHC
-CABAL_TESTSUITE_BDIR="$(pwd)/$BUILDDIR/build/$ARCH/$BASEHC/cabal-testsuite-${CABAL_VERSION}"
+CABAL_TESTSUITE_BDIR="$(pwd)/$BUILDDIR/build/$ARCH/$BASEHC/cabal-testsuite-3"
CABALNEWBUILD="${CABAL} v2-build $JOBS -w $HC --builddir=$BUILDDIR --project-file=$PROJECTFILE"
CABALPLANLISTBIN="${CABALPLAN} list-bin --builddir=$BUILDDIR"
--
GitLab