Skip to content

Commit

Permalink
'@' character is now allowed in Version take names
Browse files Browse the repository at this point in the history
  • Loading branch information
@eoyilmaz
eoyilmaz committed Oct 30, 2014
1 parent d78a33e commit 1fd2e01
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 66 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG
View file
Expand Up @@ -2,6 +2,11 @@
Stalker Changes
===============

0.2.10.3
========

* **New:** '@' character is now allowed in Version take names.

0.2.10.2
========

Expand Down
10 changes: 8 additions & 2 deletions docs/source/tutorial.rst
View file
Expand Up @@ -520,10 +520,16 @@ have created at the beginning of this tutorial::
from stalker import TaskJugglerScheduler

my_studio.scheduler = TaskJugglerScheduler()
my_studio.schedule(scheduled_by=me)
my_studio.duration = datetime.timedelta(days=365) # we are setting the
my_studio.schedule(scheduled_by=me) # duration to 1 year just
# to be sure that TJ3
# will not complain
# about the project is not
# fitting in to the time
# frame.

This should take a little while depending to your projects size (around 1-2
seconds for this tutorial, but around ~10 min for a project with 5000+ tasks).
seconds for this tutorial, but around ~15 min for a project with 15000+ tasks).

When it is finished all of your tasks now have their ``computed_start`` and
``computed_end`` values filled with proper data. Now check the start and end
Expand Down
2 changes: 1 addition & 1 deletion stalker/__init__.py
View file
Expand Up @@ -23,7 +23,7 @@
See docs for more information.
"""

__version__ = '0.2.10.2'
__version__ = '0.2.10.3'


import sys
Expand Down
2 changes: 1 addition & 1 deletion stalker/models/version.py
View file
Expand Up @@ -207,7 +207,7 @@ def _format_take_name(cls, take_name):
"""
# remove unnecessary characters
take_name = re.sub(
r"([^a-zA-Z0-9\s_\-]+)", r"", take_name
r"([^a-zA-Z0-9\s_\-@]+)", r"", take_name
).strip()

# replace empty spaces with underscores
Expand Down
86 changes: 43 additions & 43 deletions tests/models/test_project.py
View file
Expand Up @@ -1328,51 +1328,51 @@ def test_to_tjp_is_working_properly(self):
expected_tjp_temp = Template("""
task Project_{{project.id}} "Test Project" {
task Sequence_{{sequence1.id}} "Seq1" {
task Sequence_{{sequence1.id}} "Sequence_{{sequence1.id}}" {
effort 1.0h
allocate User_{{user1.id}}
}
task Sequence_{{sequence2.id}} "Seq2" {
task Sequence_{{sequence2.id}} "Sequence_{{sequence2.id}}" {
effort 1.0h
allocate User_{{user2.id}}
}
task Sequence_{{sequence3.id}} "Seq3" {
task Sequence_{{sequence3.id}} "Sequence_{{sequence3.id}}" {
effort 1.0h
allocate User_{{user3.id}}
}
task Sequence_{{sequence4.id}} "Seq4" {
task Sequence_{{sequence4.id}} "Sequence_{{sequence4.id}}" {
task Task_{{task4.id}} "Test Task 4" {
task Task_{{task4.id}} "Task_{{task4.id}}" {
effort 1.0h
allocate User_{{user4.id}}
}
task Task_{{task5.id}} "Test Task 5" {
task Task_{{task5.id}} "Task_{{task5.id}}" {
effort 1.0h
allocate User_{{user5.id}}
}
task Task_{{task6.id}} "Test Task 6" {
task Task_{{task6.id}} "Task_{{task6.id}}" {
Expand All @@ -1381,27 +1381,27 @@ def test_to_tjp_is_working_properly(self):
allocate User_{{user6.id}}
}
}
task Sequence_{{sequence5.id}} "Seq5" {
task Sequence_{{sequence5.id}} "Sequence_{{sequence5.id}}" {
task Task_{{task7.id}} "Test Task 7" {
task Task_{{task7.id}} "Task_{{task7.id}}" {
effort 1.0h
allocate User_{{user7.id}}
}
task Task_{{task8.id}} "Test Task 8" {
task Task_{{task8.id}} "Task_{{task8.id}}" {
effort 1.0h
allocate User_{{user8.id}}
}
task Task_{{task9.id}} "Test Task 9" {
task Task_{{task9.id}} "Task_{{task9.id}}" {
Expand All @@ -1410,37 +1410,37 @@ def test_to_tjp_is_working_properly(self):
allocate User_{{user9.id}}
}
}
task Sequence_{{sequence6.id}} "Seq6" {
task Sequence_{{sequence6.id}} "Sequence_{{sequence6.id}}" {
}
task Sequence_{{sequence7.id}} "Seq7" {
task Sequence_{{sequence7.id}} "Sequence_{{sequence7.id}}" {
}
task Shot_{{shot1.id}} "{{shot1.name}}" {
task Shot_{{shot1.id}} "Shot_{{shot1.id}}" {
task Task_{{task10.id}} "Test Task 10" {
task Task_{{task10.id}} "Task_{{task10.id}}" {
effort 10.0h
allocate User_{{user10.id}}
}
task Task_{{task11.id}} "Test Task 11" {
task Task_{{task11.id}} "Task_{{task11.id}}" {
effort 1.0h
allocate User_{{user1.id}} , User_{{user2.id}}
}
task Task_{{task12.id}} "Test Task 12" {
task Task_{{task12.id}} "Task_{{task12.id}}" {
Expand All @@ -1449,27 +1449,27 @@ def test_to_tjp_is_working_properly(self):
allocate User_{{user3.id}} , User_{{user4.id}}
}
}
task Shot_{{shot2.id}} "{{shot2.name}}" {
task Shot_{{shot2.id}} "Shot_{{shot2.id}}" {
task Task_{{task13.id}} "Test Task 13" {
task Task_{{task13.id}} "Task_{{task13.id}}" {
effort 1.0h
allocate User_{{user5.id}} , User_{{user6.id}}
}
task Task_{{task14.id}} "Test Task 14" {
task Task_{{task14.id}} "Task_{{task14.id}}" {
effort 1.0h
allocate User_{{user7.id}} , User_{{user8.id}}
}
task Task_{{task15.id}} "Test Task 15" {
task Task_{{task15.id}} "Task_{{task15.id}}" {
Expand All @@ -1478,27 +1478,27 @@ def test_to_tjp_is_working_properly(self):
allocate User_{{user9.id}} , User_{{user10.id}}
}
}
task Shot_{{shot3.id}} "{{shot3.name}}" {
task Shot_{{shot3.id}} "Shot_{{shot3.id}}" {
task Task_{{task16.id}} "Test Task 16" {
task Task_{{task16.id}} "Task_{{task16.id}}" {
effort 1.0h
allocate User_{{user1.id}} , User_{{user2.id}} , User_{{user3.id}}
}
task Task_{{task17.id}} "Test Task 17" {
task Task_{{task17.id}} "Task_{{task17.id}}" {
effort 1.0h
allocate User_{{user4.id}} , User_{{user5.id}} , User_{{user6.id}}
}
task Task_{{task18.id}} "Test Task 18" {
task Task_{{task18.id}} "Task_{{task18.id}}" {
Expand All @@ -1507,27 +1507,27 @@ def test_to_tjp_is_working_properly(self):
allocate User_{{user7.id}} , User_{{user8.id}} , User_{{user9.id}}
}
}
task Shot_{{shot4.id}} "{{shot4.name}}" {
task Shot_{{shot4.id}} "Shot_{{shot4.id}}" {
task Task_{{task19.id}} "Test Task 19" {
task Task_{{task19.id}} "Task_{{task19.id}}" {
effort 1.0h
allocate User_{{user1.id}} , User_{{user2.id}} , User_{{user10.id}}
}
task Task_{{task20.id}} "Test Task 20" {
task Task_{{task20.id}} "Task_{{task20.id}}" {
effort 1.0h
allocate User_{{user3.id}} , User_{{user4.id}} , User_{{user5.id}}
}
task Task_{{task21.id}} "Test Task 21" {
task Task_{{task21.id}} "Task_{{task21.id}}" {
Expand All @@ -1536,45 +1536,45 @@ def test_to_tjp_is_working_properly(self):
allocate User_{{user6.id}} , User_{{user7.id}} , User_{{user8.id}}
}
}
task Asset_{{asset1.id}} "Test Asset 1" {
task Asset_{{asset1.id}} "Asset_{{asset1.id}}" {
effort 1.0h
allocate User_{{user2.id}}
}
task Asset_{{asset2.id}} "Test Asset 2" {
task Asset_{{asset2.id}} "Asset_{{asset2.id}}" {
}
task Asset_{{asset3.id}} "Test Asset 3" {
task Asset_{{asset3.id}} "Asset_{{asset3.id}}" {
}
task Asset_{{asset4.id}} "Test Asset 4" {
task Asset_{{asset4.id}} "Asset_{{asset4.id}}" {
task Task_{{task22.id}} "Test Task 22" {
task Task_{{task22.id}} "Task_{{task22.id}}" {
effort 1.0h
allocate User_{{user1.id}} , User_{{user9.id}} , User_{{user10.id}}
}
task Task_{{task23.id}} "Test Task 23" {
task Task_{{task23.id}} "Task_{{task23.id}}" {
effort 1.0h
allocate User_{{user2.id}} , User_{{user3.id}}
}
task Task_{{task24.id}} "Test Task 24" {
task Task_{{task24.id}} "Task_{{task24.id}}" {
Expand All @@ -1583,27 +1583,27 @@ def test_to_tjp_is_working_properly(self):
allocate User_{{user4.id}} , User_{{user5.id}}
}
}
task Asset_{{asset5.id}} "Test Asset 5" {
task Asset_{{asset5.id}} "Asset_{{asset5.id}}" {
task Task_{{task25.id}} "Test Task 25" {
task Task_{{task25.id}} "Task_{{task25.id}}" {
effort 1.0h
allocate User_{{user6.id}} , User_{{user7.id}}
}
task Task_{{task26.id}} "Test Task 26" {
task Task_{{task26.id}} "Task_{{task26.id}}" {
effort 1.0h
allocate User_{{user8.id}} , User_{{user9.id}}
}
task Task_{{task27.id}} "Test Task 27" {
task Task_{{task27.id}} "Task_{{task27.id}}" {
Expand All @@ -1612,23 +1612,23 @@ def test_to_tjp_is_working_properly(self):
allocate User_{{user1.id}} , User_{{user10.id}}
}
}
task Task_{{task1.id}} "Test Task 1" {
task Task_{{task1.id}} "Task_{{task1.id}}" {
effort 1.0h
allocate User_{{user1.id}}
}
task Task_{{task2.id}} "Test Task 2" {
task Task_{{task2.id}} "Task_{{task2.id}}" {
effort 1.0h
allocate User_{{user2.id}}
}
task Task_{{task3.id}} "Test Task 3" {
task Task_{{task3.id}} "Task_{{task3.id}}" {
Expand Down

0 comments on commit 1fd2e01

Please sign in to comment.