From 79cda0393ae0909b8ee833778ef4c677a314a539 Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Thu, 16 Feb 2023 11:00:08 -0700
Subject: [PATCH 01/17] local resstock works without docker

---
 .gitignore                                   |   1 +
 buildstockbatch/aws/aws.py                   |  30 ++-
 buildstockbatch/base.py                      |  63 ++++--
 buildstockbatch/eagle.py                     |   6 +-
 buildstockbatch/localdocker.py               | 198 +++++++++----------
 buildstockbatch/sampler/residential_quota.py |  55 +-----
 buildstockbatch/test/test_docker.py          |  39 +---
 buildstockbatch/test/test_integration.py     |   6 +-
 buildstockbatch/test/test_validation.py      |  18 +-
 9 files changed, 193 insertions(+), 223 deletions(-)

diff --git a/.gitignore b/.gitignore
index edc0ed66..d554b88a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ buildstockbatch_crash_details.log
 coverage/
 .coverage
 build/
+.env
diff --git a/buildstockbatch/aws/aws.py b/buildstockbatch/aws/aws.py
index fe1999bf..41bc9afe 100644
--- a/buildstockbatch/aws/aws.py
+++ b/buildstockbatch/aws/aws.py
@@ -16,6 +16,7 @@
 from botocore.exceptions import ClientError
 import collections
 import csv
+import docker
 from fsspec.implementations.local import LocalFileSystem
 import gzip
 import hashlib
@@ -38,11 +39,10 @@
 import io
 import zipfile
 
-from buildstockbatch.localdocker import DockerBatchBase
-from buildstockbatch.base import ValidationError
+from buildstockbatch.base import ValidationError, BuildStockBatchBase
 from buildstockbatch.aws.awsbase import AwsJobBase
 from buildstockbatch import postprocessing
-from ..utils import log_error_details, get_project_configuration
+from buildstockbatch.utils import ContainerRuntime, log_error_details, get_project_configuration
 
 logger = logging.getLogger(__name__)
 
@@ -1658,6 +1658,30 @@ def clean(self):
         logger.info(f"Simple notifications topic {self.sns_state_machine_topic} deleted.")
 
 
+class DockerBatchBase(BuildStockBatchBase):
+
+    CONTAINER_RUNTIME = ContainerRuntime.DOCKER
+
+    def __init__(self, project_filename):
+        super().__init__(project_filename)
+
+        self.docker_client = docker.DockerClient.from_env()
+        try:
+            self.docker_client.ping()
+        except:  # noqa: E722 (allow bare except in this case because error can be a weird non-class Windows API error)
+            logger.error('The docker server did not respond, make sure Docker Desktop is started then retry.')
+            raise RuntimeError('The docker server did not respond, make sure Docker Desktop is started then retry.')
+
+    @staticmethod
+    def validate_project(project_file):
+        super(DockerBatchBase, DockerBatchBase).validate_project(project_file)
+        # LocalDocker specific code goes here
+
+    @property
+    def docker_image(self):
+        return 'nrel/openstudio:{}'.format(self.os_version)
+
+
 class AwsBatch(DockerBatchBase):
 
     def __init__(self, project_filename):
diff --git a/buildstockbatch/base.py b/buildstockbatch/base.py
index a595903c..17f32af0 100644
--- a/buildstockbatch/base.py
+++ b/buildstockbatch/base.py
@@ -20,6 +20,7 @@
 import re
 import requests
 import shutil
+import subprocess
 import tempfile
 import yamale
 import zipfile
@@ -91,6 +92,10 @@ def sampler(self):
         Sampler = self.get_sampler_class(self.cfg['sampler']['type'])
         return Sampler(self, **self.cfg['sampler'].get('args', {}))
 
+    @staticmethod
+    def openstudio_exe():
+        return os.environ.get("OPENSTUDIO_EXE", "openstudio")
+
     def path_rel_to_projectfile(self, x):
         return path_rel_to_file(self.project_filename, x)
 
@@ -196,7 +201,7 @@ def cleanup_sim_dir(sim_dir, dest_fs, simout_ts_dir, upgrade_id, building_id):
         schedules_filepath = ''
         if os.path.isdir(os.path.join(sim_dir, 'generated_files')):
             for file in os.listdir(os.path.join(sim_dir, 'generated_files')):
-                if file.endswith('schedules.csv'):
+                if re.match(r".*schedules.*\.csv", file):
                     schedules_filepath = os.path.join(sim_dir, 'generated_files', file)
 
         if os.path.isfile(timeseries_filepath):
@@ -249,21 +254,22 @@ def get_clean_column_name(x):
         if os.path.isdir(reports_dir):
             shutil.rmtree(reports_dir, ignore_errors=True)
 
-    @staticmethod
-    def validate_project(project_file):
-        assert BuildStockBatchBase.validate_project_schema(project_file)
-        assert BuildStockBatchBase.validate_sampler(project_file)
-        assert BuildStockBatchBase.validate_workflow_generator(project_file)
-        assert BuildStockBatchBase.validate_misc_constraints(project_file)
-        assert BuildStockBatchBase.validate_xor_nor_schema_keys(project_file)
-        assert BuildStockBatchBase.validate_reference_scenario(project_file)
-        assert BuildStockBatchBase.validate_options_lookup(project_file)
-        assert BuildStockBatchBase.validate_logic(project_file)
-        assert BuildStockBatchBase.validate_measure_references(project_file)
-        assert BuildStockBatchBase.validate_postprocessing_spec(project_file)
-        assert BuildStockBatchBase.validate_resstock_or_comstock_version(project_file)
-        assert BuildStockBatchBase.validate_openstudio_version(project_file)
-        assert BuildStockBatchBase.validate_number_of_options(project_file)
+    @classmethod
+    def validate_project(cls, project_file):
+        assert cls.validate_project_schema(project_file)
+        assert cls.validate_openstudio_path(project_file)
+        assert cls.validate_sampler(project_file)
+        assert cls.validate_workflow_generator(project_file)
+        assert cls.validate_misc_constraints(project_file)
+        assert cls.validate_xor_nor_schema_keys(project_file)
+        assert cls.validate_reference_scenario(project_file)
+        assert cls.validate_options_lookup(project_file)
+        assert cls.validate_logic(project_file)
+        assert cls.validate_measure_references(project_file)
+        assert cls.validate_postprocessing_spec(project_file)
+        assert cls.validate_resstock_or_comstock_version(project_file)
+        assert cls.validate_openstudio_version(project_file)
+        assert cls.validate_number_of_options(project_file)
         logger.info('Base Validation Successful')
         return True
 
@@ -275,6 +281,31 @@ def get_buildstock_dir(project_file, cfg):
         else:
             return os.path.abspath(os.path.join(os.path.dirname(project_file), buildstock_dir))
 
+    @classmethod
+    def validate_openstudio_path(cls, project_file):
+        cfg = get_project_configuration(project_file)
+        os_version = cfg.get('os_version', cls.DEFAULT_OS_VERSION)
+        os_sha = cfg.get('os_sha', cls.DEFAULT_OS_SHA)
+        try:
+            proc_out = subprocess.run(
+                [cls.openstudio_exe(), "openstudio_version"],
+                capture_output=True,
+                text=True
+            )
+        except FileNotFoundError:
+            raise ValidationError(f"Cannot find openstudio at `{cls.openstudio_exe()}`")
+        if proc_out.returncode != 0:
+            raise ValidationError(f"OpenStudio failed with the following error {proc_out.stderr}")
+        actual_os_version, actual_os_sha = proc_out.stdout.strip().split("+")
+        if os_version != actual_os_version:
+            raise ValidationError(f"OpenStudio version is {actual_os_version}, expected is {os_version}")
+        if os_sha != actual_os_sha:
+            raise ValidationError(
+                f"OpenStudio version is correct at {os_version}, but the shas don't match. "
+                "Got {actual_os_sha}, expected {os_sha}"
+            )
+        return True
+
     @staticmethod
     def validate_sampler(project_file):
         cfg = get_project_configuration(project_file)
diff --git a/buildstockbatch/eagle.py b/buildstockbatch/eagle.py
index 131055e2..244422b6 100644
--- a/buildstockbatch/eagle.py
+++ b/buildstockbatch/eagle.py
@@ -71,9 +71,9 @@ def __init__(self, project_filename):
         logger.debug('Output directory = {}'.format(output_dir))
         weather_dir = self.weather_dir  # noqa E841
 
-    @staticmethod
-    def validate_project(project_file):
-        super(EagleBatch, EagleBatch).validate_project(project_file)
+    @classmethod
+    def validate_project(cls, project_file):
+        super(cls, cls).validate_project(project_file)
         # Eagle specific validation goes here
 
     @property
