Re-organize repository

freckle · Nov 17, 2020 · cbfa7d0 · cbfa7d0
1 parent eb09c84
commit cbfa7d0
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 82 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1 @@
+TODO
diff --git a/README.md b/README.md
@@ -1 +1 @@
-graphula-core/test/README.lhs
+test/README.lhs
diff --git a/graphula-core/Setup.hs → Setup.hs b/graphula-core/Setup.hs → Setup.hs
diff --git a/graphula-core/graphula-core.cabal → graphula-core.cabal b/graphula-core/graphula-core.cabal → graphula-core.cabal
@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 6d2c3c26856ffe4f969fae8c28e11aa6e252225226a3f13590d8526121438327
+-- hash: c702d130f70b24da8de0ffee7a182f6962fb405feea3f8e1bc1070a191b37900
 
 name:           graphula-core
 version:        2.0.0.0
@@ -13,7 +13,8 @@ license:        MIT
 license-file:   LICENSE
 build-type:     Simple
 extra-source-files:
-    ../stack.yaml
+    README.md
+    CHANGELOG.md
 
 library
   exposed-modules:
@@ -66,7 +67,6 @@ test-suite readme
     , monad-logger
     , path-pieces
     , persistent
-    , persistent-arbitrary
     , persistent-sqlite
     , persistent-template
     , resourcet

diff --git a/graphula-core/LICENSE b/graphula-core/LICENSE
diff --git a/graphula-core/README.md b/graphula-core/README.md
diff --git a/graphula-core/package.yaml → package.yaml b/graphula-core/package.yaml → package.yaml
@@ -3,7 +3,8 @@ version: 2.0.0.0
 maintainer: Freckle Education
 
 extra-source-files:
-  - ../stack.yaml
+  - README.md
+  - CHANGELOG.md
 
 dependencies:
   - base
@@ -45,7 +46,7 @@ tests:
       - monad-logger
       - path-pieces
       - persistent
-      - persistent-arbitrary
+        #- persistent-arbitrary
       - persistent-sqlite
       - persistent-template
       - QuickCheck

diff --git a/persistent-arbitrary/LICENSE b/persistent-arbitrary/LICENSE
diff --git a/persistent-arbitrary/Setup.hs b/persistent-arbitrary/Setup.hs
diff --git a/persistent-arbitrary/package.yaml b/persistent-arbitrary/package.yaml
diff --git a/persistent-arbitrary/src/Database/Persist/Arbitrary.hs b/persistent-arbitrary/src/Database/Persist/Arbitrary.hs
diff --git a/graphula-core/src/Graphula.hs → src/Graphula.hs b/graphula-core/src/Graphula.hs → src/Graphula.hs
diff --git a/graphula-core/src/Graphula/Arbitrary.hs → src/Graphula/Arbitrary.hs b/graphula-core/src/Graphula/Arbitrary.hs → src/Graphula/Arbitrary.hs
diff --git a/graphula-core/src/Graphula/Internal.hs → src/Graphula/Internal.hs b/graphula-core/src/Graphula/Internal.hs → src/Graphula/Internal.hs
diff --git a/graphula-core/src/Graphula/Key.hs → src/Graphula/Key.hs b/graphula-core/src/Graphula/Key.hs → src/Graphula/Key.hs
diff --git a/stack.yaml b/stack.yaml
@@ -1,7 +1,4 @@
 resolver: lts-15.13
-packages:
-  - graphula-core
-  - persistent-arbitrary
 extra-deps:
   - generics-eot-0.4.0.1@sha256:3d8df1d8ca010238ec5f20ba30282daa0fac99c7de495fae64e26a7ea1dadb08,2312
 

diff --git a/test.db b/test.db
diff --git a/graphula-core/test/Graphula/UUIDKey.hs → test/Graphula/UUIDKey.hs b/graphula-core/test/Graphula/UUIDKey.hs → test/Graphula/UUIDKey.hs
diff --git a/graphula-core/test/README.lhs → test/README.lhs b/graphula-core/test/README.lhs → test/README.lhs
@@ -19,6 +19,7 @@ Graphula is a simple interface for generating persistent data and linking its de
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 module Main where
 
 import Control.Monad (replicateM_)
@@ -27,7 +28,6 @@ import Control.Monad.IO.Unlift
 import Control.Monad.Logger (NoLoggingT)
 import Control.Monad.Trans.Reader (ReaderT)
 import Control.Monad.Trans.Resource (ResourceT)
-import Database.Persist.Arbitrary ()
 import Database.Persist.Sqlite
 import Database.Persist.TH
 import Data.Typeable
@@ -36,6 +36,9 @@ import Graphula
 import Graphula.UUIDKey
 import Test.Hspec
 import Test.QuickCheck
+
+instance (ToBackendKey SqlBackend a) => Arbitrary (Key a) where
+  arbitrary = toSqlKey <$> arbitrary
 ```
 -->