Skip to content

Commit b6e8893

Browse files
authored
Merge pull request #358 from MITLibraries/maintenance-10-2024
Maintenance 10-2024
2 parents b628e09 + 6d38d9c commit b6e8893

File tree

6 files changed

+948
-803
lines changed

6 files changed

+948
-803
lines changed

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.11.2
1+
3.12

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11-slim as build
1+
FROM python:3.12-slim as build
22
WORKDIR /app
33
COPY . .
44

Makefile

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,49 +10,55 @@ help: # preview Makefile commands
1010
@awk 'BEGIN { FS = ":.*#"; print "Usage: make <target>\n\nTargets:" } \
1111
/^[-_[:alpha:]]+:.?*#/ { printf " %-15s%s\n", $$1, $$2 }' $(MAKEFILE_LIST)
1212

13-
## Dependency commands
13+
#######################
14+
# Dependency commands
15+
#######################
1416

15-
install: # install Python dependencies and pre-commit hook
17+
install: # Install Python dependencies
1618
pipenv install --dev
1719
pipenv run pre-commit install
1820

19-
update: install # update Python dependencies
21+
update: install # Update Python dependencies
2022
pipenv clean
2123
pipenv update --dev
2224

23-
## Unit Test commands
25+
######################
26+
# Unit test commands
27+
######################
2428

25-
test: # run tests and print a coverage report
29+
test: # Run tests and print a coverage report
2630
pipenv run coverage run --source=tim -m pytest -vv
2731
pipenv run coverage report -m
2832

29-
coveralls: test # write coverage data to an LCOV report
33+
coveralls: test # Write coverage data to an LCOV report
3034
pipenv run coverage lcov -o ./coverage/lcov.info
3135

32-
## Code quality and safety commands
36+
####################################
37+
# Code quality and safety commands
38+
####################################
3339

34-
lint: black mypy ruff safety # run linters
40+
lint: black mypy ruff safety # Run linters
3541

36-
black: # run 'black' linter and print a preview of suggested changes
42+
black: # Run 'black' linter and print a preview of suggested changes
3743
pipenv run black --check --diff .
3844

39-
mypy: # run 'mypy' linter
40-
pipenv run mypy tim
45+
mypy: # Run 'mypy' linter
46+
pipenv run mypy .
4147

42-
ruff: # run 'ruff' linter and print a preview of errors
48+
ruff: # Run 'ruff' linter and print a preview of errors
4349
pipenv run ruff check .
4450

45-
safety: # check for security vulnerabilities and verify Pipfile.lock is up-to-date
51+
safety: # Check for security vulnerabilities and verify Pipfile.lock is up-to-date
4652
pipenv check
4753
pipenv verify
4854

49-
lint-apply: # apply changes with 'black' and resolve fixable errors with 'ruff'
50-
black-apply ruff-apply
55+
lint-apply: # Apply changes with 'black' and resolve 'fixable errors' with 'ruff'
56+
black-apply ruff-apply
5157

52-
black-apply: # apply changes with 'black'
58+
black-apply: # Apply changes with 'black'
5359
pipenv run black .
5460

55-
ruff-apply: # resolve fixable errors with 'ruff'
61+
ruff-apply: # Resolve 'fixable errors' with 'ruff'
5662
pipenv run ruff check --fix .
5763

5864
## Terraform-generated commands for container build and deployment in dev

Pipfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ coveralls = "*"
1919
freezegun = "*"
2020
mypy = "*"
2121
pre-commit = "*"
22-
pydocstyle = "*"
2322
pytest = "*"
24-
vcrpy = "*"
2523
ruff = "*"
24+
vcrpy = "*"
2625

2726
[requires]
28-
python_version = "3.11"
27+
python_version = "3.12"
2928

3029
[scripts]
3130
tim = "python -c \"from tim.cli import main; main(prog_name='tim')\""

0 commit comments

Comments
 (0)