diff --git a/buildstockbatch/localdocker.py b/buildstockbatch/localdocker.py
index 7f037643..b5f80b4e 100644
--- a/buildstockbatch/localdocker.py
+++ b/buildstockbatch/localdocker.py
@@ -3,7 +3,7 @@
 """
 buildstockbatch.localdocker
 ~~~~~~~~~~~~~~~
-This object contains the code required for execution of local docker batch simulations
+This object contains the code required for execution of local batch simulations
 
 :author: Noel Merket
 :copyright: (c) 2018 by The Alliance for Sustainable Energy
@@ -13,7 +13,6 @@
 import argparse
 from dask.distributed import Client, LocalCluster
 import docker
-from docker.errors import ImageNotFound
 import functools
 from fsspec.implementations.local import LocalFileSystem
 import gzip
@@ -23,56 +22,30 @@
 import logging
 import os
 import pandas as pd
+import pathlib
 import re
 import shutil
-import sys
+import subprocess
 import tarfile
 import tempfile
 
 from buildstockbatch.base import BuildStockBatchBase, SimulationExists
 from buildstockbatch import postprocessing
-from .utils import log_error_details, ContainerRuntime
+from buildstockbatch.utils import log_error_details, ContainerRuntime
 from buildstockbatch.__version__ import __version__ as bsb_version
 
 logger = logging.getLogger(__name__)
 
 
-class DockerBatchBase(BuildStockBatchBase):
+class LocalBatch(BuildStockBatchBase):
 
     CONTAINER_RUNTIME = ContainerRuntime.DOCKER
 
     def __init__(self, project_filename):
         super().__init__(project_filename)
 
-        self.docker_client = docker.DockerClient.from_env()
-        try:
-            self.docker_client.ping()
-        except:  # noqa: E722 (allow bare except in this case because error can be a weird non-class Windows API error)
-            logger.error('The docker server did not respond, make sure Docker Desktop is started then retry.')
-            raise RuntimeError('The docker server did not respond, make sure Docker Desktop is started then retry.')
-
         self._weather_dir = None
 
-    @staticmethod
-    def validate_project(project_file):
-        super(DockerBatchBase, DockerBatchBase).validate_project(project_file)
-        # LocalDocker specific code goes here
-
-    @property
-    def docker_image(self):
-        return 'nrel/openstudio:{}'.format(self.os_version)
-
-
-class LocalDockerBatch(DockerBatchBase):
-
-    def __init__(self, project_filename):
-        super().__init__(project_filename)
-        try:
-            self.docker_client.images.get(self.docker_image)
-        except ImageNotFound:
-            logger.debug(f'Pulling docker image: {self.docker_image}')
-            self.docker_client.images.pull(self.docker_image)
-
         # Create simulation_output dir
         sim_out_ts_dir = os.path.join(self.results_dir, 'simulation_output', 'timeseries')
         os.makedirs(sim_out_ts_dir, exist_ok=True)
@@ -80,7 +53,9 @@ def __init__(self, project_filename):
             os.makedirs(os.path.join(sim_out_ts_dir, f'up{i:02d}'), exist_ok=True)
 
         # Install custom gems to a volume that will be used by all workers
+        # FIXME: Get working without docker
         if self.cfg.get('baseline', dict()).get('custom_gems', False):
+            # TODO: Fix this stuff to work without docker
             logger.info('Installing custom gems to docker volume: buildstockbatch_custom_gems')
 
             docker_client = docker.client.from_env()
@@ -140,20 +115,20 @@ def __init__(self, project_filename):
             simdata_vol.remove()
             logger.debug(f'Review custom gems list at: {gem_list_log}')
 
-    @staticmethod
-    def validate_project(project_file):
-        super(LocalDockerBatch, LocalDockerBatch).validate_project(project_file)
-        # LocalDocker specific code goes here
+    @classmethod
+    def validate_project(cls, project_file):
+        super(cls, cls).validate_project(project_file)
+        # LocalBatch specific code goes here
 
     @property
     def weather_dir(self):
         if self._weather_dir is None:
-            self._weather_dir = tempfile.TemporaryDirectory(dir=self.results_dir, prefix='weather')
+            self._weather_dir = os.path.join(self.buildstock_dir, 'weather')
             self._get_weather_files()
-        return self._weather_dir.name
+        return self._weather_dir
 
     @classmethod
-    def run_building(cls, project_dir, buildstock_dir, weather_dir, docker_image, results_dir, measures_only,
+    def run_building(cls, buildstock_dir, weather_dir, results_dir, measures_only,
                      n_datapoints, cfg, i, upgrade_idx=None):
 
         upgrade_id = 0 if upgrade_idx is None else upgrade_idx + 1
@@ -162,74 +137,62 @@ def run_building(cls, project_dir, buildstock_dir, weather_dir, docker_image, re
             sim_id, sim_dir = cls.make_sim_dir(i, upgrade_idx, os.path.join(results_dir, 'simulation_output'))
         except SimulationExists:
             return
-
-        bind_mounts = [
-            (sim_dir, '', 'rw'),
-            (os.path.join(buildstock_dir, 'measures'), 'measures', 'ro'),
-            (os.path.join(buildstock_dir, 'resources'), 'lib/resources', 'ro'),
-            (os.path.join(project_dir, 'housing_characteristics'), 'lib/housing_characteristics', 'ro'),
-            (weather_dir, 'weather', 'ro')
-        ]
-        if os.path.exists(os.path.join(buildstock_dir, 'resources', 'hpxml-measures')):
-            bind_mounts += [(os.path.join(buildstock_dir, 'resources', 'hpxml-measures'),
-                            'resources/hpxml-measures', 'ro')]
-        docker_volume_mounts = dict([(key, {'bind': f'/var/simdata/openstudio/{bind}', 'mode': mode}) for key, bind, mode in bind_mounts])  # noqa E501
-        for bind in bind_mounts:
-            dir_to_make = os.path.join(sim_dir, *bind[1].split('/'))
-            if not os.path.exists(dir_to_make):
-                os.makedirs(dir_to_make)
-
-        if cfg.get('baseline', dict()).get('custom_gems', False):
-            mnt_custom_gem_dir = '/var/oscli/gems'
-            docker_volume_mounts['buildstockbatch_custom_gems'] = {'bind': mnt_custom_gem_dir, 'mode': 'ro'}
+        sim_path = pathlib.Path(sim_dir)
+        buildstock_path = pathlib.Path(buildstock_dir)
+
+        # Make symlinks to project and buildstock stuff
+        (sim_path / 'measures').symlink_to(buildstock_path / 'measures', target_is_directory=True)
+        (sim_path / 'lib').symlink_to(buildstock_path / "lib", target_is_directory=True)
+        (sim_path / 'weather').symlink_to(weather_dir, target_is_directory=True)
+        hpxml_measures_path = buildstock_path / 'resources' / 'hpxml-measures'
+        if hpxml_measures_path.exists():
+            resources_path = sim_path / 'resources'
+            resources_path.mkdir()
+            (resources_path / 'hpxml-measures').symlink_to(hpxml_measures_path, target_is_directory=True)
+        else:
+            resources_path = None
 
         osw = cls.create_osw(cfg, n_datapoints, sim_id, building_id=i, upgrade_idx=upgrade_idx)
 
-        with open(os.path.join(sim_dir, 'in.osw'), 'w') as f:
+        with open(sim_path / 'in.osw', 'w') as f:
             json.dump(osw, f, indent=4)
 
-        docker_client = docker.client.from_env()
         run_cmd = [
-            'openstudio',
+            cls.openstudio_exe(),
             'run',
             '-w', 'in.osw',
         ]
-        if cfg.get('baseline', dict()).get('custom_gems', False):
-            run_cmd = [
-                'openstudio',
-                '--bundle', f'{mnt_custom_gem_dir}/Gemfile',
-                '--bundle_path', f'{mnt_custom_gem_dir}',
-                '--bundle_without', 'native_ext',
-                'run', '-w', 'in.osw',
-                '--debug'
-            ]
+
+        # FIXME: Custom gems
+        # if cfg.get('baseline', dict()).get('custom_gems', False):
+        #     run_cmd = [
+        #         'openstudio',
+        #         '--bundle', f'{mnt_custom_gem_dir}/Gemfile',
+        #         '--bundle_path', f'{mnt_custom_gem_dir}',
+        #         '--bundle_without', 'native_ext',
+        #         'run', '-w', 'in.osw',
+        #         '--debug'
+        #     ]
+
         if measures_only:
-            if cfg.get('baseline', dict()).get('custom_gems', False):
-                run_cmd.insert(8, '--measures_only')
-            else:
-                run_cmd.insert(2, '--measures_only')
-
-        env_vars = {}
-        env_vars['BUILDSTOCKBATCH_VERSION'] = bsb_version
-
-        extra_kws = {}
-        if sys.platform.startswith('linux'):
-            extra_kws['user'] = f'{os.getuid()}:{os.getgid()}'
-        container_output = docker_client.containers.run(
-            docker_image,
+            # if cfg.get('baseline', dict()).get('custom_gems', False):
+            #     run_cmd.insert(8, '--measures_only')
+            # else:
+            run_cmd.insert(2, '--measures_only')
+
+        env_vars = {
+            'BUILDSTOCKBATCH_VERSION': bsb_version
+        }
+
+        proc_output = subprocess.run(
             run_cmd,
-            remove=True,
-            volumes=docker_volume_mounts,
-            name=sim_id,
-            environment=env_vars,
-            **extra_kws
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            env=env_vars,
+            cwd=sim_dir,
         )
-        with open(os.path.join(sim_dir, 'docker_output.log'), 'wb') as f_out:
-            f_out.write(container_output)
-
-        # Clean up directories created with the docker mounts
-        for dirname in ('lib', 'measures', 'weather'):
-            shutil.rmtree(os.path.join(sim_dir, dirname), ignore_errors=True)
+        with open(sim_path / 'openstudio_output.log', 'wb') as f_out:
+            f_out.write(proc_output.stdout)
 
         fs = LocalFileSystem()
         cls.cleanup_sim_dir(
@@ -240,6 +203,13 @@ def run_building(cls, project_dir, buildstock_dir, weather_dir, docker_image, re
             i
         )
 
+        # Clean up symlinks
+        for directory in ('measures', 'lib', 'weather'):
+            (sim_path / directory).unlink()
+        if resources_path:
+            (resources_path / 'hpxml-measures').unlink()
+            resources_path.rmdir()
+
         # Read data_point_out.json
         reporting_measures = cls.get_reporting_measures(cfg)
         dpout = postprocessing.read_simulation_outputs(fs, reporting_measures, sim_dir, upgrade_id, i)
@@ -251,15 +221,24 @@ def run_batch(self, n_jobs=None, measures_only=False, sampling_only=False):
         if sampling_only:
             return
 
+        # Copy files to lib dir in buildstock root
+        # FIXME: does this work for comstock?
+        buildstock_path = pathlib.Path(self.buildstock_dir)
+        project_path = pathlib.Path(self.project_dir)
+        lib_path = pathlib.Path(self.buildstock_dir, 'lib')
+        if lib_path.exists():
+            shutil.rmtree(lib_path)
+        lib_path.mkdir()
+        shutil.copytree(buildstock_path / "resources", lib_path / "resources")
+        shutil.copytree(project_path / "housing_characteristics", lib_path / "housing_characteristics")
+
         df = pd.read_csv(buildstock_csv_filename, index_col=0)
         building_ids = df.index.tolist()
         n_datapoints = len(building_ids)
         run_building_d = functools.partial(
             delayed(self.run_building),
-            self.project_dir,
             self.buildstock_dir,
             self.weather_dir,
-            self.docker_image,
             self.results_dir,
             measures_only,
             n_datapoints,
@@ -274,24 +253,25 @@ def run_batch(self, n_jobs=None, measures_only=False, sampling_only=False):
         else:
             all_sims = itertools.chain(*upgrade_sims)
         if n_jobs is None:
-            client = docker.client.from_env()
-            n_jobs = client.info()['NCPU']
+            n_jobs = -1
         dpouts = Parallel(n_jobs=n_jobs, verbose=10)(all_sims)
 
-        sim_out_dir = os.path.join(self.results_dir, 'simulation_output')
+        shutil.rmtree(lib_path)
+
+        sim_out_path = pathlib.Path(self.results_dir, 'simulation_output')
 
-        results_job_json_filename = os.path.join(sim_out_dir, 'results_job0.json.gz')
+        results_job_json_filename = sim_out_path / 'results_job0.json.gz'
         with gzip.open(results_job_json_filename, 'wt', encoding='utf-8') as f:
             json.dump(dpouts, f)
         del dpouts
 
-        sim_out_tarfile_name = os.path.join(sim_out_dir, 'simulations_job0.tar.gz')
+        sim_out_tarfile_name = sim_out_path / 'simulations_job0.tar.gz'
         logger.debug(f'Compressing simulation outputs to {sim_out_tarfile_name}')
         with tarfile.open(sim_out_tarfile_name, 'w:gz') as tarf:
-            for dirname in os.listdir(sim_out_dir):
-                if re.match(r'up\d+', dirname) and os.path.isdir(os.path.join(sim_out_dir, dirname)):
-                    tarf.add(os.path.join(sim_out_dir, dirname), arcname=dirname)
-                    shutil.rmtree(os.path.join(sim_out_dir, dirname))
+            for dirname in os.listdir(sim_out_path):
+                if re.match(r'up\d+', dirname) and (sim_out_path / dirname).is_dir():
+                    tarf.add(sim_out_path / dirname, arcname=dirname)
+                    shutil.rmtree(sim_out_path / dirname)
 
     @property
     def output_dir(self):
@@ -351,7 +331,7 @@ def main():
     parser.add_argument(
         '-j',
         type=int,
-        help='Number of parallel simulations. Default: all cores available to docker.',
+        help='Number of parallel simulations. Default: all cores.',
         default=None
     )
     parser.add_argument(
@@ -375,10 +355,10 @@ def main():
         raise FileNotFoundError(f'The project file {args.project_filename} doesn\'t exist')
 
     # Validate the project, and in case of the --validateonly flag return True if validation passes
-    LocalDockerBatch.validate_project(args.project_filename)
+    LocalBatch.validate_project(args.project_filename)
     if args.validateonly:
         return True
-    batch = LocalDockerBatch(args.project_filename)
+    batch = LocalBatch(args.project_filename)
     if not (args.postprocessonly or args.uploadonly or args.validateonly):
         batch.run_batch(n_jobs=args.j, measures_only=args.measures_only, sampling_only=args.samplingonly)
     if args.measures_only or args.samplingonly:
diff --git a/buildstockbatch/sampler/residential_quota.py b/buildstockbatch/sampler/residential_quota.py
index f1820f1f..b7af3b69 100644
--- a/buildstockbatch/sampler/residential_quota.py
+++ b/buildstockbatch/sampler/residential_quota.py
@@ -7,13 +7,11 @@
 :copyright: (c) 2020 by The Alliance for Sustainable Energy
 :license: BSD-3
 """
-import docker
 import logging
 import os
+import pathlib
 import shutil
 import subprocess
-import sys
-import time
 
 from .base import BuildStockSampler
 from .downselect import DownselectSamplerBase
@@ -52,60 +50,27 @@ def validate_args(cls, project_filename, **kw):
             raise ValidationError('The following sampler arguments are required: ' + ', '.join(expected_args))
         return True
 
