Package Revisions

.ci/jenkins/Jenkinsfile

@@ -1,26 +1,29 @@
 // ########## CONFIGURATION ##################
 def full_py_vers = false
-def test_v2 = false
+def test_revisions = true
 // ############################
 
+if(env.JOB_NAME == "ConanNightly"){
+    full_py_vers = true
+    test_revisions = true
+}
 
 if (env.BRANCH_NAME =~ /(^release.*)|(^master)/) {
     full_py_vers = true
 }
 
 def slaves = ['Linux', 'Windows', 'Macos']
-def flavors = ["no_revisions"]
-
-
+def flavors = ["blocked_v2"]
+if(test_revisions){
+    flavors = ["blocked_v2", "disabled_revisions", "enabled_revisions"]
+}
 def pyvers  = ['py36', 'py27']
 def api_confs = ["v1"]
 
 if (full_py_vers){
     pyvers = ['py37', 'py36', 'py34', 'py27']
 }
-else if(test_v2){
-    api_confs = ["v1", "v2"]
-}
+
 
 
 def module = "\"conans.test\""
@@ -39,94 +42,77 @@ try{
         for (x in slaves) {
             def slave = x
             for (y in pyvers) {
-                for (z in api_confs){
-                    def pyver = y
-                    if(slave != "Linux" && pyver=="py37"){
-                        continue;
-                    }
-
-                    def api_conf = z
-                    def name = "${slave} - ${flavor} - ${pyver} - API${api_conf}"
-
-                    if (api_conf == "v2" && slave != "Linux"){
-                        continue;
-                    }
-
-                    if (flavor == "revisions" && api_conf == "v1"){
-                        continue;
-                    }
-
-                    if (flavor == "revisions" && pyver == "py34"){
-                        continue;
-                    }
+                def pyver = y
+                if(slave != "Linux" && pyver=="py37"){
+                    continue;
+                }
+                def name = "${slave} - ${flavor} - ${pyver}"
+                builders[name] = {
+                    node(slave) {
+                        stage(name){
+                            def workdir
+                            def sourcedir
+                            def base_source
+                            lock('source_code') { // Prepare a clean new directory with the sources
+                                try{
+                                    step ([$class: 'WsCleanup'])
+                                }
+                                catch(e){
+                                    echo "Cannot clean WS"
+                                }
 
-                    builders[name] = {
-                        node(slave) {
-                            stage(name){
-                                def workdir
-                                def sourcedir
-                                def base_source
-                                lock('source_code') { // Prepare a clean new directory with the sources
-                                    try{
-                                        step ([$class: 'WsCleanup'])
-                                    }
-                                    catch(e){
-                                        echo "Cannot clean WS"
-                                    }
+                                def vars = checkout scm
+                                commit = vars["GIT_COMMIT"].substring(0, 4)
+                                branch = vars["GIT_BRANCH"]
+                                def base_dir = (slave == "Windows") ? win_tmp_base : rest_tmp_base
+                                workdir = "${base_dir}${commit}/${pyver}/${flavor}"
+                                base_source = "${base_dir}source/${commit}"
+                                sourcedir = "${base_source}/${pyver}/${flavor}"
+                                while(fileExists(sourcedir)){
+                                    sourcedir = sourcedir + "_"
+                                }
 
-                                    def vars = checkout scm
-                                    commit = vars["GIT_COMMIT"].substring(0, 4)
-                                    branch = vars["GIT_BRANCH"]
-                                    def base_dir = (slave == "Windows") ? win_tmp_base : rest_tmp_base
-                                    workdir = "${base_dir}${commit}/${pyver}/${api_conf}"
-                                    base_source = "${base_dir}source/${commit}"
-                                    sourcedir = "${base_source}/${pyver}/${api_conf}"
-                                    while(fileExists(sourcedir)){
-                                        sourcedir = sourcedir + "_"
+                                dir(base_source){ // Trick to create the parent
+                                    def escaped_ws = "${WORKSPACE}".replace("\\", "/")
+                                    def cmd = "python -c \"import shutil; shutil.copytree('${escaped_ws}', '${sourcedir}')\""
+                                    if (slave == "Windows"){
+                                        bat(script: cmd)
                                     }
-
-                                    dir(base_source){ // Trick to create the parent
-                                        def escaped_ws = "${WORKSPACE}".replace("\\", "/")
-                                        def cmd = "python -c \"import shutil; shutil.copytree('${escaped_ws}', '${sourcedir}')\""
-                                        if (slave == "Windows"){
-                                            bat(script: cmd)
-                                        }
-                                        else{
-                                            sh(script: cmd)
-                                        }
+                                    else{
+                                        sh(script: cmd)
                                     }
                                 }
-                                if(slave == "Linux"){
-                                    sh "docker pull lasote/conantests"
-                                    docker.image('lasote/conantests').inside("-e CONAN_USER_HOME=${sourcedir} -v${sourcedir}:${sourcedir}") {
-                                        sh(script: "python ${runner} ${module} ${pyver} ${sourcedir} ${workdir} -e rest_api ${numcores}  --server_api=${api_conf} -f ${flavor}")
-                                    }
+                            }
+                            if(slave == "Linux"){
+                                sh "docker pull lasote/conantests"
+                                docker.image('lasote/conantests').inside("-e CONAN_USER_HOME=${sourcedir} -v${sourcedir}:${sourcedir}") {
+                                    sh(script: "python ${runner} ${module} ${pyver} ${sourcedir} ${workdir} -e rest_api ${numcores} --flavor ${flavor}")
                                 }
-                                else if(slave == "Windows"){
-                                    try{
+                            }
+                            else if(slave == "Windows"){
+                                try{
 
-                                      withEnv(["CONAN_TEST_FOLDER=${workdir}"]){
-                                        bat(script: "python ${runner} ${module} ${pyver} ${sourcedir} \"${workdir}\" -e rest_api -e windows_ci_excluded ${numcores} --server_api=${api_conf} -f ${flavor}")
-                                      }
-                                    }
-                                    finally{
-                                      bat(script: "rd /s /q \"${workdir}\"")
-                                      bat(script: "rd /s /q \"${sourcedir}\"")
-                                    }
+                                  withEnv(["CONAN_TEST_FOLDER=${workdir}"]){
+                                    bat(script: "python ${runner} ${module} ${pyver} ${sourcedir} \"${workdir}\" -e rest_api -e windows_ci_excluded ${numcores} --flavor ${flavor}")
+                                  }
                                 }
-                                else if(slave == "Macos"){
-                                    try{
-                                      withEnv(['PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin']) {
-                                          sh(script: "python ${runner} ${module} ${pyver} ${sourcedir} ${workdir} -e rest_api ${numcores} --server_api=${api_conf} -f ${flavor}")
-                                      }
-                                    }
-                                    finally{
-                                      sh(script: "rm -rf ${workdir}")
-                                      sh(script: "rm -rf ${sourcedir}")
-                                    }
+                                finally{
+                                  bat(script: "rd /s /q \"${workdir}\"")
+                                  bat(script: "rd /s /q \"${sourcedir}\"")
+                                }
+                            }
+                            else if(slave == "Macos"){
+                                try{
+                                  withEnv(['PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin']) {
+                                      sh(script: "python ${runner} ${module} ${pyver} ${sourcedir} ${workdir} -e rest_api ${numcores} --flavor ${flavor}")
+                                  }
+                                }
+                                finally{
+                                  sh(script: "rm -rf ${workdir}")
+                                  sh(script: "rm -rf ${sourcedir}")
                                 }
-                                //step([$class: 'JUnitResultArchiver', testResults: '**/nosetests.xml'])
                             }
+                            //step([$class: 'JUnitResultArchiver', testResults: '**/nosetests.xml'])
                         }
                     }
                 }
@@ -195,6 +181,6 @@ if(env.JOB_NAME == "ConanNightly"){
 def build_linux(){
     sh "docker pull lasote/conantests"
     docker.image('lasote/conantests').inside("-e CONAN_USER_HOME=${sourcedir} -v${sourcedir}:${sourcedir}") {
-        sh(script: "python ${runner} ${module} ${pyver} ${sourcedir} ${workdir} -e rest_api ${numcores}  --server_api=${api_conf}")
+        sh(script: "python ${runner} ${module} ${pyver} ${sourcedir} ${workdir} -e rest_api ${numcores}")
     }
 }

.ci/jenkins/runner.py

@@ -9,8 +9,8 @@
                "Darwin": macpylocation}[platform.system()]
 
 
-def run_tests(module_path, pyver, source_folder, tmp_folder, flavor,
-              excluded_tags, num_cores=3, verbosity=None, server_api=None):
+def run_tests(module_path, pyver, source_folder, tmp_folder, flavor, excluded_tags,
+              num_cores=3, verbosity=None):
 
     verbosity = verbosity or (2 if platform.system() == "Windows" else 1)
     venv_dest = os.path.join(tmp_folder, "venv")
@@ -20,11 +20,6 @@ def run_tests(module_path, pyver, source_folder, tmp_folder, flavor,
                             "bin" if platform.system() != "Windows" else "Scripts",
                             "activate")
 
-    if flavor == "revisions":
-        excluded_tags.append("only_without_revisions")
-    elif flavor == "no_revisions":
-        excluded_tags.append("only_revisions")
-
     exluded_tags_str = '-A "%s"' % " and ".join(["not %s" % tag for tag in excluded_tags]) if excluded_tags else ""
 
     pyenv = pylocations[pyver]
@@ -33,7 +28,7 @@ def run_tests(module_path, pyver, source_folder, tmp_folder, flavor,
     debug_traces = ""  # "--debug=nose,nose.result" if platform.system() == "Darwin" and pyver != "py27" else ""
     # pyenv = "/usr/local/bin/python2"
     multiprocess = ("--processes=%s --process-timeout=1000 "
-                    "--process-restartworker --with-coverage" % num_cores) if platform.system() != "Darwin" or pyver == "py27" else ""
+                    "--process-restartworker --with-coverage" % num_cores) if platform.system() != "Darwin" else ""
 
     if num_cores <= 1:
         multiprocess = ""
@@ -71,10 +66,8 @@ def run_tests(module_path, pyver, source_folder, tmp_folder, flavor,
     env["PYTHONPATH"] = source_folder
     env["CONAN_LOGGING_LEVEL"] = "50" if platform.system() == "Darwin" else "50"
     env["CHANGE_AUTHOR_DISPLAY_NAME"] = ""
-    if server_api == "v2":
-        env["CONAN_TESTING_SERVER_V2_ENABLED"] = "1"
-    if flavor == "revisions":
-        env["CONAN_TESTING_SERVER_REVISIONS_ENABLED"] = "1"
+    env["CONAN_API_V2_BLOCKED"] = "True" if flavor == "blocked_v2" else "False"
+    env["CONAN_CLIENT_REVISIONS_ENABLED"] = "True" if flavor == "enabled_revisions" else "False"
 
     with chdir(source_folder):
         with environment_append(env):
@@ -103,12 +96,10 @@ def run(command):
     parser.add_argument('source_folder', help='Folder containing the conan source code')
     parser.add_argument('tmp_folder', help='Folder to create the venv inside')
     parser.add_argument('--num_cores', type=int, help='Number of cores to use', default=3)
-    parser.add_argument('--server_api', help='Test all with v1 or v2', default="v1")
     parser.add_argument('--exclude_tag', '-e', nargs=1, action=Extender,
                         help='Tags to exclude from testing, e.g.: rest_api')
-    parser.add_argument('--flavor', '-f', help='Flavor (revisions, no_revisions)')
-
+    parser.add_argument('--flavor', '-f', help='enabled_revisions, disabled_revisions, blocked_v2')
     args = parser.parse_args()
 
     run_tests(args.module, args.pyver, args.source_folder, args.tmp_folder, args.flavor,
-              args.exclude_tag, num_cores=args.num_cores, server_api=args.server_api)
+              args.exclude_tag, num_cores=args.num_cores)

.gitignore

@@ -102,4 +102,4 @@ cacert.pem
 .noseids
 
 # add excluded
-!conans/client/build
+!conans/client/build

conans/__init__.py

@@ -13,9 +13,9 @@
 
 # complex_search: With ORs and not filtering by not restricted settings
 COMPLEX_SEARCH_CAPABILITY = "complex_search"
-API_V2 = "api_v2"
 CHECKSUM_DEPLOY = "checksum_deploy"  # Only when v2
 REVISIONS = "revisions"  # Only when enabled in config, not by default look at server_launcher.py
-SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, ]  # Still without v2 because it is changing
+SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, REVISIONS]  # Server is always with revisions
+DEFAULT_REVISION_V1 = "0"
 
 __version__ = '1.10.0-dev'

conans/client/client_cache.py

@@ -1,24 +1,27 @@
 import os
-import shutil
-from os.path import join, normpath
 from collections import OrderedDict
+from contextlib import contextmanager
+from os.path import join, normpath
+
+import shutil
 
+from conans import DEFAULT_REVISION_V1
 from conans.client.conf import ConanClientConfigParser, default_client_conf, default_settings_yml
 from conans.client.conf.detect import detect_defaults_settings
 from conans.client.output import Color
 from conans.client.profile_loader import read_profile
 from conans.client.remote_registry import migrate_registry_file, dump_registry, default_remotes
 from conans.errors import ConanException
 from conans.model.manifest import FileTreeManifest
+from conans.model.package_metadata import PackageMetadata
 from conans.model.profile import Profile
 from conans.model.ref import ConanFileReference
 from conans.model.settings import Settings
-from conans.paths import SimplePaths, PUT_HEADERS, check_ref_case,\
+from conans.paths import SimplePaths, PUT_HEADERS, check_ref_case, \
     CONAN_MANIFEST
+from conans.unicode import get_cwd
 from conans.util.files import save, load, normalize, list_folder_subdirs
 from conans.util.locks import SimpleLock, ReadLock, WriteLock, NoLock, Lock
-from conans.unicode import get_cwd
-
 
 CONAN_CONF = 'conan.conf'
 CONAN_SETTINGS = "settings.yml"
@@ -293,6 +296,25 @@ def invalidate(self):
         self._default_profile = None
         self._no_lock = None
 
+    # Metadata
+    def load_metadata(self, conan_reference):
+        try:
+            text = load(self.package_metadata(conan_reference))
+            return PackageMetadata.loads(text)
+        except IOError:
+            return PackageMetadata()
+
+    @contextmanager
+    def update_metadata(self, conan_reference):
+        metadata = self.load_metadata(conan_reference)
+        yield metadata
+        save(self.package_metadata(conan_reference), metadata.dumps())
+
+    # Revisions
+    def package_summary_hash(self, package_ref):
+        readed_digest, expected_digest = self.package_manifests(package_ref)
+        return expected_digest.summary_hash
+
 
 def _mix_settings_with_env(settings):
     """Reads CONAN_ENV_XXXX variables from environment

conans/client/cmd/download.py

@@ -1,9 +1,9 @@
 import os
 
-from conans.model.ref import PackageReference, ConanFileReference
 from conans.client.output import ScopedOutput
 from conans.client.source import complete_recipe_sources
 from conans.errors import NotFoundException
+from conans.model.ref import PackageReference, ConanFileReference
 
 
 def download(reference, package_ids, remote_name, recipe, registry, remote_manager,