Skip to content

Commit ba1f322

Browse files
authored
Merge pull request #2474 from lukpueh/rm-obsolete-comments
Remove obsolete comments from Python 2.7 times
2 parents 1d8b57b + 9894d73 commit ba1f322

2 files changed

Lines changed: 0 additions & 38 deletions

File tree

.github/workflows/_test.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ jobs:
4747

4848
env:
4949
# Set TOXENV env var to tell tox which testenv (see tox.ini) to use
50-
# NOTE: The Python 2.7 runner has two Python versions on the path (see
51-
# setup-python below), so we tell tox explicitly to use the 'py27'
52-
# testenv. For all other runners the toxenv configured above suffices.
5350
TOXENV: ${{ matrix.toxenv }}
5451

5552
runs-on: ${{ matrix.os }}

requirements/main.txt

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,5 @@
66
# 'pinned.txt' is updated on GitHub with Dependabot, which
77
# triggers CI/CD builds to automatically test against updated dependencies.
88
#
9-
#
10-
# NOTE: 'pip-compile' only adds dependencies relevant for the Python version,
11-
# in which it is executed. Moreover, it does not add environment markers of
12-
# transitive dependencies.
13-
# The official recommendation for cross-environment usage of pip-compile tends
14-
# towards separate requirements files for each environment (see
15-
# jazzband/pip-tools#651), this seem like an overkill for tuf, where we only
16-
# have a few conditional dependencies, i.e. dependencies that are required on
17-
# Python < 3 only.
18-
#
19-
#
20-
# Below instructions can be used to re-generate 'pinned.txt', e.g.
21-
# if:
22-
# - requirements are added or removed from this file
23-
# - Python version support is changed
24-
# - CI/CD build breaks due to updates (e.g. transitive dependency conflicts)
25-
#
26-
# 1. Use this script to create a pinned requirements file for each Python
27-
# version
28-
# ```
29-
# for v in 3.8 3.9 3.10 3.11; do
30-
# mkvirtualenv tuf-env-${v} -p python${v};
31-
# python3 -m pip install pip-tools;
32-
# pip-compile --no-header -o requirements-${v}.txt main.txt;
33-
# deactivate;
34-
# rmvirtualenv tuf-env-${v};
35-
# done;
36-
#
37-
# ```
38-
# 2. Use this command to merge per-version files
39-
# `sort -o pinned.txt -u requirements-?.?.txt`
40-
# 2. Manually add environment markers to pinned.txt
41-
# 3. Use this command to remove per-version files
42-
# `rm requirements-?.?.txt`
43-
#
449
securesystemslib[crypto, pynacl]
4510
requests

0 commit comments

Comments
 (0)