Browse Source

Bump version, make release

tags/v0.2.1.0^0
Peter J. Jones 1 year ago
parent
commit
ccdbbd677d
Signed by: Peter Jones <pjones@devalot.com> GPG Key ID: 9DAFAA8D01941E49
11 changed files with 137 additions and 45 deletions
  1. 0
    2
      .gitignore
  2. 104
    0
      .travis.yml
  3. 4
    0
      CHANGES.md
  4. 1
    1
      LICENSE
  5. 5
    1
      README.md
  6. 0
    2
      cabal.project
  7. 16
    13
      default.nix
  8. 6
    6
      playlists-http.cabal
  9. 1
    1
      playlists-http.nix
  10. 0
    15
      stack.nix
  11. 0
    4
      stack.yaml

+ 0
- 2
.gitignore View File

@@ -1,4 +1,2 @@
1 1
 /.stack-work
2
-/cabal.project.local
3
-/dist-newstyle
4 2
 /dist

+ 104
- 0
.travis.yml View File

@@ -0,0 +1,104 @@
1
+# This Travis job script has been generated by a script via
2
+#
3
+#   runghc make_travis_yml_2.hs 'playlists-http.cabal'
4
+#
5
+# For more information, see https://github.com/hvr/multi-ghc-travis
6
+#
7
+language: c
8
+sudo: false
9
+
10
+git:
11
+  submodules: false  # whether to recursively clone submodules
12
+
13
+cache:
14
+  directories:
15
+    - $HOME/.cabal/packages
16
+    - $HOME/.cabal/store
17
+
18
+before_cache:
19
+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
20
+  # remove files that are regenerated by 'cabal update'
21
+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
22
+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
23
+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
24
+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
25
+  - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
26
+
27
+  - rm -rfv $HOME/.cabal/packages/head.hackage
28
+
29
+matrix:
30
+  include:
31
+    - compiler: "ghc-7.10.3"
32
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
33
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
34
+    - compiler: "ghc-8.0.2"
35
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
36
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
37
+    - compiler: "ghc-8.2.2"
38
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
39
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
40
+    - compiler: "ghc-8.4.1"
41
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
42
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
43
+
44
+before_install:
45
+  - HC=${CC}
46
+  - HCPKG=${HC/ghc/ghc-pkg}
47
+  - unset CC
48
+  - ROOTDIR=$(pwd)
49
+  - mkdir -p $HOME/.local/bin
50
+  - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
51
+  - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
52
+  - echo $HCNUMVER
53
+
54
+install:
55
+  - cabal --version
56
+  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
57
+  - BENCH=${BENCH---enable-benchmarks}
58
+  - TEST=${TEST---enable-tests}
59
+  - HADDOCK=${HADDOCK-true}
60
+  - INSTALLED=${INSTALLED-true}
61
+  - GHCHEAD=${GHCHEAD-false}
62
+  - travis_retry cabal update -v
63
+  - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
64
+  - rm -fv cabal.project cabal.project.local
65
+  - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
66
+  - "printf 'packages: \".\"\\n' > cabal.project"
67
+  - cat cabal.project
68
+  - if [ -f "./configure.ac" ]; then
69
+      (cd "." && autoreconf -i);
70
+    fi
71
+  - rm -f cabal.project.freeze
72
+  - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
73
+  - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
74
+  - rm -rf .ghc.environment.* "."/dist
75
+  - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
76
+
77
+# Here starts the actual work to be performed for the package under test;
78
+# any command which exits with a non-zero exit code causes the build to fail.
79
+script:
80
+  # test that source-distributions can be generated
81
+  - (cd "." && cabal sdist)
82
+  - mv "."/dist/playlists-http-*.tar.gz ${DISTDIR}/
83
+  - cd ${DISTDIR} || false
84
+  - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
85
+  - "printf 'packages: playlists-http-*/*.cabal\\n' > cabal.project"
86
+  - cat cabal.project
87
+  # this builds all libraries and executables (without tests/benchmarks)
88
+  - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
89
+
90
+  # Build with installed constraints for packages in global-db
91
+  - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
92
+
93
+  # build & run tests, build benchmarks
94
+  - cabal new-build -w ${HC} ${TEST} ${BENCH} all
95
+
96
+  # cabal check
97
+  - (cd playlists-http-* && cabal check)
98
+
99
+  # haddock
100
+  - rm -rf ./dist-newstyle
101
+  - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
102
+
103
+# REGENDATA ["playlists-http.cabal"]
104
+# EOF

+ 4
- 0
CHANGES.md View File

@@ -1,3 +1,7 @@
1
+# Version 0.2.1.0 (March 20, 2018)
2
+
3
+  * Update dependency bounds
4
+
1 5
 # Version 0.2.0.0 (December 1, 2017)
2 6
 
3 7
   * Update to match `playlists` 0.5.0.0

+ 1
- 1
LICENSE View File

@@ -1,4 +1,4 @@
1
-Copyright (c) 2016,2017 Peter Jones <pjones@devalot.com>
1
+Copyright (c) 2016,2018 Peter Jones <pjones@devalot.com>
2 2
 
3 3
 All rights reserved.
