Skip to content

Commit f088d13

Browse files
committed
Solve conflicts
2 parents 95873d7 + 0d11aec commit f088d13

File tree

120 files changed

+1064
-939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+1064
-939
lines changed

.readthedocs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ build:
1717

1818
# Build documentation in the docs/ directory with Sphinx
1919
sphinx:
20-
configuration: docs/conf.py
20+
configuration: docs/documentation/conf.py
2121

2222
# If using Sphinx, optionally build your docs in additional formats such as PDF
2323
# formats:
@@ -26,4 +26,4 @@ sphinx:
2626
# Optionally declare the Python requirements required to build your docs
2727
python:
2828
install:
29-
- requirements: requirements.txt
29+
- requirements: requirements.txt

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
language: python
22
python:
3-
- "3.6"
3+
- "3.8"
44
before_install:
55
- pip install codecov
66
- pip install coverage
7-
- pip install networkx
87

98
script:
109
- coverage run --source=undefined -m unittest test/test_*.py

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# cs107-FinalProject
22

3-
[![Build Status](https://app.travis-ci.com/cs107-undefined/cs107-FinalProject.svg?branch=milestone2)](https://app.travis-ci.com/cs107-undefined/cs107-FinalProject)
3+
[![Build Status](https://app.travis-ci.com/cs107-undefined/cs107-FinalProject.svg?branch=final_milestone)](https://app.travis-ci.com/cs107-undefined/cs107-FinalProject)
44

5-
[![codecov](https://codecov.io/gh/cs107-undefined/cs107-FinalProject/branch/milestone2/graph/badge.svg?token=MWEZONI94C)](https://codecov.io/gh/cs107-undefined/cs107-FinalProject)
5+
[![codecov](https://codecov.io/gh/cs107-undefined/cs107-FinalProject/branch/final_milestone/graph/badge.svg?token=MWEZONI94C)](https://codecov.io/gh/cs107-undefined/cs107-FinalProject)
6+
7+
[![Documentation Status](https://readthedocs.org/projects/cs107-undefined/badge/?version=latest)](https://cs107-undefined.readthedocs.io/en/latest/?badge=latest)
68

79
[**DOCUMENTATION**](https://cs107-undefined.readthedocs.io/en/latest/)
810

-29.8 KB
Binary file not shown.

docs/_build/html/_sources/organization.rst.txt

Lines changed: 0 additions & 252 deletions
This file was deleted.

0 commit comments

Comments
 (0)