Separately version the conan recipe and the Python interpreter

Author: dean0x7d

conanfile.py

@@ -5,46 +5,45 @@
 
 class EmbeddedPython(ConanFile):
     name = "embedded_python"
-    version = "3.7.4"  # use x.y.z-n for build revisions on the same Python version, e.g. 3.7.4-1
-    pyversion = version.split("-")[0]  # Python version sans build revision, e.g. 3.7.4-2 -> 3.7.4
-    md5 = "9b00c8cf6d9ec0b9abe83184a40729a2"
+    version = "1.0.0"  # of the Conan package, `options.version` is the Python version
     description = "Embedded distribution of Python"
     url = "https://www.python.org/"
     license = "PSFL"
     settings = {"os": ["Windows"]}
-    options = {"pip_packages": "ANY"}
-    default_options = "pip_packages=None"
+    options = {"version": "ANY", "packages": "ANY"}
+    default_options = "packages=None"
     exports = "embedded_python_tools.py"
     short_paths = True  # some of the pip packages go over the 260 char path limit on Windows
 
-    def _get_binaries(self):
+    def _get_binaries(self, version):
         """Get the binaries from the special embeddable Python package"""
         url = "https://www.python.org/ftp/python/{0}/python-{0}-embed-amd64.zip"
-        tools.get(url.format(self.pyversion), md5=self.md5, destination="embedded_python")
+        tools.get(url.format(version), destination="embedded_python")
 
-    def _get_headers_and_lib(self):
+    def _get_headers_and_lib(self, version):
         """We also need headers and the `python3.lib` file to link against"""
         url = "https://www.python.org/ftp/python/{0}/python-{0}-amd64-webinstall.exe"
-        tools.download(url.format(self.pyversion), filename="tmp\\installer.exe")
+        tools.download(url.format(version), filename="tmp\\installer.exe")
         self.run("tmp\\installer.exe /quiet /layout")
         dst = os.path.join(self.build_folder, "embedded_python")
         self.run(f"msiexec.exe /a {self.build_folder}\\tmp\\dev.msi targetdir={dst}")
         tools.rmdir("tmp")
 
     def build(self):
-        self._get_binaries()
-        self._get_headers_and_lib()
+        version = str(self.options.version)
+        self._get_binaries(version)
+        self._get_headers_and_lib(version)
 
-        if not self.options.pip_packages:
+        if not self.options.packages:
             return
 
         # Enable site-packages, i.e. additional non-system packages
-        pyver = "".join(self.pyversion.split(".")[:2]) # e.g. 3.7.3 -> 37
+        pyver = "".join(version.split(".")[:2]) # e.g. 3.7.3 -> 37
         tools.replace_in_file("embedded_python/python{}._pth".format(pyver), "#import site", "import site")
 
-        packages = self.options.pip_packages.value
-        packages += " setuptools==41.0.1"  # some modules always assume it's installed (e.g. pytest)
         target = self.build_folder + "/embedded_python/Lib/site-packages"
+        packages = self.options.packages.value
+        packages += " setuptools==45.2.0"  # some modules always assume it's installed (e.g. pytest)
         self.run(f'{sys.executable} -m pip install --no-deps --python-version {pyver} --target "{target}" {packages}')
 
     def package(self):

readme.md

@@ -4,8 +4,9 @@ Embedded python distribution
 This conan recipe builds an embedded Python distribution which can be placed directly into the `bin` directory of an application for its exclusive use.
 Windows-only for now.
 
-The base recipe uses the stock embeddable Python version from the python.org website. 
-If the `embedded_python:pip_packages=...` option is passed, the recipe will `pip install` additional packages. 
-The contents of that option is hashed by Conan, so `embedded_python:pip_packages="numpy=1.15 scipy=1.2"` is clearly different from `embedded_python:pip_packages="numpy=1.16 scipy=1.3"`.
-That way, the full Python environment is controlled via Conan. 
+The base recipe uses the stock embeddable Python version from the python.org website.
+The Python version is specified using the mandatory `embedded_python:version=x.y.z` option.
+If the `embedded_python:packages=...` option is passed, the recipe will `pip install` additional packages. 
+The contents of that option is hashed by Conan, so `embedded_python:packages="numpy=1.15 scipy=1.2"` is clearly different from `embedded_python:packages="numpy=1.16 scipy=1.3"`.
+That way, the full Python environment is controlled via Conan.
 The initial build of a new Python environment can take some time but after that it's caches as a binary package.

test_package/conanfile.py

@@ -4,6 +4,9 @@
 
 class TestEmbeddedPython(ConanFile):
     settings = "os"
+    default_options = (
+        "embedded_python:version=3.7.6", 
+    )
 
     def imports(self):
         import embedded_python_tools