Skip to content

Commit de464ff

Browse files
committed
New freeze system
1 parent dd5477f commit de464ff

File tree

5 files changed

+100
-11
lines changed

5 files changed

+100
-11
lines changed

Diff for: Makefile

+22-7
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ install:
44
pip install -r requirements.txt
55

66
install-dev: install
7-
pip install -e ".[dev]"
7+
pip install -r requirements-dev.txt
88

99
install-docs:
10-
pip install -e ".[dev,docs]"
10+
pip install -r requirements-docs.txt
1111

1212
format: isort-format black-format
1313

@@ -42,10 +42,25 @@ test: lint unit
4242
test-docs:
4343
mkdocs build --strict
4444

45-
freeze:
46-
CUSTOM_COMPILE_COMMAND="make freeze" pip-compile --no-emit-index-url --no-annotate --output-file requirements.txt setup.py
45+
FREEZE_OPTIONS = --no-emit-index-url --no-annotate -v
46+
freeze-base:
47+
CUSTOM_COMPILE_COMMAND="make freeze" pip-compile $(FREEZE_OPTIONS) setup.py --output-file requirements.txt
48+
freeze-dev:
49+
CUSTOM_COMPILE_COMMAND="make freeze" pip-compile $(FREEZE_OPTIONS) setup.py --extra dev --output-file requirements-dev.txt
50+
freeze-docs:
51+
CUSTOM_COMPILE_COMMAND="make freeze" pip-compile $(FREEZE_OPTIONS) setup.py --extra docs --output-file requirements-docs.txt
4752

48-
freeze-upgrade:
49-
CUSTOM_COMPILE_COMMAND="make freeze" pip-compile --no-emit-index-url --upgrade --no-annotate --output-file requirements.txt setup.py
53+
freeze: freeze-base freeze-dev freeze-docs
5054

51-
.PHONY: install install-dev install-docs format isort-format black-format lint isort-lint black-lint flake8-lint unit coverage test freeze freeze-upgrade
55+
freeze-base-upgrade:
56+
CUSTOM_COMPILE_COMMAND="make freeze" pip-compile $(FREEZE_OPTIONS) --upgrade setup.py --output-file requirements.txt
57+
freeze-dev-upgrade:
58+
CUSTOM_COMPILE_COMMAND="make freeze" pip-compile $(FREEZE_OPTIONS) --upgrade setup.py --extra dev --output-file requirements-dev.txt
59+
freeze-docs-upgrade:
60+
CUSTOM_COMPILE_COMMAND="make freeze" pip-compile $(FREEZE_OPTIONS) --upgrade setup.py --extra docs --output-file requirements-docs.txt
61+
62+
freeze-upgrade: freeze-base-upgrade freeze-dev-upgrade freeze-docs-upgrade
63+
64+
.PHONY: install install-dev install-docs format isort-format black-format lint isort-lint black-lint flake8-lint unit \
65+
coverage test freeze freeze-upgrade freeze-base freeze-dev freeze-docs freeze-base-upgrade freeze-dev-upgrade \
66+
freeze-docs-upgrade

Diff for: requirements-dev.txt

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.10
3+
# by the following command:
4+
#
5+
# make freeze
6+
#
7+
anyio==4.2.0
8+
black==23.12.1
9+
build==1.0.3
10+
certifi==2023.11.17
11+
click==8.1.7
12+
coverage[toml]==7.4.0
13+
exceptiongroup==1.2.0
14+
flake8==6.1.0
15+
h11==0.14.0
16+
httpcore==1.0.2
17+
httpx==0.26.0
18+
idna==3.6
19+
iniconfig==2.0.0
20+
isort==5.13.2
21+
mccabe==0.7.0
22+
mypy-extensions==1.0.0
23+
packaging==23.2
24+
pathspec==0.12.1
25+
pip-tools==7.3.0
26+
platformdirs==4.1.0
27+
pluggy==1.3.0
28+
pycodestyle==2.11.1
29+
pydantic==1.10.13
30+
pyflakes==3.1.0
31+
pyproject-hooks==1.0.0
32+
pytest==7.4.3
33+
pytest-cov==4.1.0
34+
pytest-repeat==0.9.3
35+
sniffio==1.3.0
36+
tomli==2.0.1
37+
typing-extensions==4.9.0
38+
wheel==0.42.0
39+
40+
# The following packages are considered to be unsafe in a requirements file:
41+
# pip
42+
# setuptools

Diff for: requirements-docs.txt

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.10
3+
# by the following command:
4+
#
5+
# make freeze
6+
#
7+
automacdoc==0.3
8+
beautifulsoup4==4.12.2
9+
click==8.1.7
10+
ghp-import==2.1.0
11+
importlib-metadata==7.0.1
12+
jinja2==3.1.2
13+
livereload==2.6.3
14+
markdown==3.5.1
15+
markupsafe==2.1.3
16+
mergedeep==1.3.4
17+
mkdocs==1.3.0
18+
mkdocs-material==4.6.3
19+
mkdocstrings==0.10.0
20+
packaging==23.2
21+
pydantic==1.10.13
22+
pygments==2.17.2
23+
pymdown-extensions==10.6
24+
python-dateutil==2.8.2
25+
pytkdocs==0.2.1
26+
pyyaml==6.0.1
27+
pyyaml-env-tag==0.1
28+
six==1.16.0
29+
soupsieve==2.5
30+
tornado==6.4
31+
typing-extensions==4.9.0
32+
watchdog==3.0.0
33+
zipp==3.17.0

Diff for: requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.9
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.10
3+
# by the following command:
44
#
55
# make freeze
66
#

Diff for: setup.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from pathlib import Path
22

33
from setuptools import find_namespace_packages, setup
4-
from pycfmodel.__version__ import __version__
54

65
readme = Path(__file__).parent / "README.md"
76
long_description = readme.read_text()
@@ -29,7 +28,7 @@
2928

3029
setup(
3130
name="pycfmodel",
32-
version=__version__,
31+
version="0.21.2",
3332
description="A python model for CloudFormation scripts",
3433
author="Skyscanner Product Security",
3534
author_email="[email protected]",

0 commit comments

Comments
 (0)