Use pip-tools

Author: vstinner

.travis.yml

@@ -6,7 +6,7 @@ python:
     - nightly
     - pypy3
 install:
-    - pip install -U 'setuptools>=18.5' 'pip>=6.0'
+    - pip install -U 'setuptools>=18.5' 'pip>=6.0' 'wheel'
     # Need to install pyperformance,
     # pyperformance/tests/test_compare.py imports it
     - pip install -e .

doc/changelog.rst

@@ -8,14 +8,16 @@ Version 1.0.1
   with Python 3.
 * Update dependencies:
 
-  * Django: 3.0 => 3.0.2
+  * Django: 3.0 => 3.0.3
   * Mako: 1.1.0 = > 1.1.1
   * SQLAlchemy: 1.3.12 => 1.3.13
   * dulwich: 0.19.14 => 0.19.15
-  * mercurial: 5.1.1 => 5.2.2
+  * mercurial: 5.1.1 => 5.3
   * six : 1.13.0 => 1.14.0
   * sympy: 1.5 => 1.5.1
 
+* pip-tools (pip-compile) is now used to update dependencies
+
 Version 1.0.0 (2019-12-17)
 --------------------------
 

pyperformance/requirements.in

@@ -0,0 +1,33 @@
+# pyperformance dependencies
+# --------------------------
+
+six==1.14.0
+pyperf==1.7.0
+
+
+# Benchmarks dependencies
+# -----------------------
+#
+# When one of these dependencies is upgraded, the pyperformance major version
+# should be increased to respect semantic versionning. Comparison between
+# two pyperformance results of two different major versions is not reliable.
+
+Chameleon                          # bm_chameleon
+Django                             # bm_django_template
+Genshi                             # bm_genshi
+Mako                               # bm_mako
+SQLAlchemy                         # bm_sqlalchemy_declarative
+mercurial                          # bm_hg_startup
+html5lib                           # bm_html5lib
+pyaes                              # bm_crypto_pyaes
+sympy                              # bm_sympy
+tornado                            # bm_tornado_http
+
+
+# Optional dependencies
+# ---------------------
+#
+# The list of optional dependencies is hardcoded in pyperformance/venv.py
+
+psutil
+dulwich                            # bm_dulwich_log

pyperformance/requirements.txt

@@ -1,76 +1,28 @@
-# Installer requirements
-# ----------------------
 #
-# The list of installer requirements is hardcoded in pyperformance/venv.py
+# This file is autogenerated by pip-compile
+# To update, run:
 #
-# Note: installer requirements are also used in .travis.yml
-
-# html5lib requires setuptools 18.5 or newer
-setuptools>=18.5
-# pip 6 is the first version supporting environment markers
-pip>=6.0
-# install wheel so pip can cache binary wheel packages locally,
-# and install prebuilt wheel packages from PyPI
-wheel
-
-
-# Indirect dependencies
-# ---------------------
+#    pip-compile requirements.in
 #
-# Freeze indirect dependencies to get a more reproductible test environment
-
-# tornado 4.4.1 dependencies
-backports-abc==0.5
-singledispatch==3.4.0.3
-certifi==2019.11.28
-
-# Mako 1.0.4 dependencies
-MarkupSafe==1.1.1
-
-# html5lib 0.999999999 dependencies
-webencodings==0.5.1
-
-# sympy 1.0 dependency
-mpmath==1.1.0
-
-
-# pyperformance dependencies
-# --------------------------
-
-six==1.14.0
-pyperf==1.7.0
-
-
-# Benchmarks dependencies
-# -----------------------
-#
-# When one of these dependencies is upgraded, the pyperformance major version
-# should be increased to respect semantic versionning. Comparison between
-# two pyperformance results of two different major versions is not reliable.
-
-Chameleon==3.6.2                          # bm_chameleon
-Django==3.0.3                             # bm_django_template
-Genshi==0.7.3                             # bm_genshi
-Mako==1.1.1                               # bm_mako
-SQLAlchemy==1.3.13                        # bm_sqlalchemy_declarative
-dulwich==0.19.15                          # dulwich_log
-mercurial==5.2.2                          # bm_hg_startup
-html5lib==1.0.1                           # bm_html5lib
-pyaes==1.6.1                              # bm_crypto_pyaes
-sympy==1.5.1                              # bm_sympy
-tornado==6.0.3                            # bm_tornado_http
-
-
-# Optional dependencies
-# ---------------------
-#
-# The list of optional dependencies is hardcoded in pyperformance/venv.py
-
+asgiref==3.2.3            # via django
+certifi==2019.11.28       # via dulwich
+chameleon==3.6.2
+django==3.0.3
+dulwich==0.19.15
+genshi==0.7.3
+html5lib==1.0.1
+mako==1.1.1
+markupsafe==1.1.1         # via mako
+mercurial==5.3
+mpmath==1.1.0             # via sympy
 psutil==5.6.7
