Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
tttc3 authored Apr 21, 2024
2 parents ba87925 + 5d8444b commit 0466b8c
Show file tree
Hide file tree
Showing 131 changed files with 4,127 additions and 4,697 deletions.
25 changes: 15 additions & 10 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
aliases:
- MinRK
github: minrk
num_commits: 15
num_commits: 16
first_commit: 2014-02-13 19:43:59
- name: Matty G
email: meawoppl@gmail.com
Expand Down Expand Up @@ -612,7 +612,7 @@
first_commit: 2015-08-30 06:44:37
- name: Marcel Bargull
email: marcel.bargull@udo.edu
num_commits: 82
num_commits: 85
first_commit: 2016-09-26 11:45:54
github: mbargull
alternate_emails:
Expand Down Expand Up @@ -1202,7 +1202,7 @@
alternate_emails:
- clee@anaconda.com
- name: Ken Odegard
num_commits: 168
num_commits: 178
email: kodegard@anaconda.com
first_commit: 2020-09-08 19:53:41
github: kenodegard
Expand Down Expand Up @@ -1240,7 +1240,7 @@
github: pre-commit-ci[bot]
aliases:
- pre-commit-ci[bot]
num_commits: 61
num_commits: 64
first_commit: 2021-11-20 01:47:17
- name: Jacob Walls
email: jacobtylerwalls@gmail.com
Expand All @@ -1251,7 +1251,7 @@
github: beeankha
alternate_emails:
- beeankha@gmail.com
num_commits: 20
num_commits: 23
first_commit: 2022-01-19 16:40:06
- name: Conda Bot
email: 18747875+conda-bot@users.noreply.github.com
Expand All @@ -1262,7 +1262,7 @@
alternate_emails:
- ad-team+condabot@anaconda.com
- 18747875+conda-bot@users.noreply.github.com
num_commits: 44
num_commits: 96
first_commit: 2022-01-17 18:09:22
- name: Uwe L. Korn
email: xhochy@users.noreply.github.com
Expand All @@ -1271,7 +1271,7 @@
- name: Daniel Holth
email: dholth@anaconda.com
github: dholth
num_commits: 14
num_commits: 15
first_commit: 2022-04-28 05:22:14
- name: Rylan Chord
email: rchord@users.noreply.github.com
Expand All @@ -1281,7 +1281,7 @@
- name: Travis Hathaway
email: travis.j.hathaway@gmail.com
github: travishathaway
num_commits: 6
num_commits: 7
first_commit: 2022-05-12 05:53:02
- name: Kyle Leaders
email: remkade@users.noreply.github.com
Expand All @@ -1305,7 +1305,7 @@
- name: Katherine Kinnaman
email: kkinnaman@anaconda.com
github: kathatherine
num_commits: 2
num_commits: 3
first_commit: 2022-07-07 10:56:31
- name: dependabot[bot]
email: 49699333+dependabot[bot]@users.noreply.github.com
Expand Down Expand Up @@ -1376,7 +1376,7 @@
aliases:
- Ryan
github: ryanskeith
num_commits: 5
num_commits: 6
first_commit: 2023-03-22 03:11:02
- name: Rishabh Singh
email: 67859818+rishabh11336@users.noreply.github.com
Expand Down Expand Up @@ -1434,3 +1434,8 @@
- h-vetinari
num_commits: 1
first_commit: 2023-10-25 09:33:34
- name: Finn Womack
email: flan313@gmail.com
num_commits: 1
first_commit: 2024-02-06 11:43:45
github: finnagin
5 changes: 5 additions & 0 deletions .devcontainer/apt-deps.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
git
less
htop
nano
ssh
38 changes: 38 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// For format details, see https://aka.ms/devcontainer.json
{
"name": "Miniconda (default-channel=defaults)",
"image": "continuumio/miniconda3:latest",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "bash /workspaces/conda-build/.devcontainer/post_create.sh",
// Use 'postStartCommand' to run commands after the container is started.
"postStartCommand": "bash /workspaces/conda-build/.devcontainer/post_start.sh",

// Configure tool-specific properties.
"customizations": {
"vscode": {
"settings": {
"python.defaultInterpreterPath": "/opt/conda/bin/python",
"python.testing.pytestArgs": [
"tests"
],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true
},
"extensions": [
"charliermarsh.ruff",
"eamodio.gitlens",
"ms-toolsai.jupyter"
]
}
}

// Adjust to connect as non-root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root",

}
27 changes: 27 additions & 0 deletions .devcontainer/post_create.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/bash

set -euo pipefail

BASE_CONDA=${BASE_CONDA:-/opt/conda}
SRC_CONDA_BUILD=${SRC_CONDA_BUILD:-/workspaces/conda-build}

if which apt-get > /dev/null; then
HERE=$(dirname $0)
echo "Installing system dependencies"
apt-get update
DEBIAN_FRONTEND=noninteractive xargs -a "$HERE/apt-deps.txt" apt-get install -y
fi

# Clear history to avoid unneeded conflicts
echo "Clearing base history..."
echo '' > "$BASE_CONDA/conda-meta/history"

