Updated docs/source/conf.py and MANIFEST.in to reflect restructure

Tweaked docs/requirements.txt to address build failures Tweaked .circleci/config.yml to address coverage-osx failures
dwavesystems · Nov 4, 2019 · 9bec1af · 9bec1af
1 parent f58d49f
commit 9bec1af
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -44,7 +44,10 @@ jobs:
 
   coverage-osx:
     macos:
-      xcode: "9.0"
+      xcode: "11.2.0"
+    environment:
+      HOMEBREW_NO_AUTO_UPDATE: 1
+      PYTHON: 3.8.0
     working_directory: ~/repo
     steps:
       - checkout
@@ -62,13 +65,35 @@ jobs:
           environment:
             C_COMPILER: clang
             CXX_COMPILER: clang++
+      - run:
+          name: install pyenv
+          command: |
+            brew install pyenv
+      - restore_cache:
+          keys:
+            - pyenv-{{ .Environment.CIRCLE_JOB }}
+      - run:
+          name: install python
+          command: |
+            pyenv install $PYTHON -s
+      - save_cache:
+          paths:
+            - ~/.pyenv
+          key: pyenv-{{ .Environment.CIRCLE_JOB }}
+      - run:
+          name: create virtualenv
+          command: |
+            eval "$(pyenv init -)"
+            pyenv local $PYTHON
+            python -m pip install virtualenv
+            python -m virtualenv env
       - run:
           name: coveralls
           command: |
             if [[ -n $COVERALLS_REPO_TOKEN ]];
             then python -m virtualenv env;
             . env/bin/activate;
-            pip install cpp-coveralls;
+            python -m pip install cpp-coveralls;
             find build \( -name '*.gcno' -or -name '*.gcda' \) -exec mv {} . \;
             coveralls --exclude tests -E '.*gtest.*' --gcov-options '\-lp';
             fi;

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1 @@
 global-include *.hpp
-include package_info.py
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,4 +1,4 @@
 breathe<4.13.0
 sphinx-rtd-theme==0.*
 sphinx==1.*
-cython==0.27
+cython>=0.28.5
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -22,12 +22,13 @@
 # sys.path.insert(0, os.path.abspath('.'))
 config_directory = os.path.dirname(os.path.abspath(__file__))
 sys.path.insert(0, os.path.abspath(
-    os.path.join(config_directory, '../../python')))
+    os.path.join(config_directory, '../../minorminer')))
 
 _PY2 = sys.version_info.major == 2
 
 # Add __version__, __author__, __authoremail__, __description__ to this namespace
-path_to_package_info = os.path.join('..', '..', 'package_info.py')
+path_to_package_info = os.path.join(
+    '..', '..', 'minorminer', 'package_info.py')
 if _PY2:
     execfile(path_to_package_info)
 else:
@@ -135,23 +136,25 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
+
 def setup(app):
-   app.add_stylesheet('cookie_notice.css')
-   app.add_javascript('cookie_notice.js')
+    app.add_stylesheet('cookie_notice.css')
+    app.add_javascript('cookie_notice.js')
+
 
 # Configuration for intersphinx.
 intersphinx_mapping = {'python': ('https://docs.python.org/3', None),
-    'dimod': ('https://docs.ocean.dwavesys.com/projects/dimod/en/latest/', None),
-    'binarycsp': ('https://docs.ocean.dwavesys.com/projects/binarycsp/en/latest/', None),
-    'cloud-client': ('https://docs.ocean.dwavesys.com/projects/cloud-client/en/latest/', None),
-    'neal': ('https://docs.ocean.dwavesys.com/projects/neal/en/latest/', None),
-    'networkx': ('https://docs.ocean.dwavesys.com/projects/dwave-networkx/en/latest/', None),
-    'system': ('https://docs.ocean.dwavesys.com/projects/system/en/latest/', None),
-    'penaltymodel': ('https://docs.ocean.dwavesys.com/projects/penaltymodel/en/latest/', None),
-    'minorminer': ('https://docs.ocean.dwavesys.com/projects/minorminer/en/latest/', None),
-    'qbsolv': ('https://docs.ocean.dwavesys.com/projects/qbsolv/en/latest/', None),
-    'oceandocs': ('https://docs.ocean.dwavesys.com/en/latest/', None),
-    'sysdocs_gettingstarted': ('https://docs.dwavesys.com/docs/latest/', None)}
+                       'dimod': ('https://docs.ocean.dwavesys.com/projects/dimod/en/latest/', None),
+                       'binarycsp': ('https://docs.ocean.dwavesys.com/projects/binarycsp/en/latest/', None),
+                       'cloud-client': ('https://docs.ocean.dwavesys.com/projects/cloud-client/en/latest/', None),
+                       'neal': ('https://docs.ocean.dwavesys.com/projects/neal/en/latest/', None),
+                       'networkx': ('https://docs.ocean.dwavesys.com/projects/dwave-networkx/en/latest/', None),
+                       'system': ('https://docs.ocean.dwavesys.com/projects/system/en/latest/', None),
+                       'penaltymodel': ('https://docs.ocean.dwavesys.com/projects/penaltymodel/en/latest/', None),
+                       'minorminer': ('https://docs.ocean.dwavesys.com/projects/minorminer/en/latest/', None),
+                       'qbsolv': ('https://docs.ocean.dwavesys.com/projects/qbsolv/en/latest/', None),
+                       'oceandocs': ('https://docs.ocean.dwavesys.com/en/latest/', None),
+                       'sysdocs_gettingstarted': ('https://docs.dwavesys.com/docs/latest/', None)}
 # -- Options for HTMLHelp output ------------------------------------------
 
 # Output file base name for HTML help builder.