Skip to content

Commit 9be3631

Browse files
copdipscopdips
committed
use uv
1 parent fc7851f commit 9be3631

6 files changed

Lines changed: 1298 additions & 56 deletions

File tree

‎.github/workflows/build_and_deploy.yml‎

Lines changed: 43 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ concurrency:
1010
group: ${{ github.workflow}}
1111
cancel-in-progress: true
1212

13-
env:
14-
PYTHON_VERSION: 3.x
13+
# env:
14+
# PYTHON_VERSION: 3.x
1515

1616
permissions:
1717
contents: write
@@ -36,34 +36,35 @@ jobs:
3636
- name: Set up Python runtime
3737
uses: actions/setup-python@v5
3838
with:
39-
python-version: ${{ env.PYTHON_VERSION }}
40-
cache: pip
41-
cache-dependency-path: |
42-
requirements.txt
39+
# python-version: ${{ env.PYTHON_VERSION }}
40+
python-version-file: .python-version
41+
# cache: pip
42+
# cache-dependency-path: |
43+
# requirements.txt
4344

4445
- name: Debug
4546
run: |
4647
env | sort -f
4748
ls -lart
4849
49-
- name: Get pip cache dir
50-
run: |
51-
os_version=$(cat /etc/os-release | grep -i "version=" | cut -c9- | tr -d '"' | tr ' ' '_')
52-
github_workflow_full_path="${GITHUB_WORKFLOW_REF%@*}"
53-
python_full_version=$(python -c 'import platform; print(platform.python_version())')
54-
node_major_version=$(node --version | cut -d'.' -f1 | tr -d 'v')
55-
echo "os_version=$os_version" >> $GITHUB_ENV
56-
echo "github_workflow_full_path=$github_workflow_full_path" >> $GITHUB_ENV
57-
echo "python_full_version=$python_full_version" >> $GITHUB_ENV
58-
echo "PIP_CACHE_DIR=$(pip cache dir)" >> $GITHUB_ENV
59-
60-
- name: cache pip
61-
uses: actions/cache@v4
62-
with:
63-
path: |
64-
${{ env.pythonLocation }}
65-
.cache/plugin/git-committers/
66-
key: ${{ env.github_workflow_full_path}}-${{ env.os_version }}-${{ env.python_full_version }}-${{ env.node_major_version}}-${{ hashFiles('requirements.txt') }}
50+
# - name: Get pip cache dir
51+
# run: |
52+
# os_version=$(cat /etc/os-release | grep -i "version=" | cut -c9- | tr -d '"' | tr ' ' '_')
53+
# github_workflow_full_path="${GITHUB_WORKFLOW_REF%@*}"
54+
# python_full_version=$(python -c 'import platform; print(platform.python_version())')
55+
# node_major_version=$(node --version | cut -d'.' -f1 | tr -d 'v')
56+
# echo "os_version=$os_version" >> $GITHUB_ENV
57+
# echo "github_workflow_full_path=$github_workflow_full_path" >> $GITHUB_ENV
58+
# echo "python_full_version=$python_full_version" >> $GITHUB_ENV
59+
# echo "PIP_CACHE_DIR=$(pip cache dir)" >> $GITHUB_ENV
60+
61+
# - name: cache pip
62+
# uses: actions/cache@v4
63+
# with:
64+
# path: |
65+
# ${{ env.pythonLocation }}
66+
# .cache/plugin/git-committers/
67+
# key: ${{ env.github_workflow_full_path}}-${{ env.os_version }}-${{ env.python_full_version }}-${{ env.node_major_version}}-${{ hashFiles('requirements.txt') }}
6768

6869
# - name: Set up build cache
6970
# uses: actions/cache/restore@v3
@@ -73,9 +74,24 @@ jobs:
7374
# restore-keys: |
7475
# mkdocs-material-
7576

76-
- name: Install dependencies
77+
- name: Install os dependencies
7778
run: sudo apt-get install pngquant
7879

