Skip to content

Updated virtualenv version in the devpibootstrap #7

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Updated virtualenv version in the devpibootstrap #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abf124a
Updated virtualenv version in the devpibootstrap
Jul 18, 2017
579915f
Writes testspec file containing the identifier for the build
Jul 18, 2017
7551809
Corrected test after changing url to virtualenv
Sep 26, 2017
8654296
Bumped version
Sep 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion devpi_jenkins/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2.0.0'
__version__ = '2.0.2'
3 changes: 3 additions & 0 deletions devpi_jenkins/devpibootstrap.py.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@ def main(indexurl = "{INDEXURL}",
log("starting Jenkins job for %s" % testspec)
basedir = os.getcwd()

with open('testspec', 'w') as f:
f.write(testspec)

# prepare a TMPDIR that resides in the Jenkins workspace
# for installing devpi itself
OLD_TMPDIR = os.environ.get("TMPDIR")
Expand Down
4 changes: 2 additions & 2 deletions devpi_jenkins/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ def devpiserver_on_upload_sync(log, application_url, stage, project, version):
INDEXURL=application_url + "/" + stage.name,
VIRTUALENVTARURL=(
application_url +
"/root/pypi/+f/f61/cdd983d2c4e6a/"
"virtualenv-1.11.6.tar.gz"),
"/root/pypi/+f/44e/19f4134906fe2/"
"virtualenv-15.1.0.tar.gz"),
TESTSPEC='%s==%s' % (project, version),
DEVPI_INSTALL_INDEX=application_url + "/" + stage.name + "/+simple/")
inputfile = py.io.BytesIO(source.encode("ascii"))
Expand Down
2 changes: 1 addition & 1 deletion tests/test_jenkins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ def test_upload_with_jenkins(mapp, reqmock):
script = fs.getfirst("file0")
assert script.startswith(b'#!/')
assert b'indexurl = "http://localhost/user1/dev"' in script
assert b'virtualenvtar_url = "http://localhost/root/pypi/+f/f61/cdd983d2c4e6a/virtualenv-1.11.6.tar.gz"' in script
assert b'virtualenvtar_url = "http://localhost/root/pypi/+f/44e/19f4134906fe2/virtualenv-15.1.0.tar.gz"' in script
assert b'devpi_install_index = "http://localhost/user1/dev/+simple/"' in script
assert b'testspec = "pkg1==2.6"' in script