Skip to content

Commit

Permalink
Pull request #90: Use a persistent connection to Artifactory for down…
Browse files Browse the repository at this point in the history
…loading

Merge in DEV/voyager from feature/persistent-connection to master

* commit '0b35a33dffd56263753981734b38acc969396179':
  Release notes, version bump.
  Use a persistent connection to Artifactory for downloading
  • Loading branch information
barometz committed Aug 28, 2023
2 parents a76c6a7 + 0b35a33 commit 63cd48d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion deploy/Installer.iss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ###########################
#define Release "1.16.3"
#define Release "1.16.4"
// ###########################

#define AppName "voyager"
Expand Down
3 changes: 3 additions & 0 deletions docs/release-notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Release notes

### [1.16.4]
- Use a persistent HTTP connection to make `voyager install` faster.

### [1.16.3]
- Preserve symlinks during `voyager deploy`.

Expand Down
8 changes: 6 additions & 2 deletions voyager/artifactdownloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import click
from pathlib import Path
from artifactory import ArtifactoryPath
import requests
from semver import valid_range, max_satisfying
import semver

Expand All @@ -34,6 +35,9 @@ def __init__(self, libraries: list, are_build_tools: bool, download_runtime_deps
self.build_tools = are_build_tools
self.download_runtime_deps = download_runtime_deps

self.artifactory_session = requests.Session()
self.artifactory_session.headers['X-JFrog-Art-Api'] = self.config.api_key

def clear_directory(self):
try:
shutil.rmtree(self._download_dir)
Expand Down Expand Up @@ -196,7 +200,7 @@ def find_versions_for_package(self, repo, library, override_archs):
archs = self._get_active_archs()
versions = []

path = ArtifactoryPath(self.config.artifactory_url, apikey=self.config.api_key)
path = ArtifactoryPath(self.config.artifactory_url, session=self.artifactory_session)

args = [
"items.find",
Expand Down Expand Up @@ -237,7 +241,7 @@ def _find_download_extract_package(self, repo, library, version, output_dir, ove
for arch in archs:
package_dir = f"{repo}/{library}/{version}/{arch}"
url = f"{self.config.artifactory_url}/{package_dir}/voyager_package.tgz"
path = ArtifactoryPath(url, apikey=self.config.api_key)
path = ArtifactoryPath(url, session=self.artifactory_session)

if path.exists():
click.echo(click.style(f'{arch} @ {version} ', fg='bright_blue'), nl=False)
Expand Down
2 changes: 1 addition & 1 deletion voyager/voyager.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import voyager.doc as doc_server
import voyager.package_update as package_updater

VERSION = "1.16.3"
VERSION = "1.16.4"


@click.group()
Expand Down

0 comments on commit 63cd48d

Please sign in to comment.