Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/pip/requests-2.32.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ITProKyle committed Aug 22, 2024
2 parents f39d60d + ee36279 commit 9e7e9d6
Show file tree
Hide file tree
Showing 783 changed files with 14,893 additions and 22,542 deletions.
7 changes: 5 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@ ADD --chown=vscode:vscode files/.bash_completion /home/vscode/.bash_completion
RUN mkdir /home/vscode/.bash_completion.d/

# Setup AWS CLI
RUN pip3 install --user awscli poetry==1.5.1
RUN echo "complete -C '/home/vscode/.local/bin/aws_completer' aws" >> ~/.bashrc
RUN set -e; \
pip3 install --no-cache-dir --user awscli pipx; \
pipx install poetry; \
pipx inject poetry "poetry-dynamic-versioning[plugin]" poetry-plugin-export; \
echo "complete -C '/home/vscode/.local/bin/aws_completer' aws" >> ~/.bashrc

# Setup OS_NAME var for runway builds from this dev container
RUN echo "export OS_NAME=ubuntu-latest" >> ~/.bashrc
34 changes: 18 additions & 16 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{
"name": "Ubuntu",
"build": {
"dockerfile": "Dockerfile",
"args": { "VARIANT": "ubuntu-22.04" }
},
"remoteUser": "vscode",
"customizations": {
"vscode": {
"extensions": [
"ms-python.python"
]
}
},
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
}
"build": {
"args": {
"VARIANT": "ubuntu-22.04"
},
"dockerfile": "Dockerfile"
},
"customizations": {
"vscode": {
"extensions": [
"ms-python.python"
]
}
},
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
},
"name": "Ubuntu",
"remoteUser": "vscode"
}
13 changes: 4 additions & 9 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{html,js,jsx,md,rst,toml,ts,xml,yml,yaml}]
indent_size = 2

[*.py]
charset = utf-8

[*.rst]
indent_size = 2
[{*.{json,py},Makefile}]
indent_size = 4

[Makefile]
indent_style = tab
Expand Down
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

To view our [Getting Started] guide for developers and [Contribution Requirements], please refer to the official [documentation].

[Contribution Requirements]: https://docs.onica.com/projects/runway/page/developers/contributing.html
[Getting Started]: https://docs.onica.com/projects/runway/page/developers/getting_started.html
[documentation]: https://docs.onica.com/projects/runway
[contribution requirements]: https://runway.readthedocs.io/page/developers/contributing.html
[documentation]: https://runway.readthedocs.io
[getting started]: https://runway.readthedocs.io/page/developers/getting_started.html
5 changes: 2 additions & 3 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[REQUEST] feature"
title: '[REQUEST] feature'
labels: feature, priority:low, status:review_needed

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
A clear and concise description of what the problem is. Ex. I'm always frustrated when ...

**Describe the solution you'd like**
A clear and concise description of what you want to happen.
Expand Down
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/general_question.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
---
name: General Question
about: General question about the project, usage, design, etc.
title: "[QUESTION]"
title: '[QUESTION]'
labels: priority:low, status:review_needed, question

---

**Question**
Expand Down
5 changes: 1 addition & 4 deletions .github/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
color: f0db4f
description: Pull request that updates Javascript code
- name: maintenance
color: fbca04
color: fbca04 # cspell:ignore fbca04
description: General repo or CI/CD upkeep
- name: npm
color: cc3534
Expand All @@ -68,9 +68,6 @@
- name: priority:medium
color: fbca04
description: Medium priority issue or pull request
- name: pyinstaller
color: ffffff
description: Update to Pyinstaller configuration
- name: python
color: '306998'
description: Update to Python code
Expand Down
3 changes: 2 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
# Checklist

<!-- You can erase any parts of this template not applicable to your Pull Request. -->
- [ ] Have you followed the guidelines in our [Contribution Requirements](https://docs.onica.com/projects/runway/page/developers/contributing.html)?

- [ ] Have you followed the guidelines in our [Contribution Requirements](https://runway.readthedocs.io/page/developers/contributing.html)?
- [ ] Have you checked to ensure there aren't other open [Pull Requests](../../../pulls) for the same update/change?
- [ ] Does your submission pass tests?
- [ ] Have you linted your code locally prior to submission?
Expand Down
8 changes: 2 additions & 6 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ autolabeler: # cspell:ignore autolabeler
- label: bug
branch: [/^(bug|bugfix|fix|hotfix)\/.*/]
- label: changelog:skip
branch: [/^(dependabot)\/.*/]
branch: [/^(dependabot)\/.*/, /^pre-commit-ci-update-config/, /^renovate\/.*lockfile/]
- label: cloudformation
files:
- '**/templates/*.json'
- '**/templates/*.template'
- '**/templates/*.yaml'
- '**/templates/*.yml'
- label: dependencies
branch: [/^(depend|dependabot)\/.*/]
branch: [/^(dep|depend|dependabot|deps|renovate)\/.*/]
- label: documentation
branch: [/^(docs)\/.*/]
- label: feature
Expand All @@ -38,10 +38,6 @@ autolabeler: # cspell:ignore autolabeler
- poetry.lock
- poetry.toml
- pyproject.toml
- label: pyinstaller
files:
- runway.file.spec
- runway.folder.spec
- label: python
files:
- '**/*.py'
Expand Down
3 changes: 0 additions & 3 deletions .github/scripts/README.md

This file was deleted.

46 changes: 0 additions & 46 deletions .github/scripts/cicd/build_pyinstaller.sh

This file was deleted.

29 changes: 0 additions & 29 deletions .github/scripts/cicd/check_distance_from_tag.sh

This file was deleted.

16 changes: 0 additions & 16 deletions .github/scripts/urlshortener/Makefile

This file was deleted.

30 changes: 0 additions & 30 deletions .github/scripts/urlshortener/README.md

This file was deleted.

Loading

0 comments on commit 9e7e9d6

Please sign in to comment.