Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

Enable concent only for blender 2.79 #4647

Merged
merged 7 commits into from
Aug 27, 2019

Conversation

shadeofblue
Copy link
Contributor

@shadeofblue shadeofblue commented Aug 27, 2019

closes: #4546

@shadeofblue shadeofblue requested a review from etam August 27, 2019 10:56

class AppsManager(object):
""" Temporary solution for apps detection and management. """
def __init__(self):
self.apps = OrderedDict()
self.task_types = dict()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please merge b0.20 into develop and add type hints here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's a bit more involved problem ;)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll have conflicts to resolve, because I added a ton of type hints in this file in b0.20 :)

Copy link
Contributor Author

@shadeofblue shadeofblue Aug 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, and there are more conflicts between b0.20 and develop already... I don't think it's a problem pertaining to this particular pull request

apps/appsmanager.py Outdated Show resolved Hide resolved
golem/task/rpc.py Outdated Show resolved Hide resolved
golem/task/rpc.py Outdated Show resolved Hide resolved
Co-Authored-By: Adam Mizerski <amizerski@golem.network>
golem/task/taskbase.py Show resolved Hide resolved
@@ -117,39 +117,57 @@ def add_new_task(task, *_args, **_kwargs):
),
)
class TestCreateTask(ProviderBase, TestClientBase):
@staticmethod
def _get_task_dict(**data):
task_dict = dummytaskstate.DummyTaskDefinition().to_dict()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably should look like this:

task_dict = dummytask.DummyTaskBuilder.build_dictionary(dummytaskstate.DummyTaskDefinition())

because build_dictionary adds subtask_data_size and difficulty to dict.
Maybe not required, if tests are working without this. Dunno.

See also #2424

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm definitely against adding TaskTypeInfo.id. See comments I added earlier.

@etam what is the problem with using a normalized form for comparisons?

Copy link
Contributor

@etam etam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm definitely against adding TaskTypeInfo.id. See comments I added earlier.

@etam
Copy link
Contributor

etam commented Aug 27, 2019

In taskmanager.py there is already a lot of .lower() on task type name. It's already all messed up :(

I can approve this, because it's about concent and blender, not about task type names. This can be cleaned up in a separate issue.

Copy link
Contributor

@etam etam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not quite happy about it, but whatever. Let's clean this case-sensitivity stuff elsewhere.

@etam
Copy link
Contributor

etam commented Aug 27, 2019

#4650

@codecov
Copy link

codecov bot commented Aug 27, 2019

Codecov Report

Merging #4647 into develop will increase coverage by 1.59%.
The diff coverage is 100%.

@@             Coverage Diff             @@
##           develop    #4647      +/-   ##
===========================================
+ Coverage    88.65%   90.25%   +1.59%     
===========================================
  Files          224      224              
  Lines        20206    20219      +13     
===========================================
+ Hits         17914    18248     +334     
+ Misses        2292     1971     -321

@shadeofblue shadeofblue merged commit a2591e8 into develop Aug 27, 2019
@shadeofblue shadeofblue deleted the enable-concent-only-for-blender-2.79 branch August 27, 2019 14:11
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Concent Service should be disallowed (and disabled by default) for non-Blender tasks
2 participants