Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edit test to fix macOS issues #427

Merged
merged 31 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
os: ['ubuntu-latest', 'macos-13', 'windows-latest']
python-version: ['3.9', '3.10']
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: ${{ runner.os == 'macOS' && 'latest' || null }}
auto-update-conda: true
channels: anaconda,ibmdecisionoptimization
auto-activate-base: false
python-version: ${{ matrix.python-version }}
Expand Down
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,18 @@ Electron density maps obtained from high-resolution X-ray diffraction data are a

3) Create the Conda environment using the downloaded file:

conda env create -f <QFIT-ENV-FILE>
conda env create -f enviornment.yml

4) After creating the Conda environment, activate it:

conda activate qfit

5) Finally, install qFit:
5) If you installing on M1 Mac:

conda activate qfit; conda env config vars set CONDA_SUBDIR=osx-64; conda deactivate
conda activate qfit

7) Finally, install qFit:

pip install .

Expand Down
1 change: 1 addition & 0 deletions _version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "0.0.0"
1 change: 0 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ channels:
- conda-forge

dependencies:
- libblas[build=*mkl]
- numpy>=1.20,<2
- scipy>=1.0
- cvxpy
Expand Down
14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[build-system]
# Minimum requirements for the build system to execute.
requires = [
"setuptools", # PEP 508 specifications.
"wheel", # PEP 508 specifications.
"setuptools_scm",
"numpy>=1.20,<2",
"cvxpy",
"pyscipopt",
"setuptools",
"wheel",
"setuptools_scm",
"numpy>=1.20,<2",
"cvxpy",
"pyscipopt",
]
build-backend = "setuptools.build_meta"
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ def main():
setup(
name="qfit",
use_scm_version=True,
author="Blake Riley, Stephanie A. Wankowicz, Gydo C.P. van Zundert, Saulo H.P. de Oliveira, and Henry van den Bedem",
author_email="saulo@stanford.edu",
author="Stephanie A. Wankowicz, Blake Riley, Gydo C.P. van Zundert, Saulo H.P. de Oliveira, and Henry van den Bedem",
author_email="mullane.stephanie@gmail.com",
project_urls={"Documentation": "https://github.com/ExcitedStates/qfit-3.0/"},
package_dir=package_dir,
packages=packages,
Expand Down
Loading