4 4
 

+ 5
- 1
README.md View File

@@ -1,4 +1,5 @@
1
-# playlists-http
1
+playlists-http [![Travis][travis-shield]][travis]
2
+==============
2 3
 
3 4
 Download and parse playlists over HTTP.
4 5
 
@@ -14,3 +15,6 @@ See the following modules for more details:
14 15
 
15 16
 There is also an `examples/example.hs` that demonstrates how to use
16 17
 the `download` function which is found in `Text.Playlist.HTTP.Full`.
18
+
19
+[travis]: https://travis-ci.org/pjones/playlists-http
20
+[travis-shield]: https://travis-ci.org/pjones/playlists-http.svg?branch=master

+ 0
- 2
cabal.project View File

@@ -1,2 +0,0 @@
1
-packages: ./
2
-          ../playlists

+ 16
- 13
default.nix View File

@@ -1,17 +1,20 @@
1
-# These arguments are so you can override settings from the command
2
-# line using the `nix-hs' tool.
3
-{ nixpkgs   ? import <nixpkgs> { }
4
-, compiler  ? "default"
5
-, profiling ? false
6
-}:
1
+{ pkgs ? (import <nixpkgs> {}).pkgs }:
7 2
 
8 3
 let
9
-  pkgs = nixpkgs;
10
-
11
-  buildInputs = with pkgs; [
12
-    # List extra dependencies here.
13
-  ];
4
+  # List any extra packages you want available while your package is
5
+  # building or while in a nix shell:
6
+  extraPackages = with pkgs; [ ];
14 7
 
8
+  # Helpful if you want to override any Haskell packages:
9
+  haskell = pkgs.haskellPackages;
15 10
 in
16
-  pkgs.nix-hs.interactive ./playlists-http.nix
17
-    { inherit compiler profiling buildInputs; }
11
+
12
+# Load the local nix file and use the overrides from above:
13
+haskell.callPackage ./playlists-http.nix {
14
+  mkDerivation = { buildTools ? []
15
+                 , ...
16
+                 }@args:
17
+    haskell.mkDerivation (args // {
18
+      buildTools = buildTools ++ extraPackages;
19
+    });
20
+}

+ 6
- 6
playlists-http.cabal View File

@@ -1,16 +1,16 @@
1 1
 name:          playlists-http
2
-version:       0.2.0.0
2
+version:       0.2.1.0
3 3
 synopsis:      Library to glue together playlists and http-client
4 4
 homepage:      https://github.com/pjones/playlists-http
5 5
 license:       BSD3
6 6
 license-file:  LICENSE
7 7
 author:        Peter Jones <pjones@devalot.com>
8 8
 maintainer:    Peter Jones <pjones@devalot.com>
9
-copyright:     Copyright (c) 2016,2017 Peter Jones
9
+copyright:     Copyright (c) 2016,2018 Peter Jones
10 10
 category:      Text
11 11
 build-type:    Simple
12
-cabal-version: >= 1.18
13
-tested-with:   GHC==7.10.3, GHC==8.0.2
12
+cabal-version: 1.18
13
+tested-with:   GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1
14 14
 description:   Simple library for resolving playlists using http-client.
15 15
 
16 16
 --------------------------------------------------------------------------------
@@ -52,10 +52,10 @@ library
52 52
   build-depends: attoparsec   >= 0.10  && < 1.0
53 53
                , base         >= 4.6   && < 5
54 54
                , bytestring   >= 0.10  && < 1.0
55
-               , exceptions   >= 0.8   && < 0.9
55
+               , exceptions   >= 0.8   && < 0.11
56 56
                , http-client  >= 0.4   && < 0.6
57 57
                , mtl          >= 2.2   && < 2.3
58
-               , playlists    >= 0.5   && < 0.6
58
+               , playlists    >= 0.5   && < 1.0
59 59
                , text         >= 0.11  && < 1.3
60 60
                , transformers >= 0.4   && < 0.6
61 61
 

+ 1
- 1
playlists-http.nix View File

@@ -3,7 +3,7 @@
3 3
 }:
4 4
 mkDerivation {
5 5
   pname = "playlists-http";
6
-  version = "0.1.2.0";
6
+  version = "0.2.1.0";
7 7
   src = ./.;
8 8
   isLibrary = true;
9 9
   isExecutable = true;

+ 0
- 15
stack.nix View File

@@ -1,15 +0,0 @@
1
-{ nixpkgs ? import <nixpkgs> { }
2
-, ghc ? nixpkgs.ghc
3
-}:
4
-
5
-with nixpkgs;
6
-
7
-haskell.lib.buildStackProject {
8
-  name = "playlists-http";
9
-
10
-  buildInputs = [
11
-    zlib
12
-  ];
13
-
14
-  inherit ghc;
15
-}

+ 0
- 4
stack.yaml View File

@@ -6,10 +6,6 @@ packages:
6 6
 - ../playlists
7 7
 - ./
8 8
 
9
-nix:
10
-  enable: false
11
-  shell-file: stack.nix
12
-
13 9
 flags:
14 10
   playlists-http:
15 11
     maintainer: true

Loading…
Cancel
Save