lens-regex 0.1.0 → 0.1.1

raw patch · 4 files changed

+114/−55 lines, 4 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• .travis.yml +104/−45
• CHANGELOG.md +4/−0
• lens-regex.cabal +5/−3
• tests/doctests.hs +1/−7

@@ -1,55 +1,114 @@-language: haskell+# This Travis job script has been generated by a script via+#+#   runghc make_travis_yml_2.hs 'lens-regex.cabal'+#+# For more information, see https://github.com/haskell-CI/haskell-ci+#+language: c+sudo: false -env:-  matrix:-    - GHCVER=7.4.2-    - GHCVER=7.6.3-    - GHCVER=7.8.4-    - GHCVER=7.10.1-    - GHCVER=head+git:+  submodules: false  # whether to recursively clone submodules +cache:+  directories:+    - $HOME/.cabal/packages+    - $HOME/.cabal/store++before_cache:+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log+  # remove files that are regenerated by 'cabal update'+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx++  - rm -rfv $HOME/.cabal/packages/head.hackage+ matrix:-  allow_failures:-    - env: GHCVER=head+  include:+    - compiler: "ghc-8.6.3"+    # env: TEST=--disable-tests BENCH=--disable-benchmarks+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}+    - compiler: "ghc-8.4.4"+    # env: TEST=--disable-tests BENCH=--disable-benchmarks+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}+    - compiler: "ghc-8.2.2"+    # env: TEST=--disable-tests BENCH=--disable-benchmarks+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}  before_install:-  - |-    if [ $GHCVER = `ghc --numeric-version` ]; then-      echo "use system ghc: `which ghc` `ghc --numeric-version`"-    else-      travis_retry sudo add-apt-repository -y ppa:hvr/ghc-      travis_retry sudo apt-get update-      travis_retry sudo apt-get install  -y --force-yes cabal-install-1.22 ghc-$GHCVER-      export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/1.22/bin:$PATH-      echo "use ppa:hvr/ghc: `which ghc` `ghc --numeric-version`"-    fi+  - HC=${CC}+  - HCPKG=${HC/ghc/ghc-pkg}+  - unset CC+  - ROOTDIR=$(pwd)+  - mkdir -p $HOME/.local/bin+  - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"+  - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))+  - echo $HCNUMVER  install:-  - export PATH=$HOME/.cabal/bin:$PATH-  - which cabal-  - travis_retry cabal update-  - cabal install --only-dependencies --enable-tests-  - ghc-pkg list+  - cabal --version+  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"+  - BENCH=${BENCH---enable-benchmarks}+  - TEST=${TEST---enable-tests}+  - HADDOCK=${HADDOCK-true}+  - UNCONSTRAINED=${UNCONSTRAINED-true}+  - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}+  - GHCHEAD=${GHCHEAD-false}+  - travis_retry cabal update -v+  - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"+  - rm -fv cabal.project cabal.project.local+  - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'+  - "printf 'packages: \".\"\\n' > cabal.project"+  - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"+  - touch cabal.project.local+  - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg  | grep -vw -- lens-regex | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"+  - cat cabal.project || true+  - cat cabal.project.local || true+  - if [ -f "./configure.ac" ]; then+      (cd "." && autoreconf -i);+    fi+  - rm -f cabal.project.freeze+  - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all+  - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all+  - rm -rf .ghc.environment.* "."/dist+  - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) +# Here starts the actual work to be performed for the package under test;+# any command which exits with a non-zero exit code causes the build to fail. script:-  - which cabal-  - cabal configure --enable-tests -fbuild-samples-  - cabal build-  - cabal test --show-details=always+  # test that source-distributions can be generated+  - cabal new-sdist all+  - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/+  - cd ${DISTDIR} || false+  - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;+  - "printf 'packages: lens-regex-*/*.cabal\\n' > cabal.project"+  - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"+  - touch cabal.project.local+  - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg  | grep -vw -- lens-regex | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"+  - cat cabal.project || true+  - cat cabal.project.local || true+  # this builds all libraries and executables (without tests/benchmarks)+  - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all -  # tests source distribution package-  - cabal sdist-  - |-    PKGNAME="$(cabal info . | awk '/^\*/{print $2}')"-    SRCTGZ="${PKGNAME}.tar.gz"-    cd dist/-    if [ -f "$SRCTGZ" ]; then-      tar xvzf "$SRCTGZ"-      cd "$PKGNAME"-      NG=$(git ls-tree HEAD --full-tree -r | while read perm blob hash name; do [ -e "$name" ] || echo NG "$name"; done)-      if [ -n "$NG" ]; then-        echo "Missing files:"-        echo $NG-        exit 1-      fi-    fi+  # build & run tests, build benchmarks+  - cabal new-build -w ${HC} ${TEST} ${BENCH} all+  - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi++  # cabal check+  - (cd lens-regex-* && cabal check)++  # haddock+  - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi++  # Build without installed constraints for packages in global-db+  - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi++# REGENDATA ["lens-regex.cabal"]+# EOF++notifications:+  slack:+    secure: "0lxdpKWm5Apb6uYHQNr8uhb5Czyvb3x/kEKsgdAQy4Wd1fKSZCt+w+y/U6ImxtlNtSm6oD9RyZ1n7p/CBIqlmq+Rgr114i/LmnHnFdJaUuixMP8aD66ni78oYluw/pKzyKX5qw5uG/0q8QTs2zUqc+Fw9pLQv7/HkYs9WntqsF2un7r2cduizc2ybhMQAb4W0dELN272VgLWs102AUrt7+L3hBGcm29oaXQJXFgne4xMMPFV4FJMrQfIG80RpssSa8Gh/XxE0GReRqz8/EjvSf8EwweNcBNqs/XA7V8mqfQMcYciC0kfiju3/vFXtTKbrjNy9/yRIp1RIrh25S51qlC75oEjkofXjBOclrjZsXZV1yLAKGi9adz3LM7bE+yTVKoFAhu6aC23eeBYzqXDnnpi8H15mKPi2pWpaeWV3xcQOXDCMQ1KXYahtXsF2MsrQvNsHhb+6jxYrARGKYxPF5joOge+72LrDmq9llQXiG+E40Ay3WICD1FzmOe4cytm3ZhX5scF11ks7q98x2nKO4PnJC1YCxw0mrgs+EobeElo3PRBUSnWRMFyr8s4d5Hh8OWBUD9xJpBp/mfB2kcbN73ZXCylxAVEyl9A4tS6UArmuDuyqf1HuwqxYiFw/IWmlcIS/uMevivOmvRO8RWrYeI9d30HTwY6vdBst9lmgME="