echo "Installing dev dependencies"
"$BASE_CONDA/bin/conda" install \
-n base \
--yes \
--quiet \
--file "$SRC_CONDA_BUILD/tests/requirements.txt" \
--file "$SRC_CONDA_BUILD/tests/requirements-Linux.txt" \
--file "$SRC_CONDA_BUILD/tests/requirements-ci.txt" \
"conda>=23.7.0"
23 changes: 23 additions & 0 deletions .devcontainer/post_start.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash

# This script assumes we are running in a Miniconda container where:
# - /opt/conda is the Miniconda or Miniforge installation directory
# - https://github.com/conda/conda is mounted at /workspaces/conda
# - https://github.com/conda/conda-libmamba-solver is mounted at
# /workspaces/conda-libmamba-solver
# - https://github.com/mamba-org/mamba is (optionally) mounted at
# /workspaces/mamba

set -euo pipefail

BASE_CONDA=${BASE_CONDA:-/opt/conda}
SRC_CONDA_BUILD=${SRC_CONDA_BUILD:-/workspaces/conda-build}

echo "Installing conda-build in dev mode..."
"$BASE_CONDA/bin/python" -m pip install -e "$SRC_CONDA_BUILD" --no-deps

set -x
conda list -p "$BASE_CONDA"
conda info
conda config --show-sources
set +x
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/0_bug.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Bug Report
description: Create a bug report.
labels:
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/1_feature.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Feature Request
description: Create a feature request.
labels:
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/2_documentation.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Documentation
description: Create a documentation related issue.
labels:
Expand Down
78 changes: 68 additions & 10 deletions .github/ISSUE_TEMPLATE/epic.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Epic
description: A collection of related tickets.
labels:
Expand All @@ -25,23 +24,82 @@ body:
options:
- label: I added a descriptive title
required: true
- label: I searched open reports and couldn't find a duplicate
- label: I searched open issues and couldn't find a duplicate
required: true

- type: textarea
id: summary
id: what
attributes:
label: Summary
label: What?
description: >-
Define the highlevel objectives to be accomplished in this epic. Include the
bigger picture of what is changing and/or the user story for why the
changes are desired/necessary.
What feature or problem will be addressed in this epic?
placeholder: Please describe here.
validations:
required: true

- type: textarea
id: why
attributes:
label: Linked Issues & PRs
description: List all issues related to this epic.
label: Why?
description: >-
Why is the reported issue(s) a problem, or why is the proposed feature needed?
(Research and spike issues can be linked here.)
value: |
- [ ] #
- [ ] <supporting issue from user, research, or spike>
placeholder: Please describe here and/or link to relevant supporting issues.
validations:
required: true

- type: textarea
id: user_impact
attributes:
label: User impact
description: >-
In what specific way(s) will users benefit from this change? (e.g. use cases or performance improvements)
placeholder: Please describe here.
validations:
required: true

- type: textarea
id: goals
attributes:
label: Goals
description: >-
What goal(s) should this epic accomplish?
value: |
- [ ] <goal>
validations:
required: true

- type: textarea
id: tasks
attributes:
label: Tasks
description: >-
What needs to be done to implement this change?
value: |
- [ ] <task or PR>
validations:
required: false

- type: textarea
id: blocked_by
attributes:
label: 'This epic is blocked by:'
description: >-
Epics and issues that block this epic.
value: |
- [ ] <dependency epic or issue>
validations:
required: false

- type: textarea
id: blocks
attributes:
label: 'This epic blocks:'
description: >-
Epics and issues that are blocked by this epic.
value: |
- [ ] <dependency epic or issue>
validations:
required: false
2 changes: 0 additions & 2 deletions ci/github/.condarc → .github/condarc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ auto_update_conda: False
auto_activate_base: True
notify_outdated_conda: False
changeps1: False
pkgs_dirs:
- /usr/share/miniconda/envs/test/pkgs
always_yes: True
local_repodata_ttl: 7200
19 changes: 9 additions & 10 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "pip"
directory: "/docs/"
- package-ecosystem: pip
directory: /docs/
schedule:
interval: "weekly"
interval: weekly
allow:
# Allow only production updates for Sphinx
- dependency-name: "sphinx"
dependency-type: "production"
- dependency-name: sphinx
dependency-type: production
- package-ecosystem: github-actions
directory: /.github/workflows
schedule:
interval: weekly
42 changes: 6 additions & 36 deletions .github/labels.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,9 @@
# Builds
- name: build::review
description: trigger a build for this PR
color: "7B4052"
- name: build::review
description: trigger a build for this PR
color: '#7b4052'

# Tags
- name: tag::noarch
description: related to noarch builds
color: "86C579"
aliases: []

# Deprecated
- name: 3_In_Progress
description: "[deprecated] use milestones/project boards"
color: "888888"
- name: 4_Needs_Review
description: "[deprecated] use milestones/project boards"
color: "888888"
- name: effort-high
description: "[deprecated]"
color: "888888"
- name: effort-low
description: "[deprecated] use good-first-issue"
color: "888888"
- name: effort-medium
description: "[deprecated]"
color: "888888"
- name: in_progress
description: "[deprecated] use milestones/project boards"
color: "888888"
- name: knowledge-high
description: "[deprecated]"
color: "888888"
- name: knowledge-low
description: "[deprecated] use good-first-issue"
color: "888888"
- name: knowledge-medium
description: "[deprecated]"
color: "888888"
- name: tag::noarch
description: related to noarch builds
color: '#86c579'
Loading

0 comments on commit 0466b8c

Please sign in to comment.