diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index acc03d6d2..ed014f2ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,11 +86,11 @@ jobs: pipenv run pytest -rs -vvv --cov-report=term --cov-report=xml --cov ./pydatalab ./tests - name: Upload coverage to Codecov - if: matrix.python-version == '3.10' && github.repository == 'the-grey-group/datalab' + if: matrix.python-version == '3.10' && github.repository == 'datalab-org/datalab' uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} - slug: the-grey-group/datalab + slug: datalab-org/datalab webapp: name: Test the app build diff --git a/.github/workflows/ci_automerge_dependabot.yml b/.github/workflows/ci_automerge_dependabot.yml deleted file mode 100644 index 0a20ef50a..000000000 --- a/.github/workflows/ci_automerge_dependabot.yml +++ /dev/null @@ -1,30 +0,0 @@ -# Lifted from https://github.com/Materials-Consortia/optimade-python-tools/blob/master/.github/workflows/ci_automerge_dependabot.yml -# This enables a workflow where all incoming dependabot PRs are auto-merged into a auxiliary `dependabot_updates` branch, which can then be -# merged into `main` once the tests pass. The `dependabot_updates` branch must then be reset to the same HEAD as `main` for future updates. - -name: CI - Activate auto-merging for Dependabot PRs and reset the base branch after merge - -on: - pull_request_target: - branches: - - dependabot_updates - -jobs: - update-dependabot-branch: - name: Activate auto-merge into `dependabot_updates` - if: github.repository_owner == 'the-grey-group' && startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]' - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - with: - fetch-depth: 0 - ref: ${{ github.event.pull_request.head.ref }} - - - name: Activate auto-merge - run: | - PR_ID="$(gh api graphql -F owner='{owner}' -F name='{repo}' -f query='query($owner: String!, $name: String!) {repository(owner: $owner, name: $name) {pullRequest(number: ${{ github.event.pull_request.number }}) {id}}}' --jq '.data.repository.pullRequest.id')" - gh api graphql -f pr_id="$PR_ID" -f query='mutation($pr_id: ID!) {enablePullRequestAutoMerge(input:{mergeMethod:SQUASH,pullRequestId:$pr_id }) {pullRequest {number}}}' - env: - GITHUB_TOKEN: ${{ secrets.BOT_PAT }} diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index c1f351c08..db60c8ec0 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -16,7 +16,7 @@ env: jobs: publish: runs-on: ubuntu-latest - if: github.repository == 'the-grey-group/datalab' && startsWith(github.ref, 'refs/tags/v') + if: github.repository == 'datalab-org/datalab' && startsWith(github.ref, 'refs/tags/v') env: PUBLISH_UPDATE_BRANCH: main diff --git a/INSTALL.md b/INSTALL.md index cb9ae496d..f91400b66 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -16,7 +16,7 @@ This repository consists of two components: To run *datalab*, you will need to install the environments for each component. -Firstly, from the desired folder, clone this repository from GitHub to your local machine with `git clone https://github.com/the-grey-group/datalab`. +Firstly, from the desired folder, clone this repository from GitHub to your local machine with `git clone https://github.com/datalab-org/datalab`. ### `pydatalab` server installation diff --git a/README.md b/README.md index 3bc7a164c..8cd007bd0 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@
- - + +
- +
@@ -40,7 +40,7 @@ in the Department of Chemistry at the University of Cambridge.
-
@@ -96,7 +96,7 @@ This software was conceived and developed by: with contributions and testing performed by other members of the Grey Group. -A full list of code contributions can be found on [GitHub](https://github.com/the-grey-group/datalab/graphs/contributors). +A full list of code contributions can be found on [GitHub](https://github.com/datalab-org/datalab/graphs/contributors). ## Contact diff --git a/mkdocs.yml b/mkdocs.yml index 9efe0cfcb..728758310 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -32,15 +32,15 @@ theme: features: - content.code.copy -repo_name: the-grey-group/datalab -repo_url: https://github.com/the-grey-group/datalab +repo_name: datalab-org/datalab +repo_url: https://github.com/datalab-org/datalab docs_dir: "pydatalab/docs" extra: social: - icon: fontawesome/brands/github - link: https://github.com/the-grey-group + link: https://github.com/datalab-org markdown_extensions: - admonition diff --git a/pydatalab/docs/deployment.md b/pydatalab/docs/deployment.md index 4b151a50f..0fcbf8514 100644 --- a/pydatalab/docs/deployment.md +++ b/pydatalab/docs/deployment.md @@ -52,7 +52,7 @@ The following shell snippets will download *datalab* and launch containers on th Clone and enter the repository, if not done already ```shell -git clone git@github.com:the-grey-group/datalab; cd datalab +git clone git@github.com:datalab-org/datalab; cd datalab ``` Build the development containers: @@ -111,7 +111,7 @@ The process may look something like the following: - Add *datalab* as a [Git submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules): ```shell - git submodule add git@github.com:the-grey-group/datalab + git submodule add git@github.com:datalab-org/datalab cd datalab; git checkout v0.4.0 # at this point you can set any default version, or just track the main branch git commit -a -m "Add datalab as submodule" ``` @@ -174,7 +174,7 @@ If not using the above approach, then the process will still be similar. You must somehow download the latest *datalab* changes to your server (ideally with `git`) and then rebuild and relaunch the relevant Docker containers. !!! warning Understand the CHANGELOG before updating - You **should** read the *datalab* CHANGELOG and [release notes](https://github.com/the-grey-group/datalab/releases) before deciding to update. + You **should** read the *datalab* CHANGELOG and [release notes](https://github.com/datalab-org/datalab/releases) before deciding to update. These may contain specific instructions on required migrations or other steps required in the future that are not covered by this current state of the documentation. @@ -216,7 +216,7 @@ In the future, many admin tasks (e.g., updating user info, allowing/blocking use One such `invoke` task implements the ingestion of a [ChemInventory](https://cheminventory.net) chemical inventory into *datalab*. It relies on the Excel export feature of ChemInventory and is achieved with `invoke admin.import-cheminventory `. If a future export is made and reimported, the old entries will be kept and updated, rather than overwritten. -*datalab* currently has no functionality for chemical inventory management itself; if you wish to support importing from another inventory system, please [raise an issue](https://github.com/the-grey-group/datalab/issues/new). +*datalab* currently has no functionality for chemical inventory management itself; if you wish to support importing from another inventory system, please [raise an issue](https://github.com/datalab-org/datalab/issues/new). ### Backups diff --git a/pydatalab/pydatalab/config.py b/pydatalab/pydatalab/config.py index 601bc6f96..40578d3ad 100644 --- a/pydatalab/pydatalab/config.py +++ b/pydatalab/pydatalab/config.py @@ -50,9 +50,9 @@ class DeploymentMetadata(BaseModel): """A model for specifying metadata about a datalab deployment.""" maintainer: Optional[Person] - issue_tracker: Optional[AnyUrl] = Field("https://github.com/the-grey-group/datalab/issues") + issue_tracker: Optional[AnyUrl] = Field("https://github.com/datalab-org/datalab/issues") homepage: Optional[AnyUrl] - source_repository: Optional[AnyUrl] = Field("https://github.com/the-grey-group/datalab") + source_repository: Optional[AnyUrl] = Field("https://github.com/datalab-org/datalab") @validator("maintainer") def strip_fields_from_person(cls, v): diff --git a/webapp/src/views/About.vue b/webapp/src/views/About.vue index ae550b17d..7d9a10f23 100644 --- a/webapp/src/views/About.vue +++ b/webapp/src/views/About.vue @@ -9,8 +9,8 @@

datalab is open source (MIT license) and development occurs on GitHub at -  the-grey-group/datalab datalab-org/datalab with documentation available on