Merge pull request #555 from emthompson-usgs/windows

Windows
usgs · Dec 11, 2020 · d5f46da · d5f46da
2 parents acfc012 + 6f0b994
commit d5f46da
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/gmprocess/bin/__init__.py b/gmprocess/bin/__init__.py
diff --git a/gmprocess/io/unam/__init__.py b/gmprocess/io/unam/__init__.py
diff --git a/gmprocess/smoothing/__init__.py b/gmprocess/smoothing/__init__.py
diff --git a/install.ps1 b/install.ps1
@@ -55,7 +55,8 @@ $package_list=
     "pyyaml",
     "requests",
     "vcrpy",
-    "openquake.engine"
+    "pip"
+
 # Create a conda virtual environment
 Write-Output "Creating the $VENV virtual environment:"
 Write-Output "conda create -y -n $VENV -c conda-forge --channel-priority $package_list"
@@ -69,6 +70,10 @@ If (-NOT ($?) ) {
 # Activate the new environment
 Write-Output "Activating the $VENV virtual environment"
 conda activate $VENV
+
+# Install openquake via pip
+pip install openquake.engine
+
 # This package
 Write-Output "Installing gmprocess..."
 pip install -e .
diff --git a/setup.py b/setup.py
@@ -37,7 +37,6 @@
     url='https://github.com/usgs/groundmotion-processing',
     version=versioneer.get_version(),
     cmdclass=versioneer.get_cmdclass(),
-    mdclass=versioneer.get_cmdclass(),
     packages=[
         'gmprocess',
         'gmprocess.bin',