From cc21297c0b0aa6492428df403a9069d668a11cc8 Mon Sep 17 00:00:00 2001 From: dannylamb Date: Mon, 21 Oct 2019 13:41:07 +0000 Subject: [PATCH] De-CLAWing --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .travis.yml | 4 ++-- CONTRIBUTING.md | 16 ++++++++-------- README.md | 6 +++--- composer.json | 10 ++-------- islandora.module | 2 +- modules/islandora_audio/README.md | 2 +- modules/islandora_image/.travis.yml | 4 ++-- modules/islandora_image/README.md | 2 +- modules/islandora_video/README.md | 2 +- 10 files changed, 22 insertions(+), 28 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 4267260a..a4a0b761 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -34,4 +34,4 @@ Any additional information that you think would be helpful when reviewing this PR. # Interested parties -Tag (@ mention) interested parties or, if unsure, @Islandora-CLAW/committers +Tag (@ mention) interested parties or, if unsure, @Islandora/8-x-committers diff --git a/.travis.yml b/.travis.yml index 685620f9..107d6df1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,12 @@ branches: - /^8.x/ before_install: - - export SCRIPT_DIR=$HOME/CLAW/.scripts + - export SCRIPT_DIR=$HOME/islandora/.scripts - export DRUPAL_DIR=/opt/drupal - export COMPOSER_PATH="/home/travis/.phpenv/versions/$TRAVIS_PHP_VERSION/bin/composer" install: - - git clone https://github.com/Islandora-CLAW/CLAW.git $HOME/CLAW + - git clone https://github.com/Islandora/documentation.git $HOME/islandora - $SCRIPT_DIR/travis_setup_drupal.sh - git -C "$TRAVIS_BUILD_DIR" checkout -b travis-testing - cd $DRUPAL_DIR; diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 269a9be8..bff0569b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,23 +8,23 @@ Please note that this project operates under the [Islandora Community Code of Co ## Workflows -The group meets each Wednesday at 1:00 PM Eastern. Meeting notes and announcements are posted to the [Islandora community list](https://groups.google.com/forum/#!forum/islandora) and the [Islandora developers list](https://groups.google.com/forum/#!forum/islandora-dev). You can view meeting agendas, notes, and call-in information [here](https://github.com/Islandora-CLAW/CLAW/wiki#islandora-claw-tech-calls). Anybody is welcome to join the calls, and add items to the agenda. +The group meets each Wednesday at 1:00 PM Eastern. Meeting notes and announcements are posted to the [Islandora community list](https://groups.google.com/forum/#!forum/islandora) and the [Islandora developers list](https://groups.google.com/forum/#!forum/islandora-dev). You can view meeting agendas, notes, and call-in information [here](https://github.com/Islandora/documentation/wiki#islandora-claw-tech-calls). Anybody is welcome to join the calls, and add items to the agenda. ### Use cases -If you would like to submit a use case to the Islandora 8 project, please submit an issue [here](https://github.com/Islandora-CLAW/CLAW/issues/new) using the [Use Case template](https://github.com/Islandora-CLAW/CLAW/wiki/Use-Case-template), prepending "Use Case:" to the title of the issue. +If you would like to submit a use case to the Islandora 8 project, please submit an issue [here](https://github.com/Islandora/documentation/issues/new) using the [Use Case template](https://github.com/Islandora/documentation/wiki/Use-Case-template), prepending "Use Case:" to the title of the issue. ### Documentation -You can contribute documentation in two different ways. One way is to create an issue [here](https://github.com/Islandora-CLAW/CLAW/issues/new), prepending "Documentation:" to the title of the issue. Another way is by pull request, which is the same process as [Contribute Code](https://github.com/Islandora-CLAW/CLAW/blob/master/CONTRIBUTING.md#contribute-code). All documentation resides in [`docs`](https://github.com/Islandora-CLAW/CLAW/tree/master/docs). +You can contribute documentation in two different ways. One way is to create an issue [here](https://github.com/Islandora/documentation/issues/new), prepending "Documentation:" to the title of the issue. Another way is by pull request, which is the same process as [Contribute Code](https://github.com/Islandora/documentation/blob/master/CONTRIBUTING.md#contribute-code). All documentation resides in [`docs`](https://github.com/Islandora/documentation/tree/master/docs). ### Request a new feature -To request a new feature you should [open an issue in the Islandora 8 repository](https://github.com/Islandora-CLAW/CLAW/issues/new) or create a use case (see the _Use cases_ section above), and summarize the desired functionality. Prepend "Enhancement:" if creating an issue on the project repo, and "Use Case:" if creating a use case. +To request a new feature you should [open an issue in the Islandora 8 repository](https://github.com/Islandora/documentataion/issues/new) or create a use case (see the _Use cases_ section above), and summarize the desired functionality. Prepend "Enhancement:" if creating an issue on the project repo, and "Use Case:" if creating a use case. ### Report a bug -To report a bug you should [open an issue in the Islandora 8 repository](https://github.com/Islandora-CLAW/CLAW/issues/new) that summarizes the bug. Prepend the label "Bug:" to the title of the issue. +To report a bug you should [open an issue in the Islandora 8 repository](https://github.com/Islandora/documentation/issues/new) that summarizes the bug. Prepend the label "Bug:" to the title of the issue. In order to help us understand and fix the bug it would be great if you could provide us with: @@ -44,7 +44,7 @@ Before you set out to contribute code you will need to have completed a [Contrib _If you are interested in contributing code to Islandora but do not know where to begin:_ -In this case you should [browse open issues](https://github.com/Islandora-CLAW/CLAW/issues) and check out [use cases](https://github.com/Islandora-CLAW/CLAW/labels/use%20case). +In this case you should [browse open issues](https://github.com/Islandora/documentation/issues) and check out [use cases](https://github.com/Islandora/documentation/labels/use%20case). If you are contributing Drupal code, it must adhere to [Drupal Coding Standards](https://www.drupal.org/coding-standards); Travis CI will check for this on pull requests. @@ -53,7 +53,7 @@ Contributions to the Islandora codebase should be sent as GitHub pull requests. * For _small patches_, feel free to submit pull requests directly for those patches. * For _larger code contributions_, please use the following process. The idea behind this process is to prevent any wasted work and catch design issues early on. - 1. [Open an issue](https://github.com/Islandora-CLAW/CLAW/issues), prepending "Enhancement:" in the title if a similar issue does not exist already. If a similar issue does exist, then you may consider participating in the work on the existing issue. + 1. [Open an issue](https://github.com/Islandora/documentation/issues), prepending "Enhancement:" in the title if a similar issue does not exist already. If a similar issue does exist, then you may consider participating in the work on the existing issue. 2. Comment on the issue with your plan for implementing the issue. Explain what pieces of the codebase you are going to touch and how everything is going to fit together. 3. Islandora committers will work with you on the design to make sure you are on the right track. 4. Implement your issue, create a pull request (see below), and iterate from there. @@ -64,7 +64,7 @@ Take a look at [Creating a pull request](https://help.github.com/articles/creati 1. [Fork](https://help.github.com/articles/fork-a-repo) this repository to your personal or institutional GitHub account (depending on the CLA you are working under). Be cautious of which branches you work from though (you'll want to base your work off master, or for Drupal modules use the most recent version branch). See [Fork a repo](https://help.github.com/articles/fork-a-repo) for detailed instructions. 2. Commit any changes to your fork. -3. Send a [pull request](https://help.github.com/articles/creating-a-pull-request) using the [pull request template](https://github.com/Islandora-CLAW/CLAW/blob/master/.github/PULL_REQUEST_TEMPLATE.md) to the Islandora GitHub repository that you forked in step 1. If your pull request is related to an existing issue -- for instance, because you reported a [bug/issue](https://github.com/Islandora-CLAW/CLAW/issues) earlier -- prefix the title of your pull request with the corresponding issue number (e.g. `issue-123: ...`). Please also include a reference to the issue in the description of the pull. This can be done by using '#' plus the issue number like so '#123', also try to pick an appropriate name for the branch in which you're issuing the pull request from. +3. Send a [pull request](https://help.github.com/articles/creating-a-pull-request) using the [pull request template](https://github.com/Islandora/documentation/blob/master/.github/PULL_REQUEST_TEMPLATE.md) to the Islandora GitHub repository that you forked in step 1. If your pull request is related to an existing issue -- for instance, because you reported a [bug/issue](https://github.com/Islandora/documentation/issues) earlier -- prefix the title of your pull request with the corresponding issue number (e.g. `issue-123: ...`). Please also include a reference to the issue in the description of the pull. This can be done by using '#' plus the issue number like so '#123', also try to pick an appropriate name for the branch in which you're issuing the pull request from. You may want to read [Syncing a fork](https://help.github.com/articles/syncing-a-fork) for instructions on how to keep your fork up to date with the latest changes of the upstream (official) repository. diff --git a/README.md b/README.md index 950d2493..62ccbf77 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # ![Islandora](https://cloud.githubusercontent.com/assets/2371345/25624809/f95b0972-2f30-11e7-8992-a8f135402cdc.png) Islandora -[![Build Status][1]](https://travis-ci.com/Islandora-CLAW/islandora) +[![Build Status][1]](https://travis-ci.com/Islandora/islandora) [![Contribution Guidelines][2]](./CONTRIBUTING.md) [![LICENSE][3]](./LICENSE) @@ -224,10 +224,10 @@ an Islandora Foundation [Contributor License Agreement][5] or [GPLv2](http://www.gnu.org/licenses/gpl-2.0.txt) -[1]: https://travis-ci.org/Islandora-CLAW/islandora.png?branch=8.x-1.x +[1]: https://travis-ci.org/Islandora/islandora.png?branch=8.x-1.x [2]: http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg [3]: https://img.shields.io/badge/license-GPLv2-blue.svg?style=flat-square -[4]: https://github.com/Islandora-CLAW/CLAW/wiki +[4]: https://github.com/Islandora/documentation/wiki [5]: http://islandora.ca/sites/default/files/islandora_cla.pdf [6]: http://islandora.ca/sites/default/files/islandora_ccla.pdf [7]: http://islandora.ca/resources/contributors diff --git a/composer.json b/composer.json index 41d76a2f..b0ebbf3b 100644 --- a/composer.json +++ b/composer.json @@ -3,10 +3,9 @@ "description": "Core Islandora module", "type": "drupal-module", "keywords": ["Drupal", "Islandora"], - "homepage": "https://github.com/islandora-claw/islandora", + "homepage": "https://github.com/Islandora/islandora", "support": { - "issues": "https://github.com/islandora-claw/CLAW/issues", - "irc": "irc://irc.freenode.net/islandora" + "issues": "https://github.com/Islandora/documentation/issues" }, "repositories": [ { @@ -48,11 +47,6 @@ "name": "Daniel Lamb", "email": "dlamb@islandora.ca", "role": "Maintainer" - }, - { - "name": "Diego Pino", - "email": "dpino@krayon.cl", - "role": "Maintainer" } ] } diff --git a/islandora.module b/islandora.module index 863b8c51..01e01e97 100644 --- a/islandora.module +++ b/islandora.module @@ -56,7 +56,7 @@ function islandora_rdf_namespaces() { 'owl' => 'http://www.w3.org/2002/07/owl#', 'ore' => 'http://www.openarchives.org/ore/terms/', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', - 'islandora' => 'http://islandora.ca/CLAW/', + 'islandora' => 'http://islandora.ca/', 'pcdm' => 'http://pcdm.org/models#', 'use' => 'http://pcdm.org/use#', 'iana' => 'http://www.iana.org/assignments/relation/', diff --git a/modules/islandora_audio/README.md b/modules/islandora_audio/README.md index c725b91d..f60a7f4c 100644 --- a/modules/islandora_audio/README.md +++ b/modules/islandora_audio/README.md @@ -14,7 +14,7 @@ Current maintainers: ## Development -If you would like to contribute, please get involved by attending our weekly [Tech Call](https://github.com/Islandora-CLAW/CLAW/wiki). We love to hear from you! +If you would like to contribute, please get involved by attending our weekly [Tech Call](https://github.com/Islandora/documentation/wiki). We love to hear from you! If you would like to contribute code to the project, you need to be covered by an Islandora Foundation [Contributor License Agreement](http://islandora.ca/sites/default/files/islandora_cla.pdf) or [Corporate Contributor License Agreement](http://islandora.ca/sites/default/files/islandora_ccla.pdf). Please see the [Contributors](http://islandora.ca/resources/contributors) pages on Islandora.ca for more information. diff --git a/modules/islandora_image/.travis.yml b/modules/islandora_image/.travis.yml index 41cf7d9e..d53c2ba8 100644 --- a/modules/islandora_image/.travis.yml +++ b/modules/islandora_image/.travis.yml @@ -13,12 +13,12 @@ branches: - /^8.x/ before_install: - - export SCRIPT_DIR=$HOME/CLAW/.scripts + - export SCRIPT_DIR=$HOME/islandora/.scripts - export DRUPAL_DIR=/opt/drupal - export COMPOSER_PATH="/home/travis/.phpenv/versions/$TRAVIS_PHP_VERSION/bin/composer" install: - - git clone https://github.com/Islandora-CLAW/CLAW.git $HOME/CLAW + - git clone https://github.com/Islandora/documentation.git $HOME/islandora - $SCRIPT_DIR/travis_setup_drupal.sh - git -C "$TRAVIS_BUILD_DIR" checkout -b travis-testing - cd $DRUPAL_DIR; diff --git a/modules/islandora_image/README.md b/modules/islandora_image/README.md index 324ba433..57d871d0 100644 --- a/modules/islandora_image/README.md +++ b/modules/islandora_image/README.md @@ -14,7 +14,7 @@ Current maintainers: ## Development -If you would like to contribute, please get involved by attending our weekly [Tech Call](https://github.com/Islandora-CLAW/CLAW/wiki). We love to hear from you! +If you would like to contribute, please get involved by attending our weekly [Tech Call](https://github.com/Islandora/documentation/wiki). We love to hear from you! If you would like to contribute code to the project, you need to be covered by an Islandora Foundation [Contributor License Agreement](http://islandora.ca/sites/default/files/islandora_cla.pdf) or [Corporate Contributor License Agreement](http://islandora.ca/sites/default/files/islandora_ccla.pdf). Please see the [Contributors](http://islandora.ca/resources/contributors) pages on Islandora.ca for more information. diff --git a/modules/islandora_video/README.md b/modules/islandora_video/README.md index c725b91d..f60a7f4c 100644 --- a/modules/islandora_video/README.md +++ b/modules/islandora_video/README.md @@ -14,7 +14,7 @@ Current maintainers: ## Development -If you would like to contribute, please get involved by attending our weekly [Tech Call](https://github.com/Islandora-CLAW/CLAW/wiki). We love to hear from you! +If you would like to contribute, please get involved by attending our weekly [Tech Call](https://github.com/Islandora/documentation/wiki). We love to hear from you! If you would like to contribute code to the project, you need to be covered by an Islandora Foundation [Contributor License Agreement](http://islandora.ca/sites/default/files/islandora_cla.pdf) or [Corporate Contributor License Agreement](http://islandora.ca/sites/default/files/islandora_ccla.pdf). Please see the [Contributors](http://islandora.ca/resources/contributors) pages on Islandora.ca for more information.