valkyrie 1.7.1 → 2.0.0.RC1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fbacc1a80b59edcd0ea79874e7049a8782b95ee886e570484647a4f55d8b985
-  data.tar.gz: 93e4e74002395406aaeded34e93122a94e574ea6a7119e5c6b7e4a5adc888379
+  metadata.gz: 3a6595012901f53ab2c47eca1f7aca4e02c6de433ab564c026ea23fc4157ae88
+  data.tar.gz: 20ad473091497657070518c0b019a92436db6cc18b829aed53288c876b29a684
 SHA512:
-  metadata.gz: e2ceae6ebf059b44f26395a0a13ff88b405785d17cefaf6fe8688a3ed4057df59bccc6139cc5418557d36d78548f621e9719ff2051033733302c4d9207e1b504
-  data.tar.gz: 397366d288da8cb381628c91146ccfa4de1b8d8b824d7c78a747bc2f21d5ac8654397551a5f3edba4d14dd717de0ebfa0949c1f20609dbbe92aa1ccb9ec3269f
+  metadata.gz: 0deef685a04e187a7e8352aad5ff9bb7431617b905d03da8222b3f3591bc472f6cf9188bfd426d2afa221dd5778fed3f120c2e99d4e75d95b1d51fe0f66c9d0e
+  data.tar.gz: 27c8e622b13e742ce3f4a6ec88d0d72daa3f90163ce5aba1658a77c4fb0d825349dec1867d1c8a4b1f8a48350c7d40a0f82fb129aa29e060585142b6456d6c85

data/.circleci/config.yml

@@ -1,96 +1,39 @@
 ---
-version: 2.1
+version: 2
 jobs:
   build:
     machine: true
-    parameters:
-      gemfile:
-        description: "Gemfile to run"
-        default: "Gemfile"
-        type: "string"
-      ruby:
-        description: "Ruby version"
-        default: "2.6.3"
-        type: "string"
-    environment:
-      BUNDLE_GEMFILE: << parameters.gemfile >>
     steps:
       - checkout
-      - run:
-          name: Set ruby version to << parameters.ruby >>
-          command: |
-            rvm install << parameters.ruby >>
-            echo . $(rvm << parameters.ruby >> do rvm env --path) >> $BASH_ENV
-      - run: 
-          shell: /bin/bash -l
-          name: Uninstall global Bundler
-          command: |
-            rvm use << parameters.ruby >>
-            rvm gemset use global
-            gem uninstall bundler -x
-            echo Uninstalled
       - run:
           name: Install Docker Compose
           command: |
             curl -L https://github.com/docker/compose/releases/download/1.19.0/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
             chmod +x ~/docker-compose
             sudo mv ~/docker-compose /usr/local/bin/docker-compose
-      - run:
-          name: Update bundler
-          command: gem install bundler -v 1.17.2
       - restore_cache:
          keys:
-           - bundle-{{ checksum "<< parameters.gemfile >>" }}-{{ checksum "valkyrie.gemspec" }}-<< parameters.ruby >>-6
+           - bundle-{{ checksum "Gemfile" }}-{{ checksum "valkyrie.gemspec" }}
+           - bundle- # used if checksum fails
       - run: sudo apt-get update && sudo apt-get install -y libpq-dev
-      - run:
-          name: Set BUNDLE_GEMFILE
-          command: |
-            export BUNDLE_GEMFILE=~/project/<< parameters.gemfile >>
       - run:
           name: Install dependencies
           command: bundle install --path=vendor/bundle --jobs 4 --retry 3
       - save_cache:
-          key: bundle-{{ checksum "<< parameters.gemfile >>" }}-{{ checksum "valkyrie.gemspec" }}-<< parameters.ruby >>-6
+          key: bundle-{{ checksum "Gemfile" }}-{{ checksum "valkyrie.gemspec" }}
           paths:
             - "vendor/bundle"
-            - "gemfiles/vendor/bundle"
       - run:
           name: Run Rubocop
           command: bundle exec rake rubocop
       - run:
           name: Run Specs
           command: bundle exec rake docker:spec
-      - store_artifacts:
-          path: coverage
-          destination: coverage
 workflows:
   version: 2
   build:
     jobs:
-      - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.6.3
-          name: "Ruby2-6_Rails5-2"
-      - build:
-          gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.6.3
-          name: "Ruby2-6_Rails5-1"
-      - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.5.5
-          name: "Ruby2-5_Rails5-2"
-      - build:
-          gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.5.5
-          name: "Ruby2-5_Rails5-1"
-      - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.4.6
-          name: "Ruby2-4_Rails5-2"
-      - build:
-          gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.4.6
-          name: "Ruby2-4_Rails5-1"
+      - build
   nightly:
     triggers:
       - schedule:
@@ -100,27 +43,4 @@ workflows:
               only:
                 - master
     jobs:
-      - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.6.3
-          name: "Ruby2-6_Rails5-2"
-      - build:
-          gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.6.3
-          name: "Ruby2-6_Rails5-1"
-      - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.5.5
-          name: "Ruby2-5_Rails5-2"
-      - build:
-          gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.5.5
-          name: "Ruby2-5_Rails5-1"
-      - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.4.6
-          name: "Ruby2-4_Rails5-2"
-      - build:
-          gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.4.6
-          name: "Ruby2-4_Rails5-1"
+      - build

data/.gitignore

@@ -8,4 +8,3 @@
 /spec/reports/
 /tmp/
 /vendor
-/gemfiles/*.lock

data/.rubocop.yml

@@ -9,7 +9,6 @@ AllCops:
     - 'bin/*'
     - 'db/schema.rb'
     - 'vendor/**/*'
-    - 'gemfiles/vendor/**/*'
 RSpec/ScatteredSetup:
   Enabled: false
 Metrics/BlockLength:
@@ -32,7 +31,3 @@ Naming/PredicateName:
     - "lib/valkyrie/persistence/solr/queries/default_paginator.rb"
 Lint/UnusedMethodArgument:
   AllowUnusedKeywordArguments: true
-Naming/FileName:
-  Exclude:
-    - 'Appraisals'
-    - 'Gemfile'

data/CHANGELOG.md

