Skip to content

Commit

Permalink
Merge pull request #10 from hhtong/fix2
Browse files Browse the repository at this point in the history
Fix `dwave.preprocessing.composites` import
  • Loading branch information
Heidi Tong authored May 20, 2021
2 parents 2bfc572 + 17a4b15 commit ddaa135
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 0 deletions.
69 changes: 69 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/

# Sphinx documentation
docs/build/
docs/build-cpp/
docs/reference/generated/
docs/intro/generated/
docs/reference/*/generated/

# pyenv
.python-version

# Environments
.env
.venv
venv*/
env/
venv/
ENV/
env.bak/
venv.bak/

# cython intermediate files
dwave/preprocessing/cyfix_variables.cpp

# testing stuff
testscpp/Catch2
testscpp/test_main
testscpp/test_main.o
testscpp/test_main.out
testscpp/test_main_parallel
testscpp/test_main_parallel.o
testscpp/test_main_parallel.out
3 changes: 3 additions & 0 deletions dwave/preprocessing/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@
__version__ = '0.1.1rc1'

from dwave.preprocessing import *
import dwave.preprocessing.composites
from dwave.preprocessing.composites import *
import dwave.preprocessing.lower_bounds
from dwave.preprocessing.lower_bounds import *
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ include_package_data = True
packages =
dwave
dwave.preprocessing
dwave.preprocessing.composites
python_requires = >=3.6
zip_safe = False

0 comments on commit ddaa135

Please sign in to comment.