Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Binary registry #3726

Merged
merged 19 commits into from Oct 18, 2018

Merged develop

  • Loading branch information...
lasote committed Oct 9, 2018
commit 3e0bcd9d1b5508cfc2a8a7c6e655d1d924e4936c
@@ -95,10 +95,12 @@ def _upload(self, conan_file, conan_ref, packages_ids, retry, retry_wait,
reference=conan_ref, remote=recipe_remote)

if policy != UPLOAD_POLICY_FORCE:
self._check_recipe_date(conan_ref, recipe_remote)
remote_manifest = self._check_recipe_date(conan_ref, recipe_remote)
else:
remote_manifest = None

self._user_io.out.info("Uploading %s to remote '%s'" % (str(conan_ref), recipe_remote.name))
self._upload_recipe(conan_ref, retry, retry_wait, policy, recipe_remote)
self._upload_recipe(conan_ref, retry, retry_wait, policy, recipe_remote, remote_manifest)

recorder.add_recipe(str(conan_ref), recipe_remote.name, recipe_remote.url)

@@ -1,19 +1,20 @@
import errno
import os
import random
import shlex
import stat
import sys
import tempfile
import unittest
from collections import Counter
from contextlib import contextmanager
from io import StringIO
import subprocess
import unittest
import tempfile
import platform

import bottle
import requests
import shutil
import six
import subprocess
import threading
import time
import uuid
@@ -22,7 +23,7 @@
from webtest.app import TestApp

from conans import __version__ as CLIENT_VERSION, tools
from conans.client.client_cache import ClientCache, REGISTRY_JSON
from conans.client.client_cache import ClientCache
from conans.client.command import Command
from conans.client.conan_api import migrate_and_get_client_cache, Conan, get_request_timeout
from conans.client.conan_command_output import CommandOutputer
@@ -32,7 +33,8 @@
from conans.client.remote_registry import RemoteRegistry, dump_registry
from conans.client.rest.conan_requester import ConanRequester
from conans.client.rest.uploader_downloader import IterableToFileAdapter
from conans.client.tools.scm import Git
from conans.client.tools.files import chdir
from conans.client.tools.scm import Git, SVN
from conans.client.tools.win import get_cased_path
from conans.client.userio import UserIO
from conans.model.manifest import FileTreeManifest
@@ -49,7 +51,6 @@
from conans.util.log import logger



def inc_recipe_manifest_timestamp(client_cache, conan_ref, inc_time):
conan_ref = ConanFileReference.loads(str(conan_ref))
path = client_cache.export(conan_ref)
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.