From 120696c3b614db97b59a4a729d96e7f23d92b1b9 Mon Sep 17 00:00:00 2001 From: Chris Mackey Date: Wed, 3 Jul 2024 11:20:23 -0700 Subject: [PATCH 1/2] ci(manifest): Add Manifest to avoid pushing tests to PyPI and Docker --- .dockerignore | 5 +++++ MANIFEST.in | 9 +++++++++ setup.py | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 .dockerignore create mode 100644 MANIFEST.in diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..02639e5 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +.github +docs +tests + +Dockerfile diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..822da47 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,9 @@ +recursive-exclude tests * +recursive-exclude docs * +recursive-exclude .github * +exclude .gitignore +exclude .dockerignore +exclude .releaserc.json +exclude deploy.sh +exclude Dockerfile +exclude build_image.sh diff --git a/setup.py b/setup.py index 5afd602..cba7cc4 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,7 @@ long_description_content_type="text/markdown", url="https://github.com/ladybug-tools/dragonfly-display", packages=setuptools.find_packages(exclude=["tests*"]), + include_package_data=True, install_requires=requirements, extras_require={'full': extras_requirements}, entry_points={ @@ -29,6 +30,7 @@ classifiers=[ "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: Implementation :: CPython", "License :: OSI Approved :: GNU Affero General Public License v3", "Operating System :: OS Independent" From cbfdef4ec8e680fe3cde82aca6adb45c7b09c480 Mon Sep 17 00:00:00 2001 From: Chris Mackey Date: Wed, 3 Jul 2024 12:21:36 -0700 Subject: [PATCH 2/2] fix(cli): Ensure that HTML can still be written to stdout --- dragonfly_display/cli/__init__.py | 6 +++--- extras-requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dragonfly_display/cli/__init__.py b/dragonfly_display/cli/__init__.py index 7e07387..ef9f683 100644 --- a/dragonfly_display/cli/__init__.py +++ b/dragonfly_display/cli/__init__.py @@ -187,9 +187,9 @@ def model_to_vis_set( else: # vtkjs can only be read as binary with open(out_file_path, 'rb') as of: f_contents = of.read() - b = base64.b64encode(f_contents) - base64_string = b.decode('utf-8') - output_file.write(base64_string) + b = base64.b64encode(f_contents) + f_contents = b.decode('utf-8') + output_file.write(f_contents) else: raise ValueError('Unrecognized output-format "{}".'.format(output_format)) except Exception as e: diff --git a/extras-requirements.txt b/extras-requirements.txt index 3e68d62..3ace26e 100644 --- a/extras-requirements.txt +++ b/extras-requirements.txt @@ -1,3 +1,3 @@ dragonfly-energy>=1.25.28 dragonfly-radiance>=0.3.20 -ladybug-vtk>=0.14.0 +ladybug-vtk>=0.14.1