Skip to content

Commit 9f1c199

Browse files
authored
Merge pull request #59 from turbulent/github-update
update substance to use github instead of bintray ( deprecated )
2 parents 53a4482 + 8b89467 commit 9f1c199

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

release.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash -eux
22

33
rm -f dist/*
4+
python3 setup.py install
45
python3 setup.py sdist bdist_wheel
56
sleep 5
67
twine upload dist/*

substance/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.2.2'
1+
__version__ = '1.3.1'

substance/box.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ def __init__(self, core, name, version, namespace, registry=None, boxstring=None
3232
self.archiveSHA1 = archiveSHA1
3333

3434
def getRegistryURL(self):
35-
return "https://%(registry)s/%(namespace)s/%(name)s/%(version)s.json" % self.__dict__
35+
return "https://%(registry)s/%(namespace)s/%(name)s/releases/download/%(version)s/%(name)s-%(version)s.json" % self.__dict__
3636

3737
def getArchiveURL(self):
38-
return "https://%(registry)s/%(namespace)s/%(name)s/%(version)s.box" % self.__dict__
38+
return "https://%(registry)s/%(namespace)s/%(name)s/releases/download/%(name)s-%(version)s.box" % self.__dict__
3939

4040
def getDescriptor(self):
4141
return {'name': self.name, 'registry': self.registry, 'namespace': self.namespace}
@@ -79,14 +79,13 @@ def parseBoxString(name):
7979
if len(parts) > 1:
8080
box['registry'] = parts[1]
8181
else:
82-
box['registry'] = "dl.bintray.com/turbulent/substance-images"
82+
box['registry'] = "github.com"
8383

8484
parts = boxstring.split("/", 1)
8585
if len(parts) <= 1:
8686
return Fail(InvalidBoxName("Name \"%s\" does not reference a valid box name: Missing namespace." % name))
8787

8888
(box['namespace'], imagestring) = parts
89-
# substance-box:0.1
9089

9190
imageparts = imagestring.split(":", 1)
9291
if len(imageparts) > 1:

substance/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def __delattr__(self, name):
2323
BOXES="boxes"
2424
)
2525

26-
DefaultEngineBox = 'turbulent/substance-box:1.1'
26+
DefaultEngineBox = 'turbulent/substance-box:1.3'
2727

2828
EngineStates = Constants(
2929
RUNNING="running",

0 commit comments

Comments
 (0)