Skip to content

Commit 4d605f8

Browse files
Resolve merge conflicts with upstream/main (README, cli.py)
2 parents 189458e + b2c3f1c commit 4d605f8

24 files changed

Lines changed: 2632 additions & 1252 deletions
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
name: 'Bug Report Template'
3+
about: Report a bug to help us improve
4+
title: 'bug: <context of the bug>'
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
# Bug Report
11+
12+
**Describe the bug**
13+
A clear and concise description of what the bug is.
14+
15+
**To Reproduce**
16+
Steps to reproduce the behavior:
17+
1. Go to '...'
18+
2. Click on '....'
19+
3. Scroll down to '....'
20+
4. See error
21+
22+
**Expected behavior**
23+
What you expected to happen.
24+
25+
**Screenshots (optional)**
26+
Add screenshots if helpful.
27+
28+
**Additional context (optional)**
29+
Anything else relevant.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: 'Feature Request'
3+
about: Suggest an idea or enhancement
4+
title: 'feature: <feature request>'
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
# Feature Request
11+
12+
**Describe the feature you'd like**
13+
A short description of the desired feature.
14+
15+
**Why is this feature important?**
16+
Explain the benefit or use case. Is your feature request related to a problem?
17+
18+
**Describe alternatives you've considered**
19+
List any alternative solutions or workarounds considered.
20+
21+
**Additional context**
22+
Add any other details or mockups here.

.github/pull_request_template.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Pull Request
2+
3+
## Description
4+
5+
Briefly describe the changes introduced in this PR.
6+
7+
**Related Issues**
8+
Link any related issues (e.g., `Issue #12`).
9+
10+
## Type of change
11+
- [ ] Bug fix (non-breaking change which fixes an issue)
12+
- [ ] New feature (non-breaking change which adds functionality)
13+
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
14+
- [ ] This change requires a documentation update
15+
- [ ] Housekeeping
16+
17+
## Checklist:
18+
- [ ] My code follows the [ruff code style](http://stellarium.org/doc/head/codingStyle.html) of this project.
19+
- [ ] I have performed a self-review of my own code
20+
- [ ] I have commented my code, particularly in hard-to-understand areas
21+
- [ ] I have made corresponding changes to the documentation (if applicable)
22+
- [ ] I have added tests that prove my fix is effective or that my feature works
23+
- [ ] New and existing unit tests pass locally with my changes
24+
- [ ] `poetry run pytest` - all tests passed
25+
- [ ] `poetry run ruff check` - no linting errors

.github/workflows/python-CI.yml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,17 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v3
22-
- name: Set up Python 3.10
23-
uses: actions/setup-python@v3
21+
- uses: actions/checkout@v4
22+
- name: Set up Python 3.11
23+
uses: actions/setup-python@v5
2424
with:
25-
python-version: "3.10"
25+
python-version: "3.11"
2626
- uses: Gr1N/setup-poetry@v8 #install poetry
27-
- name: Install parts of toolchain
28-
run: |
29-
python -m pip install --upgrade pip
30-
pip install flake8 pytest
27+
- name: Upgrade pip
28+
run: python -m pip install --upgrade pip
3129
- name: Install requirements with poetry
3230
run: poetry install
33-
- name: Lint with flake8
34-
run: |
35-
# stop the build if there are Python syntax errors or undefined names
36-
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
37-
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
38-
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
31+
- name: Lint with Ruff
32+
run: poetry run ruff check --output-format=github .
3933
- name: Test with pytest
40-
run: |
41-
poetry run pytest
34+
run: poetry run pytest

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# project-specific
22
tmp/
3+
vault-token.dat
34

45
# Byte-compiled / optimized / DLL files
56
__pycache__/

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.10-slim
1+
FROM python:3.11-slim
22

33
WORKDIR /data
44

0 commit comments

Comments
 (0)