-    def _run_sampling_docker(self):
-        docker_client = docker.DockerClient.from_env()
-        tick = time.time()
-        extra_kws = {}
-        if sys.platform.startswith('linux'):
-            extra_kws['user'] = f'{os.getuid()}:{os.getgid()}'
-        container_output = docker_client.containers.run(
-            self.parent().docker_image,
+    def run_sampling(self):
+        subprocess.run(
             [
-                'ruby',
-                'resources/run_sampling.rb',
+                self.parent().openstudio_exe(),
+                str(pathlib.Path('resources', 'run_sampling.rb')),
                 '-p', self.cfg['project_directory'],
                 '-n', str(self.n_datapoints),
                 '-o', 'buildstock.csv'
             ],
-            remove=True,
-            volumes={
-                self.buildstock_dir: {'bind': '/var/simdata/openstudio', 'mode': 'rw'}
-            },
-            name='buildstock_sampling',
-            **extra_kws
+            cwd=self.buildstock_dir,
+            check=True
         )
-        tick = time.time() - tick
-        for line in container_output.decode('utf-8').split('\n'):
-            logger.debug(line)
-        logger.debug('Sampling took {:.1f} seconds'.format(tick))
-        destination_filename = self.csv_path
-        if os.path.exists(destination_filename):
+        destination_filename = pathlib.Path(self.csv_path)
+        if destination_filename.exists():
             os.remove(destination_filename)
         shutil.move(
-            os.path.join(self.buildstock_dir, 'resources', 'buildstock.csv'),
+            pathlib.Path(self.buildstock_dir, 'resources', 'buildstock.csv'),
             destination_filename
         )
         return destination_filename
 
-    def _run_sampling_singularity(self):
-        args = [
-            'singularity',
-            'exec',
-            '--contain',
-            '--home', '{}:/buildstock'.format(self.buildstock_dir),
-            '--bind', '{}:/outbind'.format(os.path.dirname(self.csv_path)),
-            self.parent().singularity_image,
-            'ruby',
-            'resources/run_sampling.rb',
-            '-p', self.cfg['project_directory'],
-            '-n', str(self.n_datapoints),
-            '-o', '../../outbind/{}'.format(os.path.basename(self.csv_path))
-        ]
-        logger.debug(f"Starting singularity sampling with command: {' '.join(args)}")
-        subprocess.run(args, check=True, env=os.environ, cwd=self.parent().output_dir)
-        logger.debug("Singularity sampling completed.")
-        return self.csv_path
-
 
 class ResidentialQuotaDownselectSampler(DownselectSamplerBase):
     SUB_SAMPLER_CLASS = ResidentialQuotaSampler
diff --git a/buildstockbatch/test/test_docker.py b/buildstockbatch/test/test_docker.py
index 20644519..87b6e661 100644
--- a/buildstockbatch/test/test_docker.py
+++ b/buildstockbatch/test/test_docker.py
@@ -1,44 +1,13 @@
 import os
-import requests
-import re
-from unittest.mock import patch
+import pytest
 import yaml
 
-from buildstockbatch.base import BuildStockBatchBase
-from buildstockbatch.localdocker import LocalDockerBatch
+from buildstockbatch.localdocker import LocalBatch
 
 here = os.path.dirname(os.path.abspath(__file__))
 
 
-def test_docker_image_exists_on_docker_hub(basic_residential_project_file):
-    project_filename, results_dir = basic_residential_project_file()
-    # Use a BuildStockBatchBase instance to get the version of OpenStudio
-    # because instantiating a LocalDockerBatch fails to connect
-    # with the docker website in the testing context for some reason.
-    with patch.object(BuildStockBatchBase, 'weather_dir', None):
-        bsb = BuildStockBatchBase(project_filename)
-        docker_image = 'nrel/openstudio'
-        docker_tag = bsb.os_version
-        baseurl = 'https://registry.hub.docker.com/v2/'
-        r1 = requests.get(baseurl)
-        assert r1.status_code == 401
-        m = re.search(r'realm="(.+?)"', r1.headers['Www-Authenticate'])
-        authurl = m.group(1)
-        m = re.search(r'service="(.+?)"', r1.headers['Www-Authenticate'])
-        service = m.group(1)
-        r2 = requests.get(authurl, params={
-            'service': service,
-            'scope': f'repository:{docker_image}:pull'
-        })
-        assert r2.ok
-        token = r2.json()['token']
-        r3 = requests.head(
-            f'{baseurl}{docker_image}/manifests/{docker_tag}',
-            headers={'Authorization': f'Bearer {token}'}
-        )
-        assert r3.ok
-
-
+@pytest.mark.skip(reason="We need to change the way we're installing custom gems")
 def test_custom_gem_install(basic_residential_project_file):
     project_filename, results_dir = basic_residential_project_file()
 
@@ -51,7 +20,7 @@ def test_custom_gem_install(basic_residential_project_file):
 
     buildstock_directory = cfg['buildstock_directory']
 
-    LocalDockerBatch(project_filename)
+    LocalBatch(project_filename)
 
     bundle_install_log_path = os.path.join(buildstock_directory,
                                            'resources',
diff --git a/buildstockbatch/test/test_integration.py b/buildstockbatch/test/test_integration.py
index 467825e1..3ab28f7c 100644
--- a/buildstockbatch/test/test_integration.py
+++ b/buildstockbatch/test/test_integration.py
@@ -3,7 +3,7 @@
 import pytest
 import shutil
 
-from buildstockbatch.localdocker import LocalDockerBatch
+from buildstockbatch.localdocker import LocalBatch
 from buildstockbatch.test.shared_testing_stuff import resstock_directory, resstock_required
 
 
@@ -15,8 +15,8 @@
 ], ids=lambda x: x.stem)
 @resstock_required
 def test_resstock_local_batch(project_filename):
-    LocalDockerBatch.validate_project(str(project_filename))
-    batch = LocalDockerBatch(str(project_filename))
+    LocalBatch.validate_project(str(project_filename))
+    batch = LocalBatch(str(project_filename))
 
     # Get the number of upgrades
     n_upgrades = len(batch.cfg.get("upgrades", []))
diff --git a/buildstockbatch/test/test_validation.py b/buildstockbatch/test/test_validation.py
index 73ce0334..8988850e 100644
--- a/buildstockbatch/test/test_validation.py
+++ b/buildstockbatch/test/test_validation.py
@@ -10,7 +10,7 @@
 :license: BSD-3
 """
 
-
+import inspect
 import os
 import pytest
 import types
@@ -18,7 +18,7 @@
 import json
 import pathlib
 from buildstockbatch.eagle import EagleBatch
-from buildstockbatch.localdocker import LocalDockerBatch
+from buildstockbatch.localdocker import LocalBatch
 from buildstockbatch.base import BuildStockBatchBase, ValidationError
 from buildstockbatch.test.shared_testing_stuff import resstock_directory, resstock_required
 from buildstockbatch.utils import get_project_configuration
@@ -38,20 +38,20 @@ def filter_logs(logs, level):
     return filtered_logs
 
 
-def test_base_validation_is_static():
-    assert isinstance(BuildStockBatchBase.validate_project, types.FunctionType)
+def test_base_validation_is_classmethod():
+    assert inspect.ismethod(BuildStockBatchBase.validate_project)
 
 
 def test_base_schema_validation_is_static():
     assert isinstance(BuildStockBatchBase.validate_project_schema, types.FunctionType)
 
 
-def test_eagle_validation_is_static():
-    assert isinstance(EagleBatch.validate_project, types.FunctionType)
+def test_eagle_validation_is_classmethod():
+    assert inspect.ismethod(EagleBatch.validate_project)
 
 
-def test_local_docker_validation_is_static():
-    assert isinstance(LocalDockerBatch.validate_project, types.FunctionType)
+def test_local_docker_validation_is_classmethod():
+    assert inspect.ismethod(LocalBatch.validate_project)
 
 
 def test_complete_schema_passes_validation():
@@ -282,7 +282,7 @@ def test_number_of_options_apply_upgrade():
         with open(new_proj_filename, "w") as f:
             json.dump(cfg, f)
         with pytest.raises(ValidationError):
-            LocalDockerBatch.validate_number_of_options(str(new_proj_filename))
+            LocalBatch.validate_number_of_options(str(new_proj_filename))
 
 
 @resstock_required

From 54ec3e376f827c2746b7e6842af7432091c630c4 Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Thu, 16 Feb 2023 11:23:28 -0700
Subject: [PATCH 02/17] fixing linting

---
 .github/workflows/ci.yml                                | 4 ++--
 buildstockbatch/localdocker.py                          | 1 -
 buildstockbatch/workflow_generator/residential_hpxml.py | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 38a2d110..06079b89 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,8 +42,8 @@ jobs:
           cd buildstockbatch
           # stop the build if there are Python syntax errors or undefined names
           flake8 buildstockbatch --count --select=E9,F63,F7,F82 --show-source --statistics
-          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-          flake8 buildstockbatch --count --max-line-length=127 --statistics
+          # exit-zero treats all errors as warnings.
+          flake8 buildstockbatch --count --statistics --exit-zero
       - name: Run PyTest and Coverage
         run: |
           cd buildstockbatch
diff --git a/buildstockbatch/localdocker.py b/buildstockbatch/localdocker.py
index b5f80b4e..af4f5444 100644
--- a/buildstockbatch/localdocker.py
+++ b/buildstockbatch/localdocker.py
@@ -27,7 +27,6 @@
 import shutil
 import subprocess
 import tarfile
-import tempfile
 
 from buildstockbatch.base import BuildStockBatchBase, SimulationExists
 from buildstockbatch import postprocessing
diff --git a/buildstockbatch/workflow_generator/residential_hpxml.py b/buildstockbatch/workflow_generator/residential_hpxml.py
index 5946026f..ac6373c9 100644
--- a/buildstockbatch/workflow_generator/residential_hpxml.py
+++ b/buildstockbatch/workflow_generator/residential_hpxml.py
@@ -139,7 +139,7 @@ def validate(cls, cfg):
             retain_stdout_expandobject: bool(required=False)
             retain_schedules_csv: bool(required=False)
             debug: bool(required=False)
-        """
+        """  # noqa E501
         workflow_generator_args = cfg['workflow_generator']['args']
         schema_yml = re.sub(r'^ {8}', '', schema_yml, flags=re.MULTILINE)
         schema = yamale.make_schema(content=schema_yml, parser='ruamel')

From b94090f2adb8225d91a76a9aebfcfc891ce277ed Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Thu, 16 Feb 2023 14:47:24 -0700
Subject: [PATCH 03/17] adding openstudio install to ci

---
 .github/workflows/ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 06079b89..05d6dd91 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,11 @@ jobs:
           mkdir weather
           cd weather
           wget --quiet https://data.nrel.gov/system/files/156/BuildStock_TMY3_FIPS.zip
+      - name: Download and Install OpenStudio
+        run: |
+          wget https://github.com/NREL/OpenStudio/releases/download/v3.5.1/OpenStudio-3.5.1+22e1db7be5-Ubuntu-20.04.deb
+          sudo apt install -y ./OpenStudio-3.5.1+22e1db7be5-Ubuntu-20.04.deb
+          openstudio openstudio_version
       - name: Install buildstockbatch
         run: |
           cd buildstockbatch

From af26fb10229bb39f98413c075636786d2efca432 Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Thu, 16 Feb 2023 14:57:41 -0700
Subject: [PATCH 04/17] debugging openstudio path stuff

---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 05d6dd91..7da66871 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,12 +34,14 @@ jobs:
           wget --quiet https://data.nrel.gov/system/files/156/BuildStock_TMY3_FIPS.zip
       - name: Download and Install OpenStudio
         run: |
-          wget https://github.com/NREL/OpenStudio/releases/download/v3.5.1/OpenStudio-3.5.1+22e1db7be5-Ubuntu-20.04.deb
+          wget -q https://github.com/NREL/OpenStudio/releases/download/v3.5.1/OpenStudio-3.5.1+22e1db7be5-Ubuntu-20.04.deb
           sudo apt install -y ./OpenStudio-3.5.1+22e1db7be5-Ubuntu-20.04.deb
           openstudio openstudio_version
+          which openstudio
       - name: Install buildstockbatch
         run: |
           cd buildstockbatch
+          which openstudio
           python -m pip install --progress-bar off --upgrade pip
           pip install .[dev] --progress-bar off
       - name: Linting

From 641bd078cfa1d288a1799d6914ce786b127e4bbe Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Thu, 16 Feb 2023 15:04:39 -0700
Subject: [PATCH 05/17] just running test I'm interested in to save time

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7da66871..6ad852a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,7 +41,6 @@ jobs:
       - name: Install buildstockbatch
         run: |
           cd buildstockbatch
-          which openstudio
           python -m pip install --progress-bar off --upgrade pip
           pip install .[dev] --progress-bar off
       - name: Linting
@@ -54,7 +53,8 @@ jobs:
       - name: Run PyTest and Coverage
         run: |
           cd buildstockbatch
-          pytest --junitxml=coverage/junit.xml --cov=buildstockbatch --cov-report=xml:coverage/coverage.xml --cov-report=html:coverage/htmlreport
+          which openstudio
+          pytest --junitxml=coverage/junit.xml --cov=buildstockbatch --cov-report=xml:coverage/coverage.xml --cov-report=html:coverage/htmlreport "buildstockbatch/test/test_integration.py::test_resstock_local_batch[national_baseline]"
       - name: Test Report
         uses: mikepenz/action-junit-report@v3.5.2
         if: ${{ matrix.python-version == '3.10' }}

From 8063d9fa1235e1ae0cf0d84c15118f5e042d3120 Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Thu, 16 Feb 2023 15:07:10 -0700
Subject: [PATCH 06/17] only one version of python for now

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ad852a9..6c4af299 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.10']
+        # python-version: ['3.8', '3.9', '3.10']
     name: Tests - Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v3

From ab41514996ad441d57325c8b3b2701cf87f0dd19 Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Thu, 16 Feb 2023 15:58:24 -0700
Subject: [PATCH 07/17] fixing environment on building simulation

---
 buildstockbatch/localdocker.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildstockbatch/localdocker.py b/buildstockbatch/localdocker.py
index af4f5444..18555c4d 100644
--- a/buildstockbatch/localdocker.py
+++ b/buildstockbatch/localdocker.py
@@ -179,9 +179,9 @@ def run_building(cls, buildstock_dir, weather_dir, results_dir, measures_only,
             # else:
             run_cmd.insert(2, '--measures_only')
 
-        env_vars = {
-            'BUILDSTOCKBATCH_VERSION': bsb_version
-        }
+        env_vars = {}
+        env_vars.update(os.environ)
+        env_vars['BUILDSTOCKBATCH_VERSION'] = bsb_version
 
         proc_output = subprocess.run(
             run_cmd,

From 3e1e4ed5f042f6c9ddf07cab67bb49249bf06f3b Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Thu, 16 Feb 2023 16:00:53 -0700
Subject: [PATCH 08/17] reverting ci changes that limited tests

---
 .github/workflows/ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6c4af299..d70e72d3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,8 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10']
-        # python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10']
     name: Tests - Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v3
@@ -54,8 +53,7 @@ jobs:
       - name: Run PyTest and Coverage
         run: |
           cd buildstockbatch
-          which openstudio
-          pytest --junitxml=coverage/junit.xml --cov=buildstockbatch --cov-report=xml:coverage/coverage.xml --cov-report=html:coverage/htmlreport "buildstockbatch/test/test_integration.py::test_resstock_local_batch[national_baseline]"
+          pytest --junitxml=coverage/junit.xml --cov=buildstockbatch --cov-report=xml:coverage/coverage.xml --cov-report=html:coverage/htmlreport
       - name: Test Report
         uses: mikepenz/action-junit-report@v3.5.2
         if: ${{ matrix.python-version == '3.10' }}

From fb3a67d96e83605e7c8a34bb02242dd3289b7057 Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Thu, 16 Feb 2023 17:09:32 -0700
Subject: [PATCH 09/17] renaming localdocker.py to local.py

---
 buildstockbatch/aws/aws.py                   | 1 -
 buildstockbatch/base.py                      | 2 +-
 buildstockbatch/{localdocker.py => local.py} | 0
 buildstockbatch/test/test_docker.py          | 2 +-
 buildstockbatch/test/test_integration.py     | 2 +-
 buildstockbatch/test/test_validation.py      | 2 +-
 setup.py                                     | 2 +-
 7 files changed, 5 insertions(+), 6 deletions(-)
 rename buildstockbatch/{localdocker.py => local.py} (100%)

diff --git a/buildstockbatch/aws/aws.py b/buildstockbatch/aws/aws.py
index 41bc9afe..f2521d9d 100644
--- a/buildstockbatch/aws/aws.py
+++ b/buildstockbatch/aws/aws.py
@@ -1675,7 +1675,6 @@ def __init__(self, project_filename):
     @staticmethod
     def validate_project(project_file):
         super(DockerBatchBase, DockerBatchBase).validate_project(project_file)
-        # LocalDocker specific code goes here
 
     @property
     def docker_image(self):
diff --git a/buildstockbatch/base.py b/buildstockbatch/base.py
index 17f32af0..be905210 100644
--- a/buildstockbatch/base.py
+++ b/buildstockbatch/base.py
@@ -3,7 +3,7 @@
 """
 buildstockbatch.base
 ~~~~~~~~~~~~~~~
-This is the base class mixed into the deployment specific classes (i.e. eagle, localdocker)
+This is the base class mixed into the deployment specific classes (i.e. eagle, local)
 
 :author: Noel Merket
 :copyright: (c) 2018 by The Alliance for Sustainable Energy
diff --git a/buildstockbatch/localdocker.py b/buildstockbatch/local.py
similarity index 100%
rename from buildstockbatch/localdocker.py
rename to buildstockbatch/local.py
diff --git a/buildstockbatch/test/test_docker.py b/buildstockbatch/test/test_docker.py
index 87b6e661..36f110eb 100644
--- a/buildstockbatch/test/test_docker.py
+++ b/buildstockbatch/test/test_docker.py
@@ -2,7 +2,7 @@
 import pytest
 import yaml
 
-from buildstockbatch.localdocker import LocalBatch
+from buildstockbatch.local import LocalBatch
 
 here = os.path.dirname(os.path.abspath(__file__))
 
diff --git a/buildstockbatch/test/test_integration.py b/buildstockbatch/test/test_integration.py
index 3ab28f7c..74bb7819 100644
--- a/buildstockbatch/test/test_integration.py
+++ b/buildstockbatch/test/test_integration.py
@@ -3,7 +3,7 @@
 import pytest
 import shutil
 
-from buildstockbatch.localdocker import LocalBatch
+from buildstockbatch.local import LocalBatch
 from buildstockbatch.test.shared_testing_stuff import resstock_directory, resstock_required
 
 
diff --git a/buildstockbatch/test/test_validation.py b/buildstockbatch/test/test_validation.py
index 8988850e..5533d917 100644
--- a/buildstockbatch/test/test_validation.py
+++ b/buildstockbatch/test/test_validation.py
@@ -18,7 +18,7 @@
 import json
 import pathlib
 from buildstockbatch.eagle import EagleBatch
-from buildstockbatch.localdocker import LocalBatch
+from buildstockbatch.local import LocalBatch
 from buildstockbatch.base import BuildStockBatchBase, ValidationError
 from buildstockbatch.test.shared_testing_stuff import resstock_directory, resstock_required
 from buildstockbatch.utils import get_project_configuration
diff --git a/setup.py b/setup.py
index 60e1d73c..8f1c6cbd 100644
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def run_tests(self):
     },
     entry_points={
         'console_scripts': [
-            'buildstock_docker=buildstockbatch.localdocker:main',
+            'buildstock_local=buildstockbatch.local:main',
             'buildstock_eagle=buildstockbatch.eagle:user_cli',
             'buildstock_aws=buildstockbatch.aws.aws:main'
         ]

From 66211e9f93c0f81eea2f5d4645b96355ac8d5018 Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Thu, 16 Feb 2023 17:11:07 -0700
Subject: [PATCH 10/17] adding python 3.11 as accepted version and to ci

---
 .github/workflows/ci.yml | 12 ++++++------
 setup.py                 |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d70e72d3..5315fb82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
     name: Tests - Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v3
@@ -56,33 +56,33 @@ jobs:
           pytest --junitxml=coverage/junit.xml --cov=buildstockbatch --cov-report=xml:coverage/coverage.xml --cov-report=html:coverage/htmlreport
       - name: Test Report
         uses: mikepenz/action-junit-report@v3.5.2
-        if: ${{ matrix.python-version == '3.10' }}
+        if: ${{ matrix.python-version == '3.11' }}
         with:
           report_paths: buildstockbatch/coverage/junit.xml
           check_name: Testing Report
           fail_on_failure: true
       - name: Save Coverage Report
         uses: actions/upload-artifact@v3
-        if: ${{ matrix.python-version == '3.10' }}
+        if: ${{ matrix.python-version == '3.11' }}
         with:
           name: coverage-report-html
           path: buildstockbatch/coverage/htmlreport/
       - name: Report coverage to PR
         uses: 5monkeys/cobertura-action@v13
-        if: ${{ matrix.python-version == '3.10' }}
+        if: ${{ matrix.python-version == '3.11' }}
         with:
           path: buildstockbatch/coverage/coverage.xml
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           minimum_coverage: 33
           fail_below_threshold: true
       - name: Build documentation
-        if: ${{ matrix.python-version == '3.10' }}
+        if: ${{ matrix.python-version == '3.11' }}
         run: |
           cd buildstockbatch/docs
           make html SPHINXOPTS="-W --keep-going -n"
       - name: Save Docs
         uses: actions/upload-artifact@v3
-        if: ${{ matrix.python-version == '3.10' }}
+        if: ${{ matrix.python-version == '3.11' }}
         with:
           name: documentation
           path: buildstockbatch/docs/_build/html/
diff --git a/setup.py b/setup.py
index 8f1c6cbd..738f2a76 100644
--- a/setup.py
+++ b/setup.py
@@ -102,9 +102,9 @@ def run_tests(self):
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11'
     ]
 )

From 9c00daf02490950567351e3450c709efe1d84066 Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Fri, 17 Feb 2023 14:53:51 -0700
Subject: [PATCH 11/17] removing ContainerRuntime enum and reorging samplers a
 little

---
 buildstockbatch/aws/aws.py                   |  8 +++--
 buildstockbatch/base.py                      |  7 +++--
 buildstockbatch/eagle.py                     |  8 +++--
 buildstockbatch/local.py                     |  8 +++--
 buildstockbatch/sampler/base.py              | 32 ++------------------
 buildstockbatch/sampler/commercial_sobol.py  | 11 ++-----
 buildstockbatch/sampler/downselect.py        |  6 ++--
 buildstockbatch/sampler/precomputed.py       |  5 +--
 buildstockbatch/sampler/residential_quota.py |  5 +--
 buildstockbatch/test/test_base.py            |  2 --
 10 files changed, 34 insertions(+), 58 deletions(-)

diff --git a/buildstockbatch/aws/aws.py b/buildstockbatch/aws/aws.py
index f2521d9d..7f596799 100644
--- a/buildstockbatch/aws/aws.py
+++ b/buildstockbatch/aws/aws.py
@@ -42,7 +42,7 @@
 from buildstockbatch.base import ValidationError, BuildStockBatchBase
 from buildstockbatch.aws.awsbase import AwsJobBase
 from buildstockbatch import postprocessing
-from buildstockbatch.utils import ContainerRuntime, log_error_details, get_project_configuration
+from buildstockbatch.utils import log_error_details, get_project_configuration
 
 logger = logging.getLogger(__name__)
 
@@ -1660,8 +1660,6 @@ def clean(self):
 
 class DockerBatchBase(BuildStockBatchBase):
 
-    CONTAINER_RUNTIME = ContainerRuntime.DOCKER
-
     def __init__(self, project_filename):
         super().__init__(project_filename)
 
@@ -1732,6 +1730,10 @@ def docker_image(self):
     def weather_dir(self):
         return self._weather_dir
 
+    @property
+    def sampler_csv_base_path(self):
+        return self.project_dir
+
     @property
     def container_repo(self):
         repo_name = self.docker_image
diff --git a/buildstockbatch/base.py b/buildstockbatch/base.py
index be905210..64bdb23d 100644
--- a/buildstockbatch/base.py
+++ b/buildstockbatch/base.py
@@ -46,7 +46,6 @@ class BuildStockBatchBase(object):
     # http://openstudio-builds.s3-website-us-east-1.amazonaws.com
     DEFAULT_OS_VERSION = '3.5.1'
     DEFAULT_OS_SHA = '22e1db7be5'
-    CONTAINER_RUNTIME = None
     LOGO = '''
      _ __         _     __,              _ __
     ( /  )    o  //   /(    _/_       / ( /  )     _/_    /
@@ -86,11 +85,15 @@ def get_workflow_generator_class(workflow_generator_name):
             ''.join(x.capitalize() for x in workflow_generator_name.strip().split('_')) + 'WorkflowGenerator'
         return getattr(workflow_generator, workflow_generator_class_name)
 
+    @property
+    def sampler_csv_base_path(self):
+        raise NotImplementedError
+
     @property
     def sampler(self):
         # Select a sampler
         Sampler = self.get_sampler_class(self.cfg['sampler']['type'])
-        return Sampler(self, **self.cfg['sampler'].get('args', {}))
+        return Sampler(self, self.sampler_csv_base_path, **self.cfg['sampler'].get('args', {}))
 
     @staticmethod
     def openstudio_exe():
diff --git a/buildstockbatch/eagle.py b/buildstockbatch/eagle.py
index 244422b6..482379ab 100644
--- a/buildstockbatch/eagle.py
+++ b/buildstockbatch/eagle.py
@@ -36,7 +36,7 @@
 import csv
 
 from buildstockbatch.base import BuildStockBatchBase, SimulationExists
-from buildstockbatch.utils import log_error_details, get_error_details, ContainerRuntime
+from buildstockbatch.utils import log_error_details, get_error_details
 from buildstockbatch import postprocessing
 from buildstockbatch.__version__ import __version__ as bsb_version
 
@@ -49,8 +49,6 @@ def get_bool_env_var(varname):
 
 class EagleBatch(BuildStockBatchBase):
 
-    CONTAINER_RUNTIME = ContainerRuntime.SINGULARITY
-
     sys_image_dir = '/shared-projects/buildstock/singularity_images'
     hpc_name = 'eagle'
     min_sims_per_job = 36 * 2
@@ -90,6 +88,10 @@ def results_dir(self):
         assert os.path.isdir(results_dir)
         return results_dir
 
+    @property
+    def sampler_csv_base_path(self):
+        return self.output_dir
+
     @staticmethod
     def clear_and_copy_dir(src, dst):
         if os.path.exists(dst):
diff --git a/buildstockbatch/local.py b/buildstockbatch/local.py
index 18555c4d..5ac8356a 100644
--- a/buildstockbatch/local.py
+++ b/buildstockbatch/local.py
@@ -30,7 +30,7 @@
 
 from buildstockbatch.base import BuildStockBatchBase, SimulationExists
 from buildstockbatch import postprocessing
-from buildstockbatch.utils import log_error_details, ContainerRuntime
+from buildstockbatch.utils import log_error_details
 from buildstockbatch.__version__ import __version__ as bsb_version
 
 logger = logging.getLogger(__name__)
@@ -38,8 +38,6 @@
 
 class LocalBatch(BuildStockBatchBase):
 
-    CONTAINER_RUNTIME = ContainerRuntime.DOCKER
-
     def __init__(self, project_filename):
         super().__init__(project_filename)
 
@@ -126,6 +124,10 @@ def weather_dir(self):
             self._get_weather_files()
         return self._weather_dir
 
+    @property
+    def sampler_csv_base_path(self):
+        return self.project_dir
+
     @classmethod
     def run_building(cls, buildstock_dir, weather_dir, results_dir, measures_only,
                      n_datapoints, cfg, i, upgrade_idx=None):
diff --git a/buildstockbatch/sampler/base.py b/buildstockbatch/sampler/base.py
index df51af4b..88dc2ea7 100644
--- a/buildstockbatch/sampler/base.py
+++ b/buildstockbatch/sampler/base.py
@@ -10,11 +10,8 @@
 """
 
 import logging
-import os
 import weakref
 
-from buildstockbatch.utils import ContainerRuntime
-
 logger = logging.getLogger(__name__)
 
 
@@ -37,7 +34,7 @@ def validate_args(project_filename, **kw):
         """
         return True
 
-    def __init__(self, parent):
+    def __init__(self, parent, csv_base_path):
         """
         Create the buildstock.csv file required for batch simulations using this class.
 
@@ -48,12 +45,7 @@ def __init__(self, parent):
         :param parent: The BuildStockBatchBase object that owns this sampler.
         """
         self.parent = weakref.ref(parent)  # This removes circular references and allows garbage collection to work.
-        if self.container_runtime == ContainerRuntime.DOCKER:
-            self.csv_path = os.path.join(self.project_dir, 'housing_characteristics', 'buildstock.csv')
-        elif self.container_runtime == ContainerRuntime.SINGULARITY:
-            self.csv_path = os.path.join(self.parent().output_dir, 'housing_characteristics', 'buildstock.csv')
-        else:
-            self.csv_path = None
+        self.csv_base_path = csv_base_path
 
     @property
     def cfg(self):
@@ -77,24 +69,4 @@ def run_sampling(self):
 
         Replace this in a subclass if your sampling doesn't depend on containerization.
         """
-        if self.container_runtime == ContainerRuntime.DOCKER:
-            return self._run_sampling_docker()
-        else:
-            assert self.container_runtime == ContainerRuntime.SINGULARITY
-            return self._run_sampling_singularity()
-
-    def _run_sampling_docker(self):
-        """
-        Execute the sampling in a docker container
-
-        Replace this in a subclass if your sampling needs docker.
-        """
-        raise NotImplementedError
-
-    def _run_sampling_singularity(self):
-        """
-        Execute the sampling in a singularity container
-
-        Replace this in a subclass if your sampling needs docker.
-        """
         raise NotImplementedError
diff --git a/buildstockbatch/sampler/commercial_sobol.py b/buildstockbatch/sampler/commercial_sobol.py
index 3bdc8540..7fb7bfba 100644
--- a/buildstockbatch/sampler/commercial_sobol.py
+++ b/buildstockbatch/sampler/commercial_sobol.py
@@ -21,7 +21,6 @@
 
 from .sobol_lib import i4_sobol_generate
 from .base import BuildStockSampler
-from buildstockbatch.utils import ContainerRuntime
 from buildstockbatch.exc import ValidationError
 
 logger = logging.getLogger(__name__)
@@ -29,7 +28,7 @@
 
 class CommercialSobolSampler(BuildStockSampler):
 
-    def __init__(self, parent, n_datapoints):
+    def __init__(self, parent, csv_base_path, n_datapoints):
         """
         Initialize the sampler.
 
@@ -38,13 +37,9 @@ def __init__(self, parent, n_datapoints):
         :param buildstock_dir: The location of the comstock or resstock repo
         :param project_dir: The project directory within the comstock or resstock repo
         """
-        super().__init__(parent)
+        super().__init__(parent, csv_base_path)
         self.validate_args(self.parent().project_filename, n_datapoints=n_datapoints)
-        if self.container_runtime == ContainerRuntime.SINGULARITY:
-            self.csv_path = os.path.join(self.output_dir, 'buildstock.csv')
-        else:
-            assert self.container_runtime == ContainerRuntime.DOCKER
-            self.csv_path = os.path.join(self.project_dir, 'buildstock.csv')
+        self.csv_path = os.path.join(self.csv_base_path, 'buildstock.csv')
         self.n_datapoints = n_datapoints
 
     @classmethod
diff --git a/buildstockbatch/sampler/downselect.py b/buildstockbatch/sampler/downselect.py
index 575fb3e8..d4328f54 100644
--- a/buildstockbatch/sampler/downselect.py
+++ b/buildstockbatch/sampler/downselect.py
@@ -25,7 +25,7 @@ class DownselectSamplerBase(BuildStockSampler):
 
     SUB_SAMPLER_CLASS = None
 
-    def __init__(self, parent, n_datapoints, logic, resample=True, **kw):
+    def __init__(self, parent, csv_base_path, n_datapoints, logic, resample=True, **kw):
         """Downselect Sampler
 
         This sampler performs a downselect of another sampler based on
@@ -41,7 +41,7 @@ def __init__(self, parent, n_datapoints, logic, resample=True, **kw):
         :type resample: bool, optional
         :param **kw: args to pass through to sub sampler
         """
-        super().__init__(parent)
+        super().__init__(parent, csv_base_path)
         self.validate_args(
             self.parent().project_filename,
             n_datapoints=n_datapoints,
@@ -53,7 +53,7 @@ def __init__(self, parent, n_datapoints, logic, resample=True, **kw):
         self.resample = resample
         self.n_datapoints = n_datapoints
         self.sub_kw = kw
-        sampler = self.SUB_SAMPLER_CLASS(self.parent(), n_datapoints=n_datapoints, **kw)
+        sampler = self.SUB_SAMPLER_CLASS(self.parent(), csv_base_path, n_datapoints=n_datapoints, **kw)
         self.csv_path = sampler.csv_path
 
     @classmethod
diff --git a/buildstockbatch/sampler/precomputed.py b/buildstockbatch/sampler/precomputed.py
index f42ca8ad..120b16a8 100644
--- a/buildstockbatch/sampler/precomputed.py
+++ b/buildstockbatch/sampler/precomputed.py
@@ -23,7 +23,7 @@
 
 class PrecomputedSampler(BuildStockSampler):
 
-    def __init__(self, parent, sample_file):
+    def __init__(self, parent, csv_base_path, sample_file):
         """Precomputed Sampler
 
         :param parent: BuildStockBatchBase object
@@ -31,10 +31,11 @@ def __init__(self, parent, sample_file):
         :param sample_file: relative or absolute path to buildstock.csv to use
         :type sample_file: str
         """
-        super().__init__(parent)
+        super().__init__(parent, csv_base_path)
         project_filename = self.parent().project_filename
         self.validate_args(project_filename, sample_file=sample_file)
         self.buildstock_csv = path_rel_to_file(project_filename, sample_file)
+        self.csv_path = os.path.join(self.csv_base_path, 'housing_characteristics', 'buildstock.csv')
 
     @classmethod
     def validate_args(cls, project_filename, **kw):
diff --git a/buildstockbatch/sampler/residential_quota.py b/buildstockbatch/sampler/residential_quota.py
index b7af3b69..d41203b3 100644
--- a/buildstockbatch/sampler/residential_quota.py
+++ b/buildstockbatch/sampler/residential_quota.py
@@ -22,7 +22,7 @@
 
 class ResidentialQuotaSampler(BuildStockSampler):
 
-    def __init__(self, parent, n_datapoints):
+    def __init__(self, parent, csv_base_path, n_datapoints):
         """Residential Quota Sampler
 
         :param parent: BuildStockBatchBase object
@@ -30,9 +30,10 @@ def __init__(self, parent, n_datapoints):
         :param n_datapoints: number of datapoints to sample
         :type n_datapoints: int
         """
-        super().__init__(parent)
+        super().__init__(parent, csv_base_path)
         self.validate_args(self.parent().project_filename, n_datapoints=n_datapoints)
         self.n_datapoints = n_datapoints
+        self.csv_path = os.path.join(self.csv_base_path, 'housing_characteristics', 'buildstock.csv')
 
     @classmethod
     def validate_args(cls, project_filename, **kw):
diff --git a/buildstockbatch/test/test_base.py b/buildstockbatch/test/test_base.py
index f4b39a5e..17aa7313 100644
--- a/buildstockbatch/test/test_base.py
+++ b/buildstockbatch/test/test_base.py
@@ -19,7 +19,6 @@
 from buildstockbatch.base import BuildStockBatchBase
 from buildstockbatch.exc import ValidationError
 from buildstockbatch.postprocessing import write_dataframe_as_parquet
-from buildstockbatch.utils import ContainerRuntime
 
 dask.config.set(scheduler='synchronous')
 here = os.path.dirname(os.path.abspath(__file__))
@@ -409,7 +408,6 @@ def test_provide_buildstock_csv(basic_residential_project_file, mocker):
     })
     mocker.patch.object(BuildStockBatchBase, 'weather_dir', None)
     mocker.patch.object(BuildStockBatchBase, 'results_dir', results_dir)
-    mocker.patch.object(BuildStockBatchBase, 'CONTAINER_RUNTIME', ContainerRuntime.DOCKER)
 
     bsb = BuildStockBatchBase(project_filename)
     sampling_output_csv = bsb.sampler.run_sampling()

From d238371e73db23e29d4211fafca51b50a8301113 Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Mon, 20 Feb 2023 10:40:04 -0700
Subject: [PATCH 12/17] fixing buildstock csv test

---
 buildstockbatch/test/test_base.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildstockbatch/test/test_base.py b/buildstockbatch/test/test_base.py
index 17aa7313..6fe0c7ce 100644
--- a/buildstockbatch/test/test_base.py
+++ b/buildstockbatch/test/test_base.py
@@ -17,6 +17,7 @@
 
 import buildstockbatch
 from buildstockbatch.base import BuildStockBatchBase
+from buildstockbatch.local import LocalBatch
 from buildstockbatch.exc import ValidationError
 from buildstockbatch.postprocessing import write_dataframe_as_parquet
 
@@ -406,10 +407,10 @@ def test_provide_buildstock_csv(basic_residential_project_file, mocker):
             }
         }
     })
-    mocker.patch.object(BuildStockBatchBase, 'weather_dir', None)
-    mocker.patch.object(BuildStockBatchBase, 'results_dir', results_dir)
+    mocker.patch.object(LocalBatch, 'weather_dir', None)
+    mocker.patch.object(LocalBatch, 'results_dir', results_dir)
 
-    bsb = BuildStockBatchBase(project_filename)
+    bsb = LocalBatch(project_filename)
     sampling_output_csv = bsb.sampler.run_sampling()
     df2 = pd.read_csv(sampling_output_csv)
     pd.testing.assert_frame_equal(df, df2)
@@ -422,4 +423,4 @@ def test_provide_buildstock_csv(basic_residential_project_file, mocker):
         yaml.dump(cfg, f)
 
     with pytest.raises(ValidationError, match=r"sample_file doesn't exist"):
-        BuildStockBatchBase(project_filename).sampler.run_sampling()
+        LocalBatch(project_filename).sampler.run_sampling()

From e8339fb96513a0a5fa11fd12a6bb48cf035190e9 Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Mon, 20 Feb 2023 15:07:32 -0700
Subject: [PATCH 13/17] having docs generation call buildstock_local

---
 buildstockbatch/__init__.py | 2 +-
 docs/run_sims.rst           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildstockbatch/__init__.py b/buildstockbatch/__init__.py
index 80124e43..ea885295 100644
--- a/buildstockbatch/__init__.py
+++ b/buildstockbatch/__init__.py
@@ -19,7 +19,7 @@
 ```
    user$ pyenv activate buildstockbatch
    user$ pip install -e ./buildstockbatch
-   user$ buildstock_docker -j -2 ~/buildstockbatch/project_resstock_multifamily.yml
+   user$ buildstock_local -j -2 ~/buildstockbatch/project_resstock_multifamily.yml
 ```
 Other batch simulation methods may be supported in future. Please refer to the documentation for more
 details regarding these features, and configuration via the project yaml configuration documentation.
diff --git a/docs/run_sims.rst b/docs/run_sims.rst
index b008685a..8e1e332a 100644
--- a/docs/run_sims.rst
+++ b/docs/run_sims.rst
@@ -10,9 +10,9 @@ looks like a little whale with boxes on its back. Select "Preferences..." and "A
 Slide the CPUs available to Docker to the number of concurrent simulations you want to run
 (probably all of them).
 
-Running a project file is straightforward. Call the ``buildstock_docker`` command line tool as follows:
+Running a project file is straightforward. Call the ``buildstock_local`` command line tool as follows:
 
-.. command-output:: buildstock_docker --help
+.. command-output:: buildstock_local --help
    :ellipsis: 0,8
 
 .. warning::

From fc70a5d6ef14a0b30858e21d638ed0315b6157e5 Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Mon, 20 Feb 2023 11:23:12 -0700
Subject: [PATCH 14/17] moving openstudio path validation to LocalBatch

---
 buildstockbatch/base.py  | 1 -
 buildstockbatch/local.py | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildstockbatch/base.py b/buildstockbatch/base.py
index 64bdb23d..3f277f37 100644
--- a/buildstockbatch/base.py
+++ b/buildstockbatch/base.py
@@ -260,7 +260,6 @@ def get_clean_column_name(x):
     @classmethod
     def validate_project(cls, project_file):
         assert cls.validate_project_schema(project_file)
-        assert cls.validate_openstudio_path(project_file)
         assert cls.validate_sampler(project_file)
         assert cls.validate_workflow_generator(project_file)
         assert cls.validate_misc_constraints(project_file)
diff --git a/buildstockbatch/local.py b/buildstockbatch/local.py
index 5ac8356a..f02ffe2f 100644
--- a/buildstockbatch/local.py
+++ b/buildstockbatch/local.py
@@ -116,6 +116,7 @@ def __init__(self, project_filename):
     def validate_project(cls, project_file):
         super(cls, cls).validate_project(project_file)
         # LocalBatch specific code goes here
+        assert cls.validate_openstudio_path(project_file)
 
     @property
     def weather_dir(self):

From c52cc02e48994b96d4e9a92f9e3b633e9f05470f Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Mon, 20 Feb 2023 11:23:27 -0700
Subject: [PATCH 15/17] Revert "removing ContainerRuntime enum and reorging
 samplers a little"

This reverts commit 9c00daf02490950567351e3450c709efe1d84066.
---
 buildstockbatch/aws/aws.py                   |  8 ++---
 buildstockbatch/base.py                      |  7 ++---
 buildstockbatch/eagle.py                     |  8 ++---
 buildstockbatch/local.py                     |  8 ++---
 buildstockbatch/sampler/base.py              | 32 ++++++++++++++++++--
 buildstockbatch/sampler/commercial_sobol.py  | 11 +++++--
 buildstockbatch/sampler/downselect.py        |  6 ++--
 buildstockbatch/sampler/precomputed.py       |  5 ++-
 buildstockbatch/sampler/residential_quota.py |  5 ++-
 buildstockbatch/test/test_base.py            |  1 +
 10 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/buildstockbatch/aws/aws.py b/buildstockbatch/aws/aws.py
index 7f596799..f2521d9d 100644
--- a/buildstockbatch/aws/aws.py
+++ b/buildstockbatch/aws/aws.py
@@ -42,7 +42,7 @@
 from buildstockbatch.base import ValidationError, BuildStockBatchBase
 from buildstockbatch.aws.awsbase import AwsJobBase
 from buildstockbatch import postprocessing
-from buildstockbatch.utils import log_error_details, get_project_configuration
+from buildstockbatch.utils import ContainerRuntime, log_error_details, get_project_configuration
 
 logger = logging.getLogger(__name__)
 
@@ -1660,6 +1660,8 @@ def clean(self):
 
 class DockerBatchBase(BuildStockBatchBase):
 
+    CONTAINER_RUNTIME = ContainerRuntime.DOCKER
+
     def __init__(self, project_filename):
         super().__init__(project_filename)
 
@@ -1730,10 +1732,6 @@ def docker_image(self):
     def weather_dir(self):
         return self._weather_dir
 
-    @property
-    def sampler_csv_base_path(self):
-        return self.project_dir
-
     @property
     def container_repo(self):
         repo_name = self.docker_image
diff --git a/buildstockbatch/base.py b/buildstockbatch/base.py
index 3f277f37..648f65c7 100644
--- a/buildstockbatch/base.py
+++ b/buildstockbatch/base.py
@@ -46,6 +46,7 @@ class BuildStockBatchBase(object):
     # http://openstudio-builds.s3-website-us-east-1.amazonaws.com
     DEFAULT_OS_VERSION = '3.5.1'
     DEFAULT_OS_SHA = '22e1db7be5'
+    CONTAINER_RUNTIME = None
     LOGO = '''
      _ __         _     __,              _ __
     ( /  )    o  //   /(    _/_       / ( /  )     _/_    /
@@ -85,15 +86,11 @@ def get_workflow_generator_class(workflow_generator_name):
             ''.join(x.capitalize() for x in workflow_generator_name.strip().split('_')) + 'WorkflowGenerator'
         return getattr(workflow_generator, workflow_generator_class_name)
 
-    @property
-    def sampler_csv_base_path(self):
-        raise NotImplementedError
-
     @property
     def sampler(self):
         # Select a sampler
         Sampler = self.get_sampler_class(self.cfg['sampler']['type'])
-        return Sampler(self, self.sampler_csv_base_path, **self.cfg['sampler'].get('args', {}))
+        return Sampler(self, **self.cfg['sampler'].get('args', {}))
 
     @staticmethod
     def openstudio_exe():
diff --git a/buildstockbatch/eagle.py b/buildstockbatch/eagle.py
index 482379ab..244422b6 100644
--- a/buildstockbatch/eagle.py
+++ b/buildstockbatch/eagle.py
@@ -36,7 +36,7 @@
 import csv
 
 from buildstockbatch.base import BuildStockBatchBase, SimulationExists
-from buildstockbatch.utils import log_error_details, get_error_details
+from buildstockbatch.utils import log_error_details, get_error_details, ContainerRuntime
 from buildstockbatch import postprocessing
 from buildstockbatch.__version__ import __version__ as bsb_version
 
@@ -49,6 +49,8 @@ def get_bool_env_var(varname):
 
 class EagleBatch(BuildStockBatchBase):
 
+    CONTAINER_RUNTIME = ContainerRuntime.SINGULARITY
+
     sys_image_dir = '/shared-projects/buildstock/singularity_images'
     hpc_name = 'eagle'
     min_sims_per_job = 36 * 2
@@ -88,10 +90,6 @@ def results_dir(self):
         assert os.path.isdir(results_dir)
         return results_dir
 
-    @property
-    def sampler_csv_base_path(self):
-        return self.output_dir
-
     @staticmethod
     def clear_and_copy_dir(src, dst):
         if os.path.exists(dst):
diff --git a/buildstockbatch/local.py b/buildstockbatch/local.py
index f02ffe2f..9d1c501e 100644
--- a/buildstockbatch/local.py
+++ b/buildstockbatch/local.py
@@ -30,7 +30,7 @@
 
 from buildstockbatch.base import BuildStockBatchBase, SimulationExists
 from buildstockbatch import postprocessing
-from buildstockbatch.utils import log_error_details
+from buildstockbatch.utils import log_error_details, ContainerRuntime
 from buildstockbatch.__version__ import __version__ as bsb_version
 
 logger = logging.getLogger(__name__)
@@ -38,6 +38,8 @@
 
 class LocalBatch(BuildStockBatchBase):
 
+    CONTAINER_RUNTIME = ContainerRuntime.DOCKER
+
     def __init__(self, project_filename):
         super().__init__(project_filename)
 
@@ -125,10 +127,6 @@ def weather_dir(self):
             self._get_weather_files()
         return self._weather_dir
 
-    @property
-    def sampler_csv_base_path(self):
-        return self.project_dir
-
     @classmethod
     def run_building(cls, buildstock_dir, weather_dir, results_dir, measures_only,
                      n_datapoints, cfg, i, upgrade_idx=None):
diff --git a/buildstockbatch/sampler/base.py b/buildstockbatch/sampler/base.py
index 88dc2ea7..df51af4b 100644
--- a/buildstockbatch/sampler/base.py
+++ b/buildstockbatch/sampler/base.py
@@ -10,8 +10,11 @@
 """
 
 import logging
+import os
 import weakref
 
+from buildstockbatch.utils import ContainerRuntime
+
 logger = logging.getLogger(__name__)
 
 
@@ -34,7 +37,7 @@ def validate_args(project_filename, **kw):
         """
         return True
 
-    def __init__(self, parent, csv_base_path):
+    def __init__(self, parent):
         """
         Create the buildstock.csv file required for batch simulations using this class.
 
@@ -45,7 +48,12 @@ def __init__(self, parent, csv_base_path):
         :param parent: The BuildStockBatchBase object that owns this sampler.
         """
         self.parent = weakref.ref(parent)  # This removes circular references and allows garbage collection to work.
-        self.csv_base_path = csv_base_path
+        if self.container_runtime == ContainerRuntime.DOCKER:
+            self.csv_path = os.path.join(self.project_dir, 'housing_characteristics', 'buildstock.csv')
+        elif self.container_runtime == ContainerRuntime.SINGULARITY:
+            self.csv_path = os.path.join(self.parent().output_dir, 'housing_characteristics', 'buildstock.csv')
+        else:
+            self.csv_path = None
 
     @property
     def cfg(self):
@@ -69,4 +77,24 @@ def run_sampling(self):
 
         Replace this in a subclass if your sampling doesn't depend on containerization.
         """
+        if self.container_runtime == ContainerRuntime.DOCKER:
+            return self._run_sampling_docker()
+        else:
+            assert self.container_runtime == ContainerRuntime.SINGULARITY
+            return self._run_sampling_singularity()
+
+    def _run_sampling_docker(self):
+        """
+        Execute the sampling in a docker container
+
+        Replace this in a subclass if your sampling needs docker.
+        """
+        raise NotImplementedError
+
+    def _run_sampling_singularity(self):
+        """
+        Execute the sampling in a singularity container
+
+        Replace this in a subclass if your sampling needs docker.
+        """
         raise NotImplementedError
diff --git a/buildstockbatch/sampler/commercial_sobol.py b/buildstockbatch/sampler/commercial_sobol.py
index 7fb7bfba..3bdc8540 100644
--- a/buildstockbatch/sampler/commercial_sobol.py
+++ b/buildstockbatch/sampler/commercial_sobol.py
@@ -21,6 +21,7 @@
 
 from .sobol_lib import i4_sobol_generate
 from .base import BuildStockSampler
+from buildstockbatch.utils import ContainerRuntime
 from buildstockbatch.exc import ValidationError
 
 logger = logging.getLogger(__name__)
@@ -28,7 +29,7 @@
 
 class CommercialSobolSampler(BuildStockSampler):
 
-    def __init__(self, parent, csv_base_path, n_datapoints):
+    def __init__(self, parent, n_datapoints):
         """
         Initialize the sampler.
 
@@ -37,9 +38,13 @@ def __init__(self, parent, csv_base_path, n_datapoints):
         :param buildstock_dir: The location of the comstock or resstock repo
         :param project_dir: The project directory within the comstock or resstock repo
         """
-        super().__init__(parent, csv_base_path)
+        super().__init__(parent)
         self.validate_args(self.parent().project_filename, n_datapoints=n_datapoints)
-        self.csv_path = os.path.join(self.csv_base_path, 'buildstock.csv')
+        if self.container_runtime == ContainerRuntime.SINGULARITY:
+            self.csv_path = os.path.join(self.output_dir, 'buildstock.csv')
+        else:
+            assert self.container_runtime == ContainerRuntime.DOCKER
+            self.csv_path = os.path.join(self.project_dir, 'buildstock.csv')
         self.n_datapoints = n_datapoints
 
     @classmethod
diff --git a/buildstockbatch/sampler/downselect.py b/buildstockbatch/sampler/downselect.py
index d4328f54..575fb3e8 100644
--- a/buildstockbatch/sampler/downselect.py
+++ b/buildstockbatch/sampler/downselect.py
@@ -25,7 +25,7 @@ class DownselectSamplerBase(BuildStockSampler):
 
     SUB_SAMPLER_CLASS = None
 
-    def __init__(self, parent, csv_base_path, n_datapoints, logic, resample=True, **kw):
+    def __init__(self, parent, n_datapoints, logic, resample=True, **kw):
         """Downselect Sampler
 
         This sampler performs a downselect of another sampler based on
@@ -41,7 +41,7 @@ def __init__(self, parent, csv_base_path, n_datapoints, logic, resample=True, **
         :type resample: bool, optional
         :param **kw: args to pass through to sub sampler
         """
-        super().__init__(parent, csv_base_path)
+        super().__init__(parent)
         self.validate_args(
             self.parent().project_filename,
             n_datapoints=n_datapoints,
@@ -53,7 +53,7 @@ def __init__(self, parent, csv_base_path, n_datapoints, logic, resample=True, **
         self.resample = resample
         self.n_datapoints = n_datapoints
         self.sub_kw = kw
-        sampler = self.SUB_SAMPLER_CLASS(self.parent(), csv_base_path, n_datapoints=n_datapoints, **kw)
+        sampler = self.SUB_SAMPLER_CLASS(self.parent(), n_datapoints=n_datapoints, **kw)
         self.csv_path = sampler.csv_path
 
     @classmethod
diff --git a/buildstockbatch/sampler/precomputed.py b/buildstockbatch/sampler/precomputed.py
index 120b16a8..f42ca8ad 100644
--- a/buildstockbatch/sampler/precomputed.py
+++ b/buildstockbatch/sampler/precomputed.py
@@ -23,7 +23,7 @@
 
 class PrecomputedSampler(BuildStockSampler):
 
-    def __init__(self, parent, csv_base_path, sample_file):
+    def __init__(self, parent, sample_file):
         """Precomputed Sampler
 
         :param parent: BuildStockBatchBase object
@@ -31,11 +31,10 @@ def __init__(self, parent, csv_base_path, sample_file):
         :param sample_file: relative or absolute path to buildstock.csv to use
         :type sample_file: str
         """
-        super().__init__(parent, csv_base_path)
+        super().__init__(parent)
         project_filename = self.parent().project_filename
         self.validate_args(project_filename, sample_file=sample_file)
         self.buildstock_csv = path_rel_to_file(project_filename, sample_file)
-        self.csv_path = os.path.join(self.csv_base_path, 'housing_characteristics', 'buildstock.csv')
 
     @classmethod
     def validate_args(cls, project_filename, **kw):
diff --git a/buildstockbatch/sampler/residential_quota.py b/buildstockbatch/sampler/residential_quota.py
index d41203b3..b7af3b69 100644
--- a/buildstockbatch/sampler/residential_quota.py
+++ b/buildstockbatch/sampler/residential_quota.py
@@ -22,7 +22,7 @@
 
 class ResidentialQuotaSampler(BuildStockSampler):
 
-    def __init__(self, parent, csv_base_path, n_datapoints):
+    def __init__(self, parent, n_datapoints):
         """Residential Quota Sampler
 
         :param parent: BuildStockBatchBase object
@@ -30,10 +30,9 @@ def __init__(self, parent, csv_base_path, n_datapoints):
         :param n_datapoints: number of datapoints to sample
         :type n_datapoints: int
         """
-        super().__init__(parent, csv_base_path)
+        super().__init__(parent)
         self.validate_args(self.parent().project_filename, n_datapoints=n_datapoints)
         self.n_datapoints = n_datapoints
-        self.csv_path = os.path.join(self.csv_base_path, 'housing_characteristics', 'buildstock.csv')
 
     @classmethod
     def validate_args(cls, project_filename, **kw):
diff --git a/buildstockbatch/test/test_base.py b/buildstockbatch/test/test_base.py
index 6fe0c7ce..6c25f5f8 100644
--- a/buildstockbatch/test/test_base.py
+++ b/buildstockbatch/test/test_base.py
@@ -20,6 +20,7 @@
 from buildstockbatch.local import LocalBatch
 from buildstockbatch.exc import ValidationError
 from buildstockbatch.postprocessing import write_dataframe_as_parquet
+from buildstockbatch.utils import ContainerRuntime
 
 dask.config.set(scheduler='synchronous')
 here = os.path.dirname(os.path.abspath(__file__))

From eb4247e57368f44e48a7b4c0a0648809079f8bd4 Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Mon, 20 Feb 2023 15:14:42 -0700
Subject: [PATCH 16/17] bringing back singularity support for residential quota
 sampler

---
 buildstockbatch/local.py                     |  2 +-
 buildstockbatch/sampler/base.py              | 16 +++++-
 buildstockbatch/sampler/commercial_sobol.py  |  2 +-
 buildstockbatch/sampler/residential_quota.py | 59 +++++++++++++++++++-
 buildstockbatch/test/test_base.py            |  1 -
 buildstockbatch/utils.py                     |  1 +
 6 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/buildstockbatch/local.py b/buildstockbatch/local.py
index 9d1c501e..a26ed6c2 100644
--- a/buildstockbatch/local.py
+++ b/buildstockbatch/local.py
@@ -38,7 +38,7 @@
 
 class LocalBatch(BuildStockBatchBase):
 
-    CONTAINER_RUNTIME = ContainerRuntime.DOCKER
+    CONTAINER_RUNTIME = ContainerRuntime.LOCAL_OPENSTUDIO
 
     def __init__(self, project_filename):
         super().__init__(project_filename)
diff --git a/buildstockbatch/sampler/base.py b/buildstockbatch/sampler/base.py
index df51af4b..8ae55bed 100644
--- a/buildstockbatch/sampler/base.py
+++ b/buildstockbatch/sampler/base.py
@@ -48,7 +48,7 @@ def __init__(self, parent):
         :param parent: The BuildStockBatchBase object that owns this sampler.
         """
         self.parent = weakref.ref(parent)  # This removes circular references and allows garbage collection to work.
-        if self.container_runtime == ContainerRuntime.DOCKER:
+        if self.container_runtime in (ContainerRuntime.DOCKER, ContainerRuntime.LOCAL_OPENSTUDIO):
             self.csv_path = os.path.join(self.project_dir, 'housing_characteristics', 'buildstock.csv')
         elif self.container_runtime == ContainerRuntime.SINGULARITY:
             self.csv_path = os.path.join(self.parent().output_dir, 'housing_characteristics', 'buildstock.csv')
@@ -79,9 +79,11 @@ def run_sampling(self):
         """
         if self.container_runtime == ContainerRuntime.DOCKER:
             return self._run_sampling_docker()
-        else:
-            assert self.container_runtime == ContainerRuntime.SINGULARITY
+        elif self.container_runtime == ContainerRuntime.SINGULARITY:
             return self._run_sampling_singularity()
+        else:
+            assert self.container_runtime == ContainerRuntime.LOCAL_OPENSTUDIO
+            return self._run_sampling_local_openstudio()
 
     def _run_sampling_docker(self):
         """
@@ -98,3 +100,11 @@ def _run_sampling_singularity(self):
         Replace this in a subclass if your sampling needs docker.
         """
         raise NotImplementedError
+
+    def _run_sampling_local_openstudio(self):
+        """
+        Execute the sampling on the local openstudio instance
+
+        Replace this in a subclass as necessary
+        """
+        raise NotImplementedError
diff --git a/buildstockbatch/sampler/commercial_sobol.py b/buildstockbatch/sampler/commercial_sobol.py
index 3bdc8540..639c2f62 100644
--- a/buildstockbatch/sampler/commercial_sobol.py
+++ b/buildstockbatch/sampler/commercial_sobol.py
@@ -43,7 +43,7 @@ def __init__(self, parent, n_datapoints):
         if self.container_runtime == ContainerRuntime.SINGULARITY:
             self.csv_path = os.path.join(self.output_dir, 'buildstock.csv')
         else:
-            assert self.container_runtime == ContainerRuntime.DOCKER
+            assert self.container_runtime in (ContainerRuntime.DOCKER, ContainerRuntime.LOCAL_OPENSTUDIO)
             self.csv_path = os.path.join(self.project_dir, 'buildstock.csv')
         self.n_datapoints = n_datapoints
 
diff --git a/buildstockbatch/sampler/residential_quota.py b/buildstockbatch/sampler/residential_quota.py
index b7af3b69..9789327a 100644
--- a/buildstockbatch/sampler/residential_quota.py
+++ b/buildstockbatch/sampler/residential_quota.py
@@ -7,11 +7,14 @@
 :copyright: (c) 2020 by The Alliance for Sustainable Energy
 :license: BSD-3
 """
+import docker
 import logging
 import os
 import pathlib
 import shutil
 import subprocess
+import sys
+import time
 
 from .base import BuildStockSampler
 from .downselect import DownselectSamplerBase
@@ -50,7 +53,61 @@ def validate_args(cls, project_filename, **kw):
             raise ValidationError('The following sampler arguments are required: ' + ', '.join(expected_args))
         return True
 
-    def run_sampling(self):
+    def _run_sampling_docker(self):
+        docker_client = docker.DockerClient.from_env()
+        tick = time.time()
+        extra_kws = {}
+        if sys.platform.startswith('linux'):
+            extra_kws['user'] = f'{os.getuid()}:{os.getgid()}'
+        container_output = docker_client.containers.run(
+            self.parent().docker_image,
+            [
+                'ruby',
+                'resources/run_sampling.rb',
+                '-p', self.cfg['project_directory'],
+                '-n', str(self.n_datapoints),
+                '-o', 'buildstock.csv'
+            ],
+            remove=True,
+            volumes={
+                self.buildstock_dir: {'bind': '/var/simdata/openstudio', 'mode': 'rw'}
+            },
+            name='buildstock_sampling',
+            **extra_kws
+        )
+        tick = time.time() - tick
+        for line in container_output.decode('utf-8').split('\n'):
+            logger.debug(line)
+        logger.debug('Sampling took {:.1f} seconds'.format(tick))
+        destination_filename = self.csv_path
+        if os.path.exists(destination_filename):
+            os.remove(destination_filename)
+        shutil.move(
+            os.path.join(self.buildstock_dir, 'resources', 'buildstock.csv'),
+            destination_filename
+        )
+        return destination_filename
+
+    def _run_sampling_singularity(self):
+        args = [
+            'singularity',
+            'exec',
+            '--contain',
+            '--home', '{}:/buildstock'.format(self.buildstock_dir),
+            '--bind', '{}:/outbind'.format(os.path.dirname(self.csv_path)),
+            self.parent().singularity_image,
+            'ruby',
+            'resources/run_sampling.rb',
+            '-p', self.cfg['project_directory'],
+            '-n', str(self.n_datapoints),
+            '-o', '../../outbind/{}'.format(os.path.basename(self.csv_path))
+        ]
+        logger.debug(f"Starting singularity sampling with command: {' '.join(args)}")
+        subprocess.run(args, check=True, env=os.environ, cwd=self.parent().output_dir)
+        logger.debug("Singularity sampling completed.")
+        return self.csv_path
+
+    def _run_sampling_local_openstudio(self):
         subprocess.run(
             [
                 self.parent().openstudio_exe(),
diff --git a/buildstockbatch/test/test_base.py b/buildstockbatch/test/test_base.py
index 6c25f5f8..6fe0c7ce 100644
--- a/buildstockbatch/test/test_base.py
+++ b/buildstockbatch/test/test_base.py
@@ -20,7 +20,6 @@
 from buildstockbatch.local import LocalBatch
 from buildstockbatch.exc import ValidationError
 from buildstockbatch.postprocessing import write_dataframe_as_parquet
-from buildstockbatch.utils import ContainerRuntime
 
 dask.config.set(scheduler='synchronous')
 here = os.path.dirname(os.path.abspath(__file__))
diff --git a/buildstockbatch/utils.py b/buildstockbatch/utils.py
index af6592a7..ef4bfb47 100644
--- a/buildstockbatch/utils.py
+++ b/buildstockbatch/utils.py
@@ -11,6 +11,7 @@
 class ContainerRuntime(enum.Enum):
     DOCKER = 1
     SINGULARITY = 2
+    LOCAL_OPENSTUDIO = 3
 
 
 def path_rel_to_file(startfile, x):

From 1cbeeb3a3d643946c66a3e99852f2c310422ac0b Mon Sep 17 00:00:00 2001
From: Noel Merket <noel.merket@nrel.gov>
Date: Mon, 20 Feb 2023 17:00:18 -0700
Subject: [PATCH 17/17] updating docs

---
 buildstockbatch/__init__.py      |  8 +--
 docs/changelog/changelog_dev.rst |  7 +++
 docs/installation.rst            | 87 ++++++++++++++++++++++----------
 docs/run_sims.rst                | 12 ++---
 4 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/buildstockbatch/__init__.py b/buildstockbatch/__init__.py
index ea885295..9802ad34 100644
--- a/buildstockbatch/__init__.py
+++ b/buildstockbatch/__init__.py
@@ -9,20 +9,20 @@
 Executing BuildStock projects on batch infrastructure
 ~~~~~~~~~~~~~~~~~~~~~
 BuildStockBatch is a simulation runtime library, written in Python, to allow researchers to execute the very large scale
-simulation sets required for BuildStock analyses. Basic Eagle usage:
+simulation sets required for ResStock and ComStock analyses. Basic Eagle usage:
 ```
    [user@loginN ~]$ module load conda
-   [user@loginN ~]$ source activate /shared-projects/buildstock/envs/buildstock-X.X
+   [user@loginN ~]$ source activate /shared-projects/buildstock/envs/buildstock-YYYY.MM.X
    [user@loginN ~]$ buildstock_eagle ~/buildstockbatch/project_resstock_national.yml
 ```
 ... or locally using Docker:
 ```
    user$ pyenv activate buildstockbatch
    user$ pip install -e ./buildstockbatch
-   user$ buildstock_local -j -2 ~/buildstockbatch/project_resstock_multifamily.yml
+   user$ buildstock_local ~/buildstockbatch/project_resstock_multifamily.yml
 ```
 Other batch simulation methods may be supported in future. Please refer to the documentation for more
 details regarding these features, and configuration via the project yaml configuration documentation.
-:copyright: (c) 2018 by The Alliance for Sustainable Energy.
+:copyright: (c) 2023 by The Alliance for Sustainable Energy.
 :license: BSD-3, see LICENSE for more details.
 """
diff --git a/docs/changelog/changelog_dev.rst b/docs/changelog/changelog_dev.rst
index 75eeab3d..e82df70a 100644
--- a/docs/changelog/changelog_dev.rst
+++ b/docs/changelog/changelog_dev.rst
@@ -14,3 +14,10 @@ Development Changelog
         This is an example change. Please copy and paste it - for valid tags please refer to ``conf.py`` in the docs
         directory. ``pullreq`` should be set to the appropriate pull request number and ``tickets`` to any related
         github issues. These will be automatically linked in the documentation.
+
+    .. change::
+        :tags: general, feature
+        :pullreq: 349
+        :tickets: 300
+
+        Remove docker dependency for local runs.
diff --git a/docs/installation.rst b/docs/installation.rst
index 21d24bfd..edc910a3 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -1,32 +1,76 @@
 Installation
 ------------
 
-BuildStock-Batch installations depend on the
-`ResStock <https://github.com/NREL/resstock>`__
-repository. Either ``git clone`` it or download a copy of it or your
-fork or branch of it with your projects.
+BuildStockBatch installations depend on the `ResStock
+<https://github.com/NREL/resstock>`__ or ComStock repository. Either ``git
+clone`` it or download a copy of it or your fork or branch of it with your
+projects.
 
 .. _local-install:
 
 Local
 ~~~~~
 
-This method works for running the simulations locally through Docker. BuildStock-Batch simulations are
-computationally intensive. Local use is only recommended for very small testing runs.
+This method works for running the simulations locally. BuildStockBatch simulations are
+computationally intensive. Local use is only recommended for small testing runs.
 
-`Download <http://docker.io>`_ and install Docker Desktop for your platform.
+OpenStudio Installation
+.......................
 
-.. note::
+Download and install the `OpenStudio release`_ that corresponds to your
+operating system and the release of ResStock or ComStock you are using.
 
-   Users using a Windows operating system should install 
-   `Docker Desktop Community 2.1.0.5 <https://docs.docker.com/docker-for-windows/release-notes/#docker-desktop-community-2105>`_
-   or below.
+It's common to need a couple different versions of OpenStudio available for
+different analyses. This is best achieved by downloading the ``.tar.gz`` package
+for your operating system and unzipping it into a folder rather than installing
+it. To let BuildStockBatch know which OpenStudio to use, pass the path as the
+``OPENSTUDIO_EXE`` environment variable.
+
+For example to get OpenStudio 3.5.1 on an Apple Silicon Mac
+
+.. code-block:: bash
+
+   # Make a directory for your openstudio installations to live in
+   mkdir ~/openstudio
+   cd ~/openstudio
+   
+   # Download the .tar.gz version for your operating system, x86_64 for an Intel mac
+   # This can also done using a browser from the OpenStudio releases page
+   curl -O -L https://github.com/NREL/OpenStudio/releases/download/v3.5.1/OpenStudio-3.5.1+22e1db7be5-Darwin-arm64.tar.gz
+   
+   # Extract it
+   tar xvzf OpenStudio-3.5.1+22e1db7be5-Darwin-arm64.tar.gz
+   
+   # Optionally remove the tar file
+   rm OpenStudio-3.5.1+22e1db7be5-Darwin-arm64.tar.gz
+
+   # Set your environment variable to point to the correct version
+   # This will only work for the current terminal session
+   # You can also set this in ~/.zshrc to make it work for every terminal session
+   export OPENSTUDIO_EXE="~/openstudio/OpenStudio-3.5.1+22e1db7be5-Darwin-arm64/bin/openstudio"
+
+For Windows, the process is similar.
+
+   1. Download the Windows `OpenStudio release`_ for windows with the ``.tar.gz`` extension.
+      For OpenStudio 3.5.1 that is ``OpenStudio-3.5.1+22e1db7be5-Windows.tar.gz``.
+   2. Extract it to a folder that you know.
+   3. Set the ``OPENSTUDIO_EXE`` environment variable to the path.
+      ``C:\path\to\OpenStudio-3.5.1+22e1db7be5-Windows/bin/openstudio.exe``
+      Here's how to `set a Windows environment Variable`_.
+
+
+.. _set a Windows environment Variable: https://www.computerhope.com/issues/ch000549.htm
+.. _OpenStudio release: https://github.com/NREL/OpenStudio/releases
+
+
+BuildStockBatch Python Library
+..............................
 
 Install Python 3.8 or greater for your platform. Either the official
 distribution from python.org or the `Anaconda distribution
 <https://www.anaconda.com/distribution/>`_ (recommended).
 
-Get a copy of this code either by downloading the zip file from GitHub or
+Get a copy of BuildStockBatch either by downloading the zip file from GitHub or
 `cloning the repository <https://github.com/NREL/buildstockbatch>`_.
 
 Optional, but highly recommended, is to create a new `python virtual
@@ -45,28 +89,15 @@ Install the library by doing the following:
 
 .. _aws-user-config-local:
 
-.. note::
-
-   Users using a Windows operating system with Python version 3.8 or higher may encounter the following
-   error when running simulations locally:
-
-   `docker.errors.DockerException: Install pypiwin32 package to enable npipe:// support`
-
-   Manually running the pywin32 post-install script using the following command may resolve the error:
-
-   ::
-
-       python <path-to-python-env>\Scripts\pywin32_postinstall.py -install
-
 AWS User Configuration
 ......................
 
-To use BuildStock Batch on AWS, or enable automatic upload of processed results to AWS Athena, you'll need to
+To upload BuildStockBatch data to AWS at the end of your run and send results to AWS Athena, you'll need to
 configure your user account with your AWS credentials. This setup only needs to be done once.
 
-1. `Install the AWS CLI`_ version 2 (select the version for your local OS; not for Docker).
+1. `Install the AWS CLI`_ version 2
 2. `Configure the AWS CLI`_. (Don't type the ``$`` in the example.)
-3. You may need to `change the Athena Engine version`_ for your query workgroup to v2.
+3. You may need to `change the Athena Engine version`_ for your query workgroup to v2 or v3.
 
 .. _Install the AWS CLI: https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html
 .. _Configure the AWS CLI: https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html#cli-quick-configuration
diff --git a/docs/run_sims.rst b/docs/run_sims.rst
index 8e1e332a..1389a47a 100644
--- a/docs/run_sims.rst
+++ b/docs/run_sims.rst
@@ -1,14 +1,8 @@
 Running a Project
 -----------------
 
-Local (Docker)
-~~~~~~~~~~~~~~
-
-Running the simulations locally uses Docker. Docker needs to be configured to use all
-(or most) of the CPUs on your machine. To do so, click on the Docker icon by the clock. It
-looks like a little whale with boxes on its back. Select "Preferences..." and "Advanced".
-Slide the CPUs available to Docker to the number of concurrent simulations you want to run
-(probably all of them).
+Local
+~~~~~
 
 Running a project file is straightforward. Call the ``buildstock_local`` command line tool as follows:
 
@@ -23,7 +17,7 @@ Running a project file is straightforward. Call the ``buildstock_local`` command
 
 .. warning::
 
-    Running the simulation with ``postprocessonly`` when there is already postprocessed results from previous run will
+    Running the simulation with ``--postprocessonly`` when there is already postprocessed results from previous run will
     overwrite those results.
 
 Eagle