@@ -1,3 +1,7 @@+## 0.1.1++* Remove no longer needed doctests options (#2)+ ## 0.1.0  * Initial release

@@ -1,7 +1,7 @@ name:                lens-regex-version:             0.1.0+version:             0.1.1 synopsis:            Lens powered regular expression-description:         Lens powered regular expression+description:         lens interface for regex-base. Please see the README on Github at <https://github.com/himura/lens-regex#readme> homepage:            https://github.com/himura/lens-regex license:             BSD3 license-file:        LICENSE@@ -12,6 +12,8 @@ build-type:          Simple cabal-version:       >=1.10 +tested-with:         GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.3+ extra-source-files:   .gitignore   .travis.yml@@ -51,7 +53,7 @@                      , lens-regex                      , regex-posix     ghc-options:       -Wall-    default-language:  Haskell2010+ default-language:  Haskell2010  test-suite doctests   type: exitcode-stdio-1.0

@@ -10,13 +10,7 @@ main :: IO () main = do     sources <- findSources-    doctest $-        [ "-isrc"-        , "-idist/build/autogen"-        , "-optP-include"-        , "-optPdist/build/autogen/cabal_macros.h"-        ]-        ++ sources+    doctest sources  findSources :: IO [FilePath] findSources = filter (isSuffixOf ".hs") <$> go "src"