Skip to content

now renders API Reference page correctly #17

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

Merged
merged 8 commits into from
Oct 14, 2019
Merged

now renders API Reference page correctly #17

merged 8 commits into from
Oct 14, 2019

Conversation

2bndy5
Copy link
Contributor

@2bndy5 2bndy5 commented Oct 9, 2019

Looking at the PR of this library in the past, I see the @sommersoft opened issue #7 that had suggested adequate changes to api.rst, but it was closed upon merge of this PR without including the suggested changes. So I did exactly that and then some:

  • child classes now list MCP3xxx as their base class (to avoid confusion) using autodoc's :show-inheritence: directive.
  • AnalogIn's constructor wasn't getting documented because of the odd placement of its __get__ magic method before __init__.
  • changed the parameter type references for AnalogIn's constructor to more accurately link to the appropriate objects. See these lines for what I mean.
  • adjusted the references in all child class module headings to please Sphinx. The previous references were causing Sphinx to throw an error when building the API pages. See changes to mcp3004.py and mcp3008.py in file comparison.
  • uncommented the line in conf.py to enable cross referencing to busio's SPI object
  • lastly I fixed the unnecessary third argument being passed to AnalogIn's constructor in both the examples/mcp3xxx_mcp3004_single_ended_simpletest.py and the corresponding copied code in the README.rst files.

Copy link
Member

@brentru brentru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@2bndy5 Thank you for your work on the API documentation for this library and general sphinx/syntax fixes.

I requested a few things to be resolved before merging this into master.

@2bndy5
Copy link
Contributor Author

2bndy5 commented Oct 10, 2019

I can't open the conflicting example file here on the PR to see how removing one argument on one line would cause a conflict.

@2bndy5
Copy link
Contributor Author

2bndy5 commented Oct 10, 2019

OK not sure how it happened or even how I resolved it, but using git pull upstream master seemed to fix the conflict. I think it was a renaming issue from the last PR. Travis CI is back in action too!

@brentru brentru self-requested a review October 14, 2019 13:09
Copy link
Member

@brentru brentru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@2bndy5 Thank you for editing the PR, looks great. Merging in...

@brentru brentru merged commit 189b1ef into adafruit:master Oct 14, 2019
adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Oct 14, 2019
Updating https://github.com/adafruit/Adafruit_CircuitPython_MCP3xxx to 1.1.2 from 1.1.1:
  > Merge pull request adafruit/Adafruit_CircuitPython_MCP3xxx#17 from 2bndy5/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_RA8875 to 2.0.1 from 2.0.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_RA8875#13 from makermelissa/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_Bundle/circuitpython_library_list.md to NA from NA:
  > Added the following libraries: Adafruit_CircuitPython_AWS_IOT
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants