Skip to content

Commit

Permalink
fix: use pollination-dsl instead of queenbee-dsl
Browse files Browse the repository at this point in the history
  • Loading branch information
mostaphaRoudsari committed Feb 4, 2021
1 parent 7590708 commit f489e0c
Show file tree
Hide file tree
Showing 21 changed files with 27 additions and 29 deletions.
3 changes: 1 addition & 2 deletions pollination/honeybee_radiance/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""Honeybee Radiance plugin for Pollination."""

__queenbee__ = {
'name': 'honeybee-radiance', # name for queenbee package - this will overwrite the Python package name
__pollination__ = {
'icon': 'https://raw.githubusercontent.com/ladybug-tools/artwork/master/icons_bugs/grasshopper_tabs/HB-Radiance.png',
'app_version': '5.4', # tag for version of Radiance
'config': {
Expand Down
2 changes: 1 addition & 1 deletion pollination/honeybee_radiance/coefficient.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass
from queenbee_dsl.function import Function, command, Inputs, Outputs
from pollination_dsl.function import Function, command, Inputs, Outputs


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion pollination/honeybee_radiance/contrib.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass
from queenbee_dsl.function import Function, command, Inputs, Outputs
from pollination_dsl.function import Function, command, Inputs, Outputs


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion pollination/honeybee_radiance/grid.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass
from queenbee_dsl.function import Function, command, Inputs, Outputs
from pollination_dsl.function import Function, command, Inputs, Outputs


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion pollination/honeybee_radiance/matrix.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass
from queenbee_dsl.function import Function, command, Inputs, Outputs
from pollination_dsl.function import Function, command, Inputs, Outputs


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion pollination/honeybee_radiance/octree.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass
from queenbee_dsl.function import Function, command, Inputs, Outputs
from pollination_dsl.function import Function, command, Inputs, Outputs


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion pollination/honeybee_radiance/raytrace.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass
from queenbee_dsl.function import Function, command, Inputs, Outputs
from pollination_dsl.function import Function, command, Inputs, Outputs


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion pollination/honeybee_radiance/sky.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass
from queenbee_dsl.function import Function, command, Inputs, Outputs
from pollination_dsl.function import Function, command, Inputs, Outputs


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion pollination/honeybee_radiance/sun.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass
from queenbee_dsl.function import Function, command, Inputs, Outputs
from pollination_dsl.function import Function, command, Inputs, Outputs


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion pollination/honeybee_radiance/translate.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass
from queenbee_dsl.function import Function, command, Inputs, Outputs
from pollination_dsl.function import Function, command, Inputs, Outputs


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
queenbee-dsl==0.7.2
pollination-dsl>=0.8.0
15 changes: 7 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
#!/usr/bin/env python
import setuptools
# add these line to integrate the queenbee packaging process into Python packaging
from queenbee_dsl.package import PackageQBInstall, PackageQBDevelop
from pollination_dsl.package import PostInstall, PostDevelop

with open("README.md", "r") as fh:
long_description = fh.read()

# normal setuptool inputs
setuptools.setup(
cmdclass={'develop': PackageQBDevelop, 'install': PackageQBInstall}, # this is critical for local packaging
name='pollination-honeybee-radiance', # will be used for package name unless it is overwritten using __queenbee__ info.
cmdclass={'develop': PostDevelop, 'install': PostInstall}, # this is critical for local packaging
name='pollination-honeybee-radiance', # will be used for package name unless it is overwritten using __queenbee__ info.
author='ladybug-tools', # the owner account for this package - required if pushed to Pollination
packages=setuptools.find_namespace_packages(include=['pollination.*']), # required - that's how pollination find the package
use_scm_version=True,
setup_requires=['setuptools_scm'],
Expand All @@ -21,11 +22,9 @@
description='Honeybee Radiance plugin for Pollination.', # will be used as package description
long_description=long_description, # will be translated to ReadMe content on Pollination
long_description_content_type="text/markdown",
author='mostapha', # all the information for author and maintainers will be
author_email='[email protected]', # translated to maintainers. For multiple authors use comma
maintainer='ladybug-tools', # inside the string.
maintainer_email='[email protected]',
keywords='honeybee, radiance, ladybug-tools, daylight', # will be used as keywords
maintainer='mostapha, ladybug-tools', # Package maintainers. For multiple maintainers use comma
maintainer_email='[email protected], [email protected]',
keywords='honeybee, radiance, ladybug-tools, daylight', # will be used as keywords
license='PolyForm Shield License 1.0.0, https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt', # the license link should be separated by a comma
zip_safe=False
)
2 changes: 1 addition & 1 deletion tests/coefficient_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pollination_honeybee_radiance.coefficient import DaylightCoefficient
from pollination.honeybee_radiance.coefficient import DaylightCoefficient
from queenbee.plugin.function import Function


Expand Down
2 changes: 1 addition & 1 deletion tests/contrib_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pollination_honeybee_radiance.contrib import DaylightContribution
from pollination.honeybee_radiance.contrib import DaylightContribution
from queenbee.plugin.function import Function


Expand Down
2 changes: 1 addition & 1 deletion tests/grid_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pollination_honeybee_radiance.grid import SplitGrid, SplitGridFromFolder, \
from pollination.honeybee_radiance.grid import SplitGrid, SplitGridFromFolder, \
MergeFiles
from queenbee.plugin.function import Function

Expand Down
2 changes: 1 addition & 1 deletion tests/matrix_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pollination_honeybee_radiance.matrix import MatrixMultiplication
from pollination.honeybee_radiance.matrix import MatrixMultiplication
from queenbee.plugin.function import Function


Expand Down
2 changes: 1 addition & 1 deletion tests/octree_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pollination_honeybee_radiance.octree import CreateOctree, CreateOctreeWithSky
from pollination.honeybee_radiance.octree import CreateOctree, CreateOctreeWithSky
from queenbee.plugin.function import Function


Expand Down
2 changes: 1 addition & 1 deletion tests/raytrace_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pollination_honeybee_radiance.raytrace import RayTracingDaylightFactor
from pollination.honeybee_radiance.raytrace import RayTracingDaylightFactor
from queenbee.plugin.function import Function


Expand Down
2 changes: 1 addition & 1 deletion tests/sky_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pollination_honeybee_radiance.sky import \
from pollination.honeybee_radiance.sky import \
AddRemoveSkyMatrix, AddRemoveSkyMatrixWithConversion, GenSkyWithCertainIllum, \
CreateSkyDome, CreateSkyMatrix

Expand Down
2 changes: 1 addition & 1 deletion tests/sun_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pollination_honeybee_radiance.sun import CreateSunMatrix, ParseSunUpHours
from pollination.honeybee_radiance.sun import CreateSunMatrix, ParseSunUpHours

from queenbee.plugin.function import Function

Expand Down
2 changes: 1 addition & 1 deletion tests/translate_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pollination_honeybee_radiance.translate import CreateRadianceFolder
from pollination.honeybee_radiance.translate import CreateRadianceFolder

from queenbee.plugin.function import Function

Expand Down

0 comments on commit f489e0c

Please sign in to comment.