80+
- name: Install uv
81+
uses: astral-sh/setup-uv@v6
82+
with:
83+
enable-cache: true
84+
activate-environment: true
85+
cache-dependency-glob: |
86+
pyproject.toml
87+
88+
# run: uv sync --frozen --all-extras --dev --verbose
89+
# - name: Install Requirements
90+
# run: |
91+
# uv sync --frozen --no-dev --verbose
92+
# uv pip show mkdocs
93+
# working-directory: ${{ github.workspace }}
94+
7995
- name: Install Python dependencies
8096
run: |
8197
make ci-install
@@ -97,9 +113,9 @@ jobs:
97113
98114
- name: Build documentation
99115
run: |
100-
mkdocs --version
116+
uv run mkdocs --version
101117
# https://github.com/facelessuser/pymdown-extensions/issues/2240#issuecomment-1819117598
102-
python -m mkdocs build -s
118+
uv run python -m mkdocs build -s
103119
cp ads.txt ./site/
104120
env:
105121
MKDOCS_GIT_COMMITTERS_APIKEY: ${{ secrets.GH_TOKEN_FOR_GIT_COMMITTERS }}

‎.python-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.13

‎Makefile‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
SHELL=/bin/bash
22
VENV_NAME := $(shell [ -d venv ] && echo venv || echo .venv)
3-
VENV_DIR=${VENV_NAME}
3+
# VENV_DIR=${VENV_NAME}
4+
VENV_DIR=.venv
45
PYTHON=$(shell if [ -d $(VENV_DIR) ]; then echo $(VENV_DIR)/bin/python; else echo python; fi)
56

6-
77
ifneq (,$(findstring xterm,${TERM}))
88
BOLD := $(shell tput -Txterm bold)
99
RED := $(shell tput -Txterm setaf 1)
@@ -14,13 +14,13 @@ endif
1414

1515
install:
1616
@echo "${BOLD}${YELLOW}install:${NORMAL}"
17-
pipx install uv
18-
pipx upgrade uv
19-
@if [ ! -d "$(VENV_DIR)" ]; then \
20-
python3.12 -m venv $(VENV_DIR); \
21-
fi
22-
@. $(VENV_DIR)/bin/activate; \
23-
uv pip install -r requirements.txt
17+
pipx install uv --force
18+
# @if [ ! -d "$(VENV_DIR)" ]; then \
19+
# python3.12 -m venv $(VENV_DIR); \
20+
# fi
21+
# @. $(VENV_DIR)/bin/activate; \
22+
uv sync --frozen --verbose
23+
@echo "To activate manually, run: ${BOLD}${YELLOW}source $(VENV_DIR)/bin/activate${NORMAL}"; \
2424

2525
build:
2626
@echo "${BOLD}${YELLOW}mkdocs build:${NORMAL}"
@@ -32,12 +32,13 @@ run:
3232

3333
update-venv:
3434
@echo "${BOLD}${YELLOW}update venv:${NORMAL}"
35-
${PYTHON} -m pip install -U pip
36-
uv pip install -Ur requirements.txt
35+
# ${PYTHON} -m pip install -U pip
36+
# uv pip install -Ur requirements.txt
37+
# uv self update for CI, pipx upgrade uv for local
38+
uv self update || pipx upgrade uv
39+
uv lock --upgrade
3740

3841
ci-install:
39-
${PYTHON} -m pip install -U pip
40-
${PYTHON} -m pip install -U uv
41-
UV_SYSTEM_PYTHON=true uv pip install -Ur requirements.txt
42-
echo -e "\nInstalled packages:"
43-
uv pip list
42+
@echo "${BOLD}${YELLOW}ci-install:${NORMAL}"
43+
uv sync --frozen --verbose
44+
uv pip show mkdocs

‎pyproject.toml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[project]
2+
name = "copdips-github-io"
3+
version = "0.1.0"
4+
description = "My blog: https://copdips.com/"
5+
readme = "README.md"
6+
requires-python = ">=3.13"
7+
dependencies = [
8+
"csv2md>=1.4.0",
9+
"mkdocs>=1.6.1",
10+
"mkdocs-material[git,imaging,recommended]>=9.6.15",
11+
"mkdocs-material-extensions>=1.3.1",
12+
"mkdocstrings>=0.29.1",
13+
"mkdocstrings-python>=1.16.12",
14+
"mkdocs-video>=1.5.0",
15+
"mkdocs-glightbox>=0.4.0",
16+
"mkdocs-rss-plugin>=1.17.3",
17+
"mkdocs-minify-html-plugin>=0.3.1",
18+
]
19+
20+
[dependency-groups]
21+
dev = [
22+
"ipdb>=0.13.13",
23+
"mypy>=1.17.0",
24+
"pyright>=1.1.403",
25+
"ruff>=0.12.4",
26+
"ty>=0.0.1a15",
27+
]

‎requirements.txt‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)