Skip to content

Commit

Permalink
Revert "Merge remote-tracking branch 'upstream/master'"
Browse files Browse the repository at this point in the history
This reverts commit f48f6c2, reversing
changes made to aa3ecf1.
  • Loading branch information
david-z-shi committed Sep 22, 2020
1 parent f48f6c2 commit 7b7c0b8
Show file tree
Hide file tree
Showing 35 changed files with 1,553 additions and 1,662 deletions.
6 changes: 1 addition & 5 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@ exclude_lines =
# Have to re-enable the standard pragma
pragma: no cover
@abstract
NotImplementedError

[run]
omit =
*__init__.py
NotImplementedError
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ being contribution of code or documentation to the project. Improving the
documentation is no less important than improving the library itself. If you
find a typo in the documentation, or have made improvements, do not hesitate to
submit a GitHub pull request. Documentation can be found under the
[docs/](https://github.com/neurodata/progressive-learning/tree/master/docs) directory.
[doc/](https://github.com/neurodata/progressive-learning/tree/master/docs) directory.

But there are many other ways to help. In particular answering queries on the
[issue tracker](https://github.com/neurodata/progressive-learning/issues), and
Expand All @@ -27,4 +27,4 @@ Code of Conduct
---------------

We abide by the principles of openness, respect, and consideration of others
of the Python Software Foundation: https://www.python.org/psf/codeofconduct/.
of the Python Software Foundation: https://www.python.org/psf/codeofconduct/.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ python3 setup.py install
```

# Contributing
We welcome contributions from anyone. Please see our [contribution guidelines](https://github.com/neurodata/progressive-learning/blob/master/CONTRIBUTING.md) before making a pull request. Our
We welcome contributions from anyone. Please see our [contribution guidelines](http://docs.neurodata.io/progressive-learning/) before making a pull request. Our
[issues](https://github.com/neurodata/progressive-learning/issues) page is full of places we could use help!
If you have an idea for an improvement not listed there, please
[make an issue](https://github.com/neurodata/progressive-learning/issues/new) first so you can discuss with the
Expand Down
12 changes: 6 additions & 6 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ good feedback:
- If an exception is raised, please **provide the full traceback**.

- Please include your **operating system type and version number**, as well as
your **Python and ProgL versions**. This information
your **Python and hyppo versions**. This information
can be found by running the following code snippet::

import platform; print(platform.platform())
Expand All @@ -61,7 +61,7 @@ good feedback:
Contributing Code
-----------------

The preferred workflow for contributing to `ProgL` is to fork the main
The preferred workflow for contributing to `hyppo` is to fork the main
repository on GitHub, clone, and develop on a branch. Steps:

1. Fork the `project repository <https://github.com/neurodata/progressive-learning>`__ by clicking
Expand All @@ -70,12 +70,12 @@ repository on GitHub, clone, and develop on a branch. Steps:
fork a repository see `this
guide <https://help.github.com/articles/fork-a-repo/>`__.

2. Clone your fork of the ``ProgL`` repo from your GitHub account to your
2. Clone your fork of the ``hyppo`` repo from your GitHub account to your
local disk:

.. code:: bash
$ git clone [email protected]:YourLogin/progressive-learning.git
$ git clone [email protected]:YourLogin/hyppo.git
$ cd progressive-learning
3. Create a ``feature`` branch to hold your development changes:
Expand Down Expand Up @@ -150,7 +150,7 @@ before you submit a pull request:
Coding Guidelines
-----------------

Uniformly formatted code makes it easier to share code ownership. ``ProgL``
Uniformly formatted code makes it easier to share code ownership. ``hyppo``
package closely follows the official Python guidelines detailed in
`PEP8 <https://www.python.org/dev/peps/pep-0008/>`__ that detail how
code should be formatted and indented. Please read it and follow it.
Expand All @@ -164,4 +164,4 @@ guidelines. Please read and follow the
`numpydoc <https://numpydoc.readthedocs.io/en/latest/format.html#overview>`__
guidelines. Refer to the
`example.py <https://numpydoc.readthedocs.io/en/latest/example.html#example>`__
provided by numpydoc.
provided by numpydoc.
958 changes: 0 additions & 958 deletions experiments/parity_experiment/experiment.ipynb

This file was deleted.

270 changes: 0 additions & 270 deletions experiments/parity_experiment/generate_paper_plot.py

This file was deleted.

Binary file removed experiments/parity_experiment/plots/parity_exp.pdf
Binary file not shown.
Loading

0 comments on commit 7b7c0b8

Please sign in to comment.