@@ -1,163 +1,4 @@
-# v1.7.1 2019-05-30
-
-## Changes since last release
-
-* Fix ROOT_PATH error in StorageAdapter#upload shared specs
-  [tpendragon](https://github.com/tpendragon)
-
-Additional thanks to the following for code review and issue reports leading to
-this release:
-
-[escowles](https://github.com/escowles)
-
-# v1.7.0 2019-05-29
-
-## Changes since last release
-
-* Permit storage adapters to have arbitrary arguments to #upload.
-  [jrgriffiniii](https://github.com/jrgriffiniii)
-* Storage adapters can now all upload regular IO objects.
-  [tpendragon](https://github.com/tpendragon)
-* Fedora Storage Adapter has a configurable `resource_uri_transformer` for going
-  from a `Resource` to a Fedora path.
-  [elrayle](https://github.com/elrayle)
-* Improve Gem metadata and allow Bundler 2
-  [jcoyne](https://github.com/jcoyne)
-
-# v1.6.0 2019-04-17
-
-## Changes since last release
-
-* Deprecation in preparation for LDP to be optional
-* Deprecation in preparation for RSolr to be optional
-* Deprecation in preparation for ActiveRecord to be optional
-* Remove Rails requirement
-* Remove ActiveTriples dependency.
-
-Additional thanks to the following for code review and issue reports leading to
-this release:
-
-[carolyncole](https://github.com/carolyncole)
-[dgcliff](https://github.com/dgcliff)
-[escowles](https://github.com/escowles)
-[no-reply](https://github.com/no-reply)
-
-# v1.5.1 2019-02-08
-
-## Changes since last release
-
-* Namespace shared-spec resources to avoid conflict in apps.
-  [tpendragon](https://github.com/tpendragon)
-
-Additional thanks to the following for code review and issue reports leading to
-this release:
-
-[cjcolvar](https://github.com/cjcolvar)
-[escowles](https://github.com/escowles)
-
-# v1.5.0 2019-02-06
-
-## Changes since last release
-
-* Fix solr casting when an updated_at key isn't present in the solr document.
-  [tpendragon](https://github.com/tpendragon)
-* Add missing query service requirement to persister shared specs
-  [cjcolvar](https://github.com/cjcolvar)
-* Provide a warning when postgres adapter overwrites an ID, deprecate this
-  behavior so it will throw an exception in the future.
-  [cam156](https://github.com/cam156)
-  [hackmastera](https://github.com/hackmastera)
-  [tpendragon](https://github.com/tpendragon)
-* Add support for passing just an ID to find_inverse_references_by
-  [cam156](https://github.com/cam156)
-  [hackmastera](https://github.com/hackmastera)
-* Fix memory adapter raising an exception in find_by_alternate_identifier when
-  there are resources without the alternate_identifier attribute.
-  [jeremyf](https://github.com/jeremyf)
-* Provide a warning when using the postgres adapter without manually providing
-  the pg gem, so it can be an optional dependency in 2.0.0.
-  [hackmastera](https://github.com/hackmastera)
-* Provide guidance in specs on how to define alternate_ids
-  [cjcolvar](https://github.com/cjcolvar)
-* Upload files to Fedora using form/multipart.
-  [tpendragon](https://github.com/tpendragon)
-* Improve CompositePersister documentation.
-  [tpendragon](https://github.com/tpendragon)
-* Add a Valkyrie::Types::Params::ID type which handles when an HTML form passes
-  an empty string value.
-  [tpendragon](https://github.com/tpendragon)
-* Deprecate .member on Valkyrie::Types::Array & Set
-  [tpendragon](https://github.com/tpendragon)
-* Fix updated_at not being set correctly for the Solr adapter, fix shared specs.
-  [tpendragon](https://github.com/tpendragon)
-
-Additional thanks to the following for code review and issue reports leading to
-this release:
-
-[awead](https://github.com/awead)
-[escowles](https://github.com/escowles)
-[kelynch](https://github.com/kelynch)
-[mbklein](https://github.com/mbklein)
-[mjgiarlo](https://github.com/mjgiarlo)
-[no-reply](https://github.com/no-reply)
-[revgum](https://github.com/revgum)
-
-# v1.5.0 RC2 2019-02-01
-
-## Changes since last release
-
-* Fix solr casting when an updated_at key isn't present in the solr document.
-  [tpendragon](https://github.com/tpendragon)
-
-Additional thanks to the following for code review:
-
-[mjgiarlo](https://github.com/mjgiarlo)
-
-# v1.5.0 RC1 2019-02-01
-
-## Changes since last release
-
-* Add missing query service requirement to persister shared specs
-  [cjcolvar](https://github.com/cjcolvar)
-* Provide a warning when postgres adapter overwrites an ID, deprecate this
-  behavior so it will throw an exception in the future.
-  [cam156](https://github.com/cam156)
-  [hackmastera](https://github.com/hackmastera)
-  [tpendragon](https://github.com/tpendragon)
-* Add support for passing just an ID to find_inverse_references_by
-  [cam156](https://github.com/cam156)
-  [hackmastera](https://github.com/hackmastera)
-* Fix memory adapter raising an exception in find_by_alternate_identifier when
-  there are resources without the alternate_identifier attribute.
-  [jeremyf](https://github.com/jeremyf)
-* Provide a warning when using the postgres adapter without manually providing
-  the pg gem, so it can be an optional dependency in 2.0.0.
-  [hackmastera](https://github.com/hackmastera)
-* Provide guidance in specs on how to define alternate_ids
-  [cjcolvar](https://github.com/cjcolvar)
-* Upload files to Fedora using form/multipart.
-  [tpendragon](https://github.com/tpendragon)
-* Improve CompositePersister documentation.
-  [tpendragon](https://github.com/tpendragon)
-* Add a Valkyrie::Types::Params::ID type which handles when an HTML form passes
-  an empty string value.
-  [tpendragon](https://github.com/tpendragon)
-* Deprecate .member on Valkyrie::Types::Array & Set
-  [tpendragon](https://github.com/tpendragon)
-* Fix updated_at not being set correctly for the Solr adapter, fix shared specs.
-  [tpendragon](https://github.com/tpendragon)
-
-Additional thanks to the following for code review and issue reports leading to
-this release:
-
-[awead](https://github.com/awead)
-[escowles](https://github.com/escowles)
-[kelynch](https://github.com/kelynch)
-[mbklein](https://github.com/mbklein)
-[no-reply](https://github.com/no-reply)
-[revgum](https://github.com/revgum)
-
-# v1.4.0 2019-01-08
+# v1.4.0 2018-01-08
 
 ## Changes since last release.
 

data/README.md

@@ -4,29 +4,22 @@ Valkyrie is a gem for enabling multiple backends for storage of files and metada
 
 ![Valkyrie Logo](valkyrie_logo.png)
 
-Code: [![Version](https://badge.fury.io/rb/valkyrie.png)](http://badge.fury.io/rb/valkyrie)
-[![Build Status](https://circleci.com/gh/samvera/valkyrie.svg?style=svg)](https://circleci.com/gh/samvera/valkyrie)
-![Coverage Status](https://img.shields.io/badge/Coverage-100-brightgreen.svg)
-
-Docs: [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
-[![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
-[![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/gems/valkyrie)
-
-Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
+[![CircleCI](https://circleci.com/gh/samvera-labs/valkyrie.svg?style=svg)](https://circleci.com/gh/samvera-labs/valkyrie)
+[![Coverage Status](https://coveralls.io/repos/github/samvera-labs/valkyrie/badge.svg?branch=master)](https://coveralls.io/github/samvera-labs/valkyrie?branch=master)
+[![Stories in Ready](https://badge.waffle.io/samvera-labs/valkyrie.png?label=ready&title=Ready)](https://waffle.io/samvera-labs/valkyrie)
+[![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/github/samvera-labs/valkyrie)
 
 ## Primary Contacts
 
 ### Product Owner
-[Katherine Lynch](https://github.com/kelynch)
 
-### Technical Lead
-[Trey Pendragon](https://github.com/tpendragon)
+[Carolyn Cole](https://github.com/cam156)
 
-## Help
+### Technical Lead
 
-The Samvera community is here to help. Please see our [support guide](./SUPPORT.md).
+[Trey Pendragon](https://github.com/tpendragon)
 
-## Getting Started
+## Installation
 
 Add this line to your application's Gemfile:
 
@@ -44,6 +37,7 @@ Valkyrie is configured in two places: an initializer that registers the persiste
 configuration file that sets which options are used by default in which environments.
 
 ### Sample initializer: `config/initializers/valkyrie.rb`:
+
 Here is a sample initializer that registers a couple adapters and storage adapters, in each case linking an
 instance with a short name that can be used to refer to it in your application:
 
@@ -87,8 +81,7 @@ The initializer registers two `Valkyrie::MetadataAdapter` instances for storing
 
 Other adapter options include `Valkyrie::Persistence::BufferedPersister` for buffering in memory before bulk
 updating another persister, `Valkyrie::Persistence::CompositePersister` for storing in more than one adapter
-at once, `Valkyrie::Persistence::Solr` for storing in Solr, and `Valkyrie::Persistence::Fedora` for storing
-in Fedora.
+at once, `Valkyrie::Persistence::Solr` for storing in Solr, and `Valkyrie::Persistence::Fedora` for storing in Fedora.
 
 The initializer also registers three `Valkyrie::StorageAdapter` instances for storing files:
 * `:disk` which stores files on disk
@@ -96,17 +89,8 @@ The initializer also registers three `Valkyrie::StorageAdapter` instances for st
 * `:memory` which stores files in an in-memory cache (again, not persistent, so this is only appropriate for
   testing)
 
-### Sample configuration with custom `Valkyrie.config.resource_class_resolver`:
-```
-require 'valkyrie'
-Rails.application.config.to_prepare do
-  Valkyrie.config.resource_class_resolver = lambda do |resource_klass_name|
-    # Do complicated lookup based on the string
-  end
-end
-```
-
 ### Sample configuration: `config/valkyrie.yml`:
+
 A sample configuration file that configures your application to use different adapters:
 
 ```
@@ -129,12 +113,26 @@ For each environment, you must set two values:
 
 The values are the short names used in your initializer.
 
-Further details can be found on the [Persistence Wiki
-page](https://github.com/samvera/valkyrie/wiki/Persistence).
+Further details can be found on the [the Wiki](https://github.com/samvera-labs/valkyrie/wiki/Persistence).
 
 ## Usage
 
+### The Public API
+
+Valkyrie's public API is defined by the shared specs that are used to test each of its core classes.
+This include change sets, resources, persisters, adapters, and queries. When creating your own kinds of
+these kinds of classes, you should use these shared specs to test your classes for conformance to
+Valkyrie's API.
+
+When breaking changes are introduced, necessitating a major version change, the shared specs will reflect
+this. When new features are added and a minor version is released there will be no change to the existing shared
+specs, but there may be new ones. These new shared specs will fail in your
+application if you have custom adapters, but your application will still work.
+
+Using the shared specs in your own models is described in more [detail](https://github.com/samvera-labs/valkyrie/wiki/Shared-Specs).
+
 ### Define a Custom Work
+
 Define a custom work class:
 
 ```
@@ -153,8 +151,7 @@ order of multiple values.
 attribute :authors, Valkyrie::Types::Array.meta(ordered: true)
 ```
 
-Defining resource attributes is explained in greater detail on the [Using Types Wiki
-page](https://github.com/samvera/valkyrie/wiki/Using-Types).
+Defining resource attributes is explained in greater detail within the [Wiki](https://github.com/samvera-labs/valkyrie/wiki/Using-Types).
 
 #### Work Types Generator
 
@@ -172,6 +169,7 @@ rails generate valkyrie:resource Foo/Bar title member_ids:array
 ```
 
 ### Read and Write Data
+
 ```
 # initialize a metadata adapter
 adapter = Valkyrie::MetadataAdapter.find(:postgres)
@@ -190,64 +188,44 @@ objects = adapter.query_service.find_all
 Valkyrie.config.metadata_adapter.query_service.find_all_of_model(model: MyModel)
 ```
 
-The Wiki documents the usage of [Queries](https://github.com/samvera/valkyrie/wiki/Queries),
-[Persistence](https://github.com/samvera/valkyrie/wiki/Persistence), and
-[ChangeSets and Dirty Tracking](https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking).
-
-### Concurrency Support
-A Valkyrie repository may have concurrent updates, for example, from a load-balanced Rails application, or
-from multiple [Sidekiq](https://github.com/mperham/sidekiq) background workers).  In order to prevent multiple
-simultaneous updates applied to the same resource from losing or corrupting data, Valkyrie supports optimistic
-locking.  How to use optimistic locking with Valkyrie is documented on the [Optimistic Locking Wiki
-page](https://github.com/samvera/valkyrie/wiki/Optimistic-Locking).
-
-### The Public API
-Valkyrie's public API is defined by the shared specs that are used to test each of its core classes.
-This include change sets, resources, persisters, adapters, and queries. When creating your own kinds of
-these kinds of classes, you should use these shared specs to test your classes for conformance to
-Valkyrie's API.
+The usage of `ChangeSets` in writing data are further documented [here](https://github.com/samvera-labs/valkyrie/wiki/ChangeSets-and-Dirty-Tracking).
 
-When breaking changes are introduced, necessitating a major version change, the shared specs will reflect
-this. When new features are added and a minor version is released there will be no change to the existing
-shared specs, but there may be new ones. These new shared specs will fail in your application if you have
-custom adapters, but your application will still work.
+### Concurrency Support (Optimistic Locking)
+By default, it is assumed that a Valkyrie repository implementation shall use a solution supporting concurrent updates for resources (multiple resources can be updated simultaneously using a Gem such as [Sidekiq](https://github.com/mperham/sidekiq)).  In order to handle the possibility of multiple updates applied to the same resource corrupting data, Valkyrie supports optimistic locking.  For further details, please reference the [overview of optimistic locking for Valkyrie resources](https://github.com/samvera-labs/valkyrie/wiki/Optimistic-Locking).
 
-Using the shared specs in your own models is described in more detail on the [Shared Specs Wiki
-page](https://github.com/samvera/valkyrie/wiki/Shared-Specs).
+## Installing a Development environment
 
-### Fedora 5 Compatibility
-When configuring your adapter, include the `fedora_version` parameter in your metadata or storage adapter
-config.  If Fedora requires auth, you can also include that in the URL, e.g.:
+### Without Docker
 
-   ```
-   Valkyrie::Storage::Fedora.new(
-     connection: Ldp::Client.new("http://fedoraAdmin:fedoraAdmin@localhost:8988/rest"),
-     fedora_version: 5
-   )
-   ```
+#### External Requirements
+* PostgreSQL with the uuid-ossp extension.
+  * Note: Enabling uuid-ossp requires database superuser privileges.
+    * From `psql`: `alter user [username] with superuser;`
 
-## Installing a Development environment
+#### To run the test suite
+1. Start Solr and Fedora servers for testing with `rake server:test`
+1. Run `rake db:create` (First time only)
+1. Run `rake db:migrate`
 
 ### With Docker
-The development and test stacks use fully contained virtual volumes and bind all services to different ports,
-so they can be running at the same time without issue.
 
 #### External Requirements
 * [Docker](https://store.docker.com/search?offering=community&type=edition) version >= 17.09.0
-
+*
 ### Dependency Setup (Mac OSX)
+
 1. `brew install docker`
 1. `brew install docker-machine`
 1. `brew install docker-compose`
 
 ### Starting Docker (Mac OSX)
+
 1. `docker-machine create default`
 1. `docker-machine start default`
 1. `eval "$(docker-machine env)"`
 
 #### Starting the development mode dependencies
-1. Start Solr, Fedora, and PostgreSQL with `rake docker:dev:daemon` (or `rake docker:dev:up` in a separate
-   shell to run them in the foreground)
+1. Start Solr, Fedora, and PostgreSQL with `rake docker:dev:daemon` (or `rake docker:dev:up` in a separate shell to run them in the foreground)
 1. Run `rake db:create db:migrate` to initialize the database
 1. Develop!
 1. Run `rake docker:dev:down` to stop the server stack
@@ -257,32 +235,32 @@ so they can be running at the same time without issue.
 1. `rake docker:spec`
 
 #### To run the test suite manually
-1. Start Solr, Fedora, and PostgreSQL with `rake docker:test:daemon` (or `rake docker:test:up` in a separate
-   shell to run them in the foreground)
+1. Start Solr, Fedora, and PostgreSQL with `rake docker:test:daemon` (or `rake docker:test:up` in a separate shell to run them in the foreground)
 1. Run `rake db:create db:migrate` to initialize the database
 1. Run the gem's RSpec test suite with `rspec spec` or `rake`
 1. Run `rake docker:test:down` to stop the server stack
    * The test stack cleans up after itself on exit.
 
-### Without Docker
+## Fedora 5 Compatibility
+When configuring your adapter, include the `fedora_version` parameter in your metadata or storage adapter config.  If Fedora requires auth, you can also include that in the URL, e.g.:
+   ```
+   Valkyrie::Storage::Fedora.new(connection: Ldp::Client.new("http://fedoraAdmin:fedoraAdmin@localhost:8988/rest"), fedora_version: 5)
+   ```
 
-#### External Requirements
-* PostgreSQL with the uuid-ossp extension.
-  * Note: Enabling uuid-ossp requires database superuser privileges.
-    * From `psql`: `alter user [username] with superuser;`
+The development and test stacks use fully contained virtual volumes and bind all services to different ports, so they can be running at the same time without issue.
 
-#### To run the test suite
-1. Start Solr and Fedora servers for testing with `rake server:test`
-1. Run `rake db:create` (First time only)
-1. Run `rake db:migrate`
+## Get Help
+
+If you have any questions regarding Valkyrie you can send a message to [the
+Samvera community tech list](mailto:samvera-tech@googlegroups.com) or the `#valkyrie`
+channel in the [Samvera community Slack
+team](https://wiki.duraspace.org/pages/viewpage.action?pageId=87460391#Getintouch!-Slack).
 
-## Acknowledgments
+## License
 
-This software has been developed by and is brought to you by the Samvera community.  Learn more at the
-[Samvera website](http://samvera.org/).
+Valkyrie is available under [the Apache 2.0 license](../LICENSE).
 
-![Samvera Logo](https://wiki.duraspace.org/download/thumbnails/87459292/samvera-fall-font2-200w.png?version=1&modificationDate=1498550535816&api=v2)
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/samvera/valkyrie/.
+Bug reports and pull requests are welcome on GitHub at https://github.com/samvera-labs/valkyrie/.