Skip to content

Commit f461428

Browse files
authored
Merge pull request #37 from typecode/use-project-name-for-prod-builds
Use project name for prod builds
2 parents 5167303 + c6a13c3 commit f461428

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

sykle/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .sykle import Sykle
22

3-
__version__ = '0.5.0'
3+
__version__ = Sykle.version
44

55
Sykle

sykle/config.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ class ConfigV2(Config):
155155
{
156156
// specifies which version of .sykle.json is being used
157157
"version": 2,
158+
// name of the project
159+
"project_name": "tc-project",
158160
// docker compose service to use for commands by default
159161
"default_service": "django",
160162
// list of commands needed to run unittests (run sequentially)
@@ -297,6 +299,7 @@ def init(enable_print=False):
297299
with open(ConfigV2.FILENAME, 'w+') as file:
298300
json.dump(collections.OrderedDict([
299301
("version", 2),
302+
("project_name", None),
300303
("default_service", None),
301304
("unittest", [{"service": None, "command": None}]),
302305
("e2e", [{"service": None, "command": None}]),
@@ -326,9 +329,11 @@ def init(enable_print=False):
326329
.format(ConfigV2.FILENAME)
327330
)
328331

329-
@property
330-
def project_name(self):
331-
return os.path.basename(os.getcwd())
332+
def get_project_name(self, docker_type='dev'):
333+
if docker_type in ['dev', 'test']:
334+
return os.path.basename(os.getcwd())
335+
else:
336+
return self.raw.get('project_name', 'tc-project')
332337

333338
@property
334339
def default_service(self):

sykle/sykle.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33

44
class Sykle():
5+
version = '0.5.0'
56
"""
67
Class for programatically invoking Sykle
78
"""
8-
99
def __init__(self, config, debug=False):
1010
self.config = config
1111
self.debug = debug
@@ -60,7 +60,7 @@ def dc(self, input, docker_type='dev', deployment=None):
6060

6161
call_docker_compose(
6262
input,
63-
project_name=self.config.project_name,
63+
project_name=self.config.get_project_name(docker_type),
6464
debug=self.debug, **extras
6565
)
6666

0 commit comments

Comments
 (0)