-
-
-# pyperformance
-# -------------
-#
-# The pyperformance module is installed inside the virtual environment
-# by pyperformance/venv.py
+pyaes==1.6.1
+pyperf==1.7.0
+pytz==2019.3              # via django
+six==1.14.0
+sqlalchemy==1.3.13
+sqlparse==0.3.0           # via django
+sympy==1.5.1
+tornado==6.0.3
+urllib3==1.25.8           # via dulwich
+webencodings==0.5.1       # via html5lib

pyperformance/venv.py

@@ -105,12 +105,24 @@ def is_build_dir():
 
 
 class Requirements(object):
-    def __init__(self, filename, pip, installer, optional):
-        # pip requirement
-        self.pip = []
-
-        # pre-requirements (setuptools, pip)
-        self.installer = []
+    def __init__(self, filename, optional):
+        # if pip or setuptools is updated:
+        # .travis.yml should be updated as well
+
+        # pip requirements
+        self.pip = [
+            # pip 6 is the first version supporting environment markers
+            'pip>=6.0',
+        ]
+
+        # installer requirements
+        self.installer = [
+            # html5lib requires setuptools 18.5 or newer
+            'setuptools>=18.5',
+            # install wheel so pip can cache binary wheel packages locally,
+            # and install prebuilt wheel packages from PyPI
+            'wheel',
+        ]
 
         # requirements
         self.req = []
@@ -133,11 +145,7 @@ def __init__(self, filename, pip, installer, optional):
                 req = req.partition('==')[0]
                 req = req.partition('>=')[0]
 
-                if req in pip:
-                    self.pip.append(line)
-                elif req in installer:
-                    self.installer.append(line)
-                elif req in optional:
+                if req in optional:
                     self.optional.append(line)
                 else:
                     self.req.append(line)
@@ -473,8 +481,6 @@ def _install_req(self):
         filename = os.path.join(PERFORMANCE_ROOT, 'requirements.txt')
         requirements = Requirements(filename,
                                     # FIXME: don't hardcode requirements
-                                    ['pip', 'setuptools'],
-                                    ['wheel'],
                                     ['psutil', 'dulwich'])
 
         # Upgrade pip

setup.py

@@ -6,12 +6,9 @@
 #
 # Update dependencies:
 #
+#  - python3 -m pip install --user --upgrade pip-tools
 #  - git clean -fdx  # remove all untracked files!
-#  - python3 -m pyperformance venv create
-#  - venv/cpython*/bin/python -m pip list --outdated
-#  - update pyperformance/requirements.txt
-#  - (see also pip-tools and pipdeptree tools)
-#  - (pip install pip-review; pip-review --local --interactive)
+#  - cd pyperformance; pip-compile requirements.in
 #
 # Prepare a release:
 #
@@ -20,7 +17,7 @@
 #  - maybe update version in pyperformance/__init__.py and doc/conf.py
 #  - set release date in doc/changelog.rst
 #  - git commit -a -m "prepare release x.y"
-#  - run tests: tox
+#  - run tests: tox --parallel 0
 #  - git push
 #  - check Travis CI status:
 #    https://travis-ci.org/python/pyperformance