valkyrie 2.1.0 → 3.0.0.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67949cb5bed2cbcf96fa0919446f7e94288874371cca3f706fed156775b3c63f
-  data.tar.gz: febfd165c53533252232090bd427fb5f970b85053a314ff991f15d851bda078a
+  metadata.gz: 240eb74a4be15202ae2036ac9a0067b1aadc23e65ad583638b6cd2874540a845
+  data.tar.gz: 65568d10c48dcadbee70bff7c23360a6e0b149f874b5ebe493b5770afb6e4362
 SHA512:
-  metadata.gz: ba0e9e518bb437c93c1e27a21c851af5eaea423cbc863b7f68b555017a98a663ead92ea51bfcb5edcf5975b013b95f2179a5805aca9f988e269ff0beef85686a
-  data.tar.gz: ae2a939e6ab89a5e704a2a8234a7addc93d1f946a260aa9860d0beab87ef8eeb66d6d789a06e3fe40c2abd8d92f2ec25edd7f9889c4f23cdc8ea213cf29d1a4c
+  metadata.gz: 29b4ebfb067823191dfb2ca74151765ad8157f2c4b7b89cbecaf882e8e6f32eded31fdfb326ca198192e50574a562f8582205bab921d248707f2993b31960528
+  data.tar.gz: 1fc174038d3baac66d35e431211ed83e38d2531395f86ecfeee106a612631d42a1f2fa11fe55a561617d3a23561763707100c701a73a06147db11bb073a60636

data/.circleci/config.yml

@@ -2,7 +2,6 @@
 version: 2.1
 jobs:
   build:
-    machine: true
     parameters:
       gemfile:
         description: "Gemfile to run"
@@ -10,38 +9,63 @@ jobs:
         type: "string"
       ruby:
         description: "Ruby version"
-        default: "2.6.3"
+        default: "2.6.5"
         type: "string"
+    docker:
+      - image: circleci/ruby:<< parameters.ruby >>-node-browsers
+        environment:
+          RAILS_ENV: test
+      - image: postgres:10.6-alpine
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: Valkyrie_gem_test
+          POSTGRES_HOST_AUTH_METHOD: trust
+      - image: samvera/fcrepo4:4.7.5
+        environment:
+          CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
+          JAVA_OPTIONS: "-Djetty.http.port=8988"
+      - image: samvera/fcrepo4:5.1.0
+        environment:
+          CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
+          JAVA_OPTIONS: "-Djetty.http.port=8998 -Dfcrepo.dynamic.jms.port=61618 -Dfcrepo.dynamic.stomp.port=61614"
+      - image: fcrepo/fcrepo:6.0.0
+        environment:
+          CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+          JAVA_OPTS: "-Djetty.http.port=8978 -Dfcrepo.dynamic.jms.port=61619 -Dfcrepo.dynamic.stomp.port=61615 -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+      - image: solr:7.7-alpine
+        command: bin/solr -cloud -noprompt -f -p 8994
     environment:
       BUNDLE_GEMFILE: << parameters.gemfile >>
+      POSTGRES_PORT: 5432
+      FEDORA_6_PORT: 8080
     steps:
       - checkout
+
       - run:
-          name: Set ruby version to << parameters.ruby >>
+          name: Check for 'master' branch
           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
+              git fetch --all --quiet --prune --prune-tags
+              if [[ -n "$(git branch --all --list master */master)" ]]; then
+                  echo "A branch named 'master' was found. Please remove it."
+                  echo "$(git branch --all --list master */master)"
+              fi
+              [[ -z "$(git branch --all --list master */master)" ]]
       - 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
+          name: Wait for solr
+          command: dockerize -wait tcp://localhost:8994 -timeout 1m
       - run:
-          name: Update bundler
-          command: gem install bundler -v 1.17.2
+          name: Load config into solr
+          command: |
+            cd solr/config
+            zip -1 -r solr_config.zip ./*
+            curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://localhost:8994/solr/admin/configs?action=UPLOAD&name=valkyrie"
+            curl -H 'Content-type: application/json' http://localhost:8994/api/collections/ -d '{create: {name: valkyrie-core-test, config: valkyrie, numShards: 1}}'
+      # Install Bundler
+      - run: gem install bundler -v '~> 2.0'
       - restore_cache:
          keys:
            - bundle-{{ checksum "<< parameters.gemfile >>" }}-{{ checksum "valkyrie.gemspec" }}-<< parameters.ruby >>-6
-      - run: sudo apt-get update && sudo apt-get install -y libpq-dev
+      - run: sudo apt update -y && sudo apt-get install -y libpq-dev lsof
       - run:
           name: Set BUNDLE_GEMFILE
           command: |
@@ -57,9 +81,12 @@ jobs:
       - run:
           name: Run Rubocop
           command: bundle exec rake rubocop
+      - run:
+          name: Set up database
+          command: bundle exec rake db:migrate
       - run:
           name: Run Specs
-          command: bundle exec rake docker:spec
+          command: bundle exec rspec spec
       - store_artifacts:
           path: coverage
           destination: coverage
@@ -69,20 +96,24 @@ workflows:
     jobs:
       - build:
           gemfile: "gemfiles/activerecord_6_0.gemfile"
-          ruby: 2.6.3
+          ruby: 2.7.0
+          name: "Ruby2-7_Rails6-0"
+      - build:
+          gemfile: "gemfiles/activerecord_6_0.gemfile"
+          ruby: 2.6.5
           name: "Ruby2-6_Rails6-0"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.6.3
-          name: "Ruby2-6_Rails5-2"
+          ruby: 2.7.0
+          name: "Ruby2-7_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.5.5
-          name: "Ruby2-5_Rails5-2"
+          ruby: 2.6.5
+          name: "Ruby2-6_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.4.6
-          name: "Ruby2-4_Rails5-2"
+          ruby: 2.5.7
+          name: "Ruby2-5_Rails5-2"
   nightly:
     triggers:
       - schedule:
@@ -94,17 +125,21 @@ workflows:
     jobs:
       - build:
           gemfile: "gemfiles/activerecord_6_0.gemfile"
-          ruby: 2.6.3
+          ruby: 2.7.0
+          name: "Ruby2-7_Rails6-0"
+      - build:
+          gemfile: "gemfiles/activerecord_6_0.gemfile"
+          ruby: 2.6.5
           name: "Ruby2-6_Rails6-0"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.6.3
-          name: "Ruby2-6_Rails5-2"
+          ruby: 2.7.0
+          name: "Ruby2-7_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.5.5
-          name: "Ruby2-5_Rails5-2"
+          ruby: 2.6.5
+          name: "Ruby2-6_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.4.6
-          name: "Ruby2-4_Rails5-2"
+          ruby: 2.5.7
+          name: "Ruby2-5_Rails5-2"

data/.lando.yml

@@ -0,0 +1,58 @@
+name: valkyrie
+app_mount: false
+services:
+  valkyrie_test_solr_7:
+    app_mount: false
+    type: solr:7
+    portforward: 8994
+    core: valkyrie-core-test
+    config:
+      dir: solr/config
+  valkyrie_database:
+    app_mount: false
+    type: postgres:10
+    portforward: 5433
+  valkyrie_fedora_4:
+    type: compose
+    app_mount: false
+    volumes:
+      fedora4:
+    services:
+      image: samvera/fcrepo4:4.7.5
+      command: /fedora-entrypoint.sh
+      volumes:
+      - fedora4:/data
+      ports:
+      - 8988:8080
+    portforward: true
+  valkyrie_fedora_5:
+    type: compose
+    app_mount: false
+    volumes:
+      fedora5:
+    services:
+      image: samvera/fcrepo4:5.1.0
+      command: /fedora-entrypoint.sh
+      volumes:
+      - fedora5:/data
+      ports:
+      - 8998:8080
+    portforward: true
+  valkyrie_fedora_6:
+    type: compose
+    app_mount: false
+    volumes:
+      fedora6:
+    services:
+      image: fcrepo/fcrepo:6.0.0
+      command:
+        - "catalina.sh"
+        - "run"
+      volumes:
+      - fedora6:/data
+      ports:
+      - 8978:8080
+      environment:
+        CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+        JAVA_OPTS: "-Dfcrepo.dynamic.jms.port=61619 -Dfcrepo.dynamic.stomp.port=61615 -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+    portforward: true

data/.rubocop.yml

@@ -4,7 +4,6 @@ inherit_gem:
   bixby: bixby_default.yml
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
   Exclude:
     - 'bin/*'
     - 'db/schema.rb'
@@ -26,6 +25,10 @@ RSpec/MultipleExpectations:
   Enabled: false
 Rails/TimeZone:
   Enabled: false
+Rails/RakeEnvironment:
+  Enabled: false
+Rails/ApplicationRecord:
+  Enabled: false
 Naming/PredicateName:
   Exclude:
     - "lib/valkyrie/resource.rb"
@@ -36,3 +39,10 @@ Naming/FileName:
   Exclude:
     - 'Appraisals'
     - 'Gemfile'
+Metrics/MethodLength:
+  Exclude:
+    - 'lib/valkyrie/persistence/postgres/persister.rb'
+    - 'lib/valkyrie/persistence/fedora/persister.rb'
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'lib/valkyrie/persistence/postgres/persister.rb'

data/.tool-versions

@@ -1 +1 @@
-ruby 2.5.1
+ruby 2.6.6

data/CHANGELOG.md

@@ -1,3 +1,84 @@
+# v3.0.0.beta1 2021-10-18
+
+## Changes since last release
+
+* More informative NoMethodError for missing custom queries.
+  [no-reply](https://github.com/no-reply)
+* Persisters error if you save something which existed at query time, but has
+  since been deleted.
+* Shared write-only persisters.
+* Solr ModelConverter performance.
+* Don't hold open a file handle from StorageAdapter#upload/find_by
+* Files can be #close'd.
+* Remove Draper
+* Remove deprecated string equality function.
+* Remove deprecated BlacklistedValue.
+* Allow reform upgrade to 2.6.
+* Don't require a specific error message in shared specs
+  [tpendragon](https://github.com/tpendragon)
+
+Additional thanks to the following for code review and issue reports leading to
+this release:
+
+[hackartisan](https://github.com/hackartisan)
+[eliotjordan](https://github.com/eliotjordan)
+
+
+# v2.2.0 2021-05-06
+
+## Changes since last release
+
+* Add support for Fedora 6.
+  [tpendragon](https://github.com/tpendragon)
+* Deprecate pcdmuse:PreservationMasterFile in favor of pcdmuse:PreservationFile
+  [escowles](https://github.com/escowles)
+* Improve spec docs for resource.rb
+  [dchandekstark](https://github.com/dchandekstark)
+* Memoize resource in Solr queries to reduce Solr calls.
+  [dchandekstark](https://github.com/dchandekstark)
+
+# v2.1.2 2021-04-19
+
+## Changes since last release
+
+* Tighten reform dependency
+  [tpendragon](https://github.com/tpendragon)
+* Loosen RDF Dependency
+  [no-reply](https://github.com/no-reply)
+* Update development ruby version in .tool-versions
+  [hackartisan](https://github.com/hackartisan)
+* Use Lando for development
+  [tpendragon](https://github.com/tpendragon)
+* Deprecate Blacklist in favor of Denylist.
+  [jeremyf](https://github.com/jeremyf)
+* Make DateTime handling in Fedora/Solr persisters consistent with others.
+  [hcayless](https://github.com/hcayless)
+* Add open-ended Rake support.
+  [no-reply](https://github.com/no-reply)
+
+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)
+[jeremyf](https://github.com/jeremyf)
+
+# v2.1.1 2020-03-12
+
+## Changes since last release
+
+* Add Ruby 2.7 support.
+  [tpendragon](https://github.com/tpendragon)
+* Make ID & String equality symmetrical
+  [no-reply](https://github.com/no-reply)
+
+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)
+[jeremyf](https://github.com/jeremyf)
+
 # v2.1.0 2020-01-09
 
 ## Changes since last release
@@ -5,9 +86,9 @@
 * Use `::` prefixed names for `JSON::LD` references.
   [no-reply](https://github.com/no-reply)
 * Use SVG instead of PNG for version badge.
-  [hackmastera](https://github.com/hackmastera)
+  [hackartisan](https://github.com/hackartisan)
 * Fix Rubocop for latest Bixby.
-  [hackmastera](https://github.com/hackmastera)
+  [hackartisan](https://github.com/hackartisan)
 * Valkyrie IDs equal string equivalent of ID to String with config
   [jlevnhv](https://github.com/jlevnhv)
 * Add optional model parameter to find_inverse_references_by and
@@ -152,7 +233,7 @@ involved for their contributions in the last year:
 [cjcolvar](https://github.com/cjcolvar)
 [dgcliff](https://github.com/dgcliff)
 [escowles](https://github.com/escowles)
-[hackmastera](https://github.com/hackmastera)
+[hackartisan](https://github.com/hackartisan)
 [jeremyf](https://github.com/jeremyf)
 [jrgriffiniii](https://github.com/jrgriffiniii)
 [kelynch](https://github.com/kelynch)
@@ -233,17 +314,17 @@ this release:
 * 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)
+  [hackartisan](https://github.com/hackartisan)
   [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)
+  [hackartisan](https://github.com/hackartisan)
 * 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)
+  [hackartisan](https://github.com/hackartisan)
 * Provide guidance in specs on how to define alternate_ids
   [cjcolvar](https://github.com/cjcolvar)
 * Upload files to Fedora using form/multipart.
@@ -289,17 +370,17 @@ Additional thanks to the following for code review:
 * 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)
+  [hackartisan](https://github.com/hackartisan)
   [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)
+  [hackartisan](https://github.com/hackartisan)
 * 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)
+  [hackartisan](https://github.com/hackartisan)
 * Provide guidance in specs on how to define alternate_ids
   [cjcolvar](https://github.com/cjcolvar)
 * Upload files to Fedora using form/multipart.
@@ -350,7 +431,7 @@ this release:
 ## Changes since last release
 
 * Fix solr persister to pass through exceptions on timeout
-  [hackmastera](https://github.com/hackmastera)
+  [hackartisan](https://github.com/hackartisan)
 * Fix generated specs to work with shared_specs expectation
   [revgum](https://github.com/revgum)
 
@@ -397,7 +478,7 @@ following participants who made it happen:
 * [cam156](https://github.com/cam156)
 * [DanCoughlin](https://github.com/DanCoughlin)
 * [escowles](https://github.com/escowles)
-* [hackmastera](https://github.com/hackmastera)
+* [hackartisan](https://github.com/hackartisan)
 * [jrgriffiniii](https://github.com/jrgriffiniii)
 * [mtribone](https://github.com/mtribone)
 * [tpendragon](https://github.com/tpendragon)
@@ -414,7 +495,7 @@ following participants who made it happen:
 ## Changes since last release
 
 * Loosened ActiveRecord restriction to allow upgrading pg gem to 1.0.
-    [hackmastera](https://github.com/hackmastera)
+    [hackartisan](https://github.com/hackartisan)
 
 # v1.1.0 2018-05-08
 
@@ -493,7 +574,7 @@ Initial Release
 * [dlpierce](https://github.com/dlpierce)
 * [escowles](https://github.com/escowles)
 * [geekscruff](https://github.com/geekscruff)
-* [hackmastera](https://github.com/hackmastera)
+* [hackartisan](https://github.com/hackartisan)
 * [jcoyne](https://github.com/jcoyne)
 * [jeremyf](https://github.com/jeremyf)
 * [jgondron](https://github.com/jgondron)

data/CONTRIBUTING.md

@@ -22,6 +22,28 @@ https://wiki.duraspace.org/display/samvera/Samvera+Community+Intellectual+Proper
 
 You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
 
+## Language
+The language we use matters.  Today, tomorrow, and for years to come
+people will read the code we write.  They will judge us for our
+design, logic, and the words we use to describe the system.
+Our words should be accessible.  Favor descriptive words that give
+meaning while avoiding reinforcing systemic inequities.  For example,
+in the Samvera community, we should favor using allowed\_list instead
+of whitelist, denied\_list instead of blacklist, or source/copy
+instead of master/slave.
+We're going to get it wrong, but this is a call to keep working to
+make it right.  View our code and the words we choose as a chance to
+have a conversation. A chance to grow an understanding of the systems
+we develop as well as the systems in which we live.
+See [“Blacklists” and “whitelists”: a salutary warning concerning the
+prevalence of racist language in discussions of predatory
+publishing](https://www.ncbi.nlm.nih.gov/pmc/articles/PMC6148600/) for
+further details.
+
+If you're working on PR for this project, create a feature branch off of `main`.
+
+Please ***do not*** create a branch called `master` for this repository or as part of your pull request; the branch will either need to be removed or renamed before it can be considered for inclusion in the code base and history of our repositories.
+
 ## Contribution Tasks
 
 * Reporting Issues
@@ -45,10 +67,10 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
 * Fork the repository on GitHub
 * Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
-  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
-  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
-  * Please avoid working directly on the `master` branch.
+  * This is usually the main branch.
+  * To quickly create a topic branch based on main; `git branch fix/main/my_contribution main`
+  * Then checkout the new branch with `git checkout fix/main/my_contribution`.
+  * Please avoid working directly on the `main` branch.
   * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
 * Make sure you have added sufficient tests and documentation for your changes.
   * Test functionality with RSpec; Test features / UI with Capybara.
@@ -109,15 +131,15 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 ### Submitting Changes
 
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
-* Make sure your branch is up to date with its parent branch (i.e. master)
-  * `git checkout master`
+* Make sure your branch is up to date with its parent branch (i.e. main)
+  * `git checkout main`
   * `git pull --rebase`
   * `git checkout <your-branch>`
-  * `git rebase master`
+  * `git rebase main`
   * It is a good idea to run your tests again.
 * If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
   * [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
-  * `git rebase --interactive master` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * `git rebase --interactive main` ([See Github help](https://help.github.com/articles/interactive-rebase))
   * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request from your fork to the project.

data/README.md

@@ -239,7 +239,7 @@ custom adapters, but your application will still work.
 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).
 
-### Fedora 5 Compatibility
+### Fedora 5/6 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.:
 
@@ -252,53 +252,25 @@ config.  If Fedora requires auth, you can also include that in the URL, e.g.:
 
 ## Installing a Development environment
 
-### 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. Run `rake db:create db:migrate` to initialize the database
-1. Develop!
-1. Run `rake docker:dev:down` to stop the server stack
-   * Development servers maintain data between runs. To clean them out, run `rake docker:dev:clean`
-
-#### To run the test suite with all dependencies in one go
-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. 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
-
-#### External Requirements
-* PostgreSQL with the uuid-ossp extension.
-  * Note: Enabling uuid-ossp requires database superuser privileges.
-    * From `psql`: `alter user [username] with superuser;`
-
-#### 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`
+For ease of development we use Lando to abstract away some complications of
+using Docker containers for development.
+
+### Running Tests
+
+1. Install the latest released > 3.0 version of Lando from [here](https://github.com/lando/lando/releases).
+2. `bundle install`
+3. `bundle exec rake server:start`
+4. `bundle exec rspec spec`
+
+### Cleaning Data
+
+1. `bundle exec rake server:clean`
+
+### Stopping Servers
+
+1. `bundle exec rake server:stop`
+
+You can also run `lando poweroff` from anywhere.
 
 ## Acknowledgments
 
@@ -310,3 +282,7 @@ This software has been developed by and is brought to you by the Samvera communi
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/samvera/valkyrie/.
+
+If you're working on PR for this project, create a feature branch off of `main`.
+
+This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct) and [language recommendations](https://github.com/samvera/maintenance/blob/master/templates/CONTRIBUTING.md#language).  Please ***do not*** create a branch called `master` for this repository or as part of your pull request; the branch will either need to be removed or renamed before it can be considered for inclusion in the code base and history of this repository.