Skip to content
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

Networkx v2 #133

Merged
merged 7 commits into from
Apr 25, 2020
Merged

Networkx v2 #133

merged 7 commits into from
Apr 25, 2020

Conversation

ericmjl
Copy link
Owner

@ericmjl ericmjl commented Apr 25, 2020

Updated notebooks to use NetworkX v2 API.

@ericmjl ericmjl merged commit 9c0f148 into master Apr 25, 2020
@ericmjl ericmjl deleted the networkx-v2 branch April 25, 2020 19:51
ericmjl added a commit that referenced this pull request Apr 26, 2020
* Add nbstripout

* update to networkx v2 API

* install ffmpeg from native ubuntu repo

* comment out xvfb

* change python to 3.8

* switch to py37

* manual listing of notebooks to execute

Former-commit-id: 9c0f148
ericmjl added a commit that referenced this pull request Apr 26, 2020
* Add nbstripout

* update to networkx v2 API

* install ffmpeg from native ubuntu repo

* comment out xvfb

* change python to 3.8

* switch to py37

* manual listing of notebooks to execute

Former-commit-id: 25d84cf4c06d9a1a020af53e2e9c2a44e2b4905c
ericmjl added a commit that referenced this pull request Jul 8, 2020
* Update numpy from 1.15.3 to 1.15.4

Former-commit-id: afdbd7516dadb529191f8f72e653df42f5b9f710

* Update matplotlib from 3.0.1 to 3.0.2

* Update matplotlib from 3.0.1 to 3.0.2

Former-commit-id: 945d24135d9dc168dbd9d57d79e9f5e274d9862c

* Added link to DataCamp course

* Added link to DataCamp course

Former-commit-id: 7dbcc2e017892a76077dd743d2ebad52c965d4af

* Update nxviz from 0.5.0 to 0.6.0

* Update nxviz from 0.5.0 to 0.6.0

Former-commit-id: dbfc8f79de4085a9920744055ae3cf13ef9c17b1

* Update scipy from 1.1.0 to 1.2.0

* Update scipy from 1.1.0 to 1.2.0

Former-commit-id: d2901678efd102004b28c1f47297904a5c1053f3

* Update python-louvain from 0.11 to 0.13

* Update python-louvain from 0.11 to 0.13

Former-commit-id: 7ccd135189168155147f33161122ade916b57314

* Update tqdm from 4.28.1 to 4.29.0

* Update tqdm from 4.28.1 to 4.29.0

Former-commit-id: fea877262946430bf2f927ec4421166bd8d7629f

* Update numpy from 1.15.4 to 1.16.0

* Update numpy from 1.15.4 to 1.16.0

Former-commit-id: 5c0268db9f4dcb7d3c895afa537a1d60ae38a211

* Update tqdm from 4.29.0 to 4.29.1

* Update tqdm from 4.29.0 to 4.29.1

Former-commit-id: 0cf5143e3b7e2d3d658593249660841633e55b31

* Update pandas from 0.23.4 to 0.24.0

* Update pandas from 0.23.4 to 0.24.0

Former-commit-id: 578ae3ec5c74e28833035d715810cf3addb66d39

* Update tqdm from 4.29.1 to 4.30.0

* Update tqdm from 4.29.1 to 4.30.0

Former-commit-id: 408c49d7cc389d3f4b42667ecae452454dc7b9ae

* Update pandas from 0.24.0 to 0.24.1

* Update pandas from 0.24.0 to 0.24.1

Former-commit-id: b616e16ca71febdb8b382357c09d549a69b587bc

* Update numpy from 1.16.0 to 1.16.1

* Update numpy from 1.16.0 to 1.16.1

Former-commit-id: d1228f64ad94a6c21b97c4a06c39e598f216449f

* Update scipy from 1.2.0 to 1.2.1

* Update scipy from 1.2.0 to 1.2.1

Former-commit-id: e140df9b9df001d91e1e0e2c179181b0f185225d

* Update tqdm from 4.30.0 to 4.31.1

* Update tqdm from 4.30.0 to 4.31.1

Former-commit-id: e9448355422122ecefff7b540563a8cea7ed20ea

* Update matplotlib from 3.0.2 to 3.0.3

* Update matplotlib from 3.0.2 to 3.0.3

Former-commit-id: c7364c46e469a333d64c4c6bed498305fd75fdb8

* Update numpy from 1.16.1 to 1.16.2

* Update numpy from 1.16.1 to 1.16.2

Former-commit-id: 9921b3940869fbec98df6875fcd17c94a1d54edc

* Update pandas from 0.24.1 to 0.24.2

* Update pandas from 0.24.1 to 0.24.2

Former-commit-id: 4fd0212d46f43bd716fc838eff826817257295e5

* Update networkx from 2.2 to 2.3

* Update networkx from 2.2 to 2.3

Former-commit-id: bd01d180b955c3437d97effee6c323bc03ca890c

* Update nxviz from 0.6.0 to 0.6.1

* Update nxviz from 0.6.0 to 0.6.1

Former-commit-id: 8582326fbb92a96162a153905f5b95e22bb4cef6

* Update numpy from 1.16.2 to 1.16.3

* Update numpy from 1.16.2 to 1.16.3

Former-commit-id: 8d486146fb4ef5572b61ba6f227ef8c6f132b371

* Update matplotlib from 3.0.3 to 3.1.0

* Update matplotlib from 3.0.3 to 3.1.0

Former-commit-id: 8755090b30d4b28a43bcd0c001366dda224c3023

* Update scipy from 1.2.1 to 1.3.0

* Update scipy from 1.2.1 to 1.3.0

Former-commit-id: 7e86377f68e88361588622164de07de35d15ec18

* Update tqdm from 4.31.1 to 4.32.1

* Update tqdm from 4.31.1 to 4.32.1

Former-commit-id: cdc8856d52a657fe8279ad885f06a2beb323b227

* Update numpy from 1.16.3 to 1.16.4

* Update numpy from 1.16.3 to 1.16.4

Former-commit-id: 6ad31740e4cf9ff1d0373c0e289ed57d8af1e5fa

* Update tqdm from 4.32.1 to 4.32.2

* Update tqdm from 4.32.1 to 4.32.2

Former-commit-id: f41370384743d84976ab4e36bf737b707ce7fb53

* add ffmpeg to env spec

* add ffmpeg to env spec

Former-commit-id: 7364f0514109402bb7f4bd87041d4d0f57a3b5e7

* Update matplotlib from 3.1.0 to 3.1.1

* Update matplotlib from 3.1.0 to 3.1.1

Former-commit-id: 4da6add03eb96c72faf7016e51154ce234f17652

* Update pandas from 0.24.2 to 0.25.0

* Update pandas from 0.24.2 to 0.25.0

Former-commit-id: ed65351257a790f22f8a8b5055ee004b11ecb878

* Update numpy from 1.16.4 to 1.17.0

* Update numpy from 1.16.4 to 1.17.0

Former-commit-id: dd31704b753578c763e04715112a5d8f688a1676

* Update pandas from 0.25.0 to 0.25.1

* Update pandas from 0.25.0 to 0.25.1

Former-commit-id: 4e71b7c8631a47f28dca7021ae29cb8cbcdbb7d6

* Update scipy from 1.3.0 to 1.3.1

* Update scipy from 1.3.0 to 1.3.1

Former-commit-id: fa838d58cb766361468d8904ee44b6b880382e96

* Update tqdm from 4.32.2 to 4.35.0

* Update tqdm from 4.32.2 to 4.35.0

Former-commit-id: 9e06be8d617400611b165b22c94bdf98c1585281

* Update numpy from 1.17.0 to 1.17.1

* Update numpy from 1.17.0 to 1.17.1

Former-commit-id: 27090871dce3d379289d5dcbe2f8065429218ad3

* Update numpy from 1.17.1 to 1.17.2

* Update numpy from 1.17.1 to 1.17.2

Former-commit-id: 778399db274598ae278fb7e8552d74d18d10dc82

* Networkx v2 (#133)

* Add nbstripout

* update to networkx v2 API

* install ffmpeg from native ubuntu repo

* comment out xvfb

* change python to 3.8

* switch to py37

* manual listing of notebooks to execute

* Networkx v2 (#133)

* Add nbstripout

* update to networkx v2 API

* install ffmpeg from native ubuntu repo

* comment out xvfb

* change python to 3.8

* switch to py37

* manual listing of notebooks to execute

Former-commit-id: 25d84cf4c06d9a1a020af53e2e9c2a44e2b4905c

* Moved notebooks into notebooks directory

* Moved notebooks into notebooks directory


Former-commit-id: 91c3c5f41c4b7731809d284c9a40a1d495a25ce9

* Add @MridulS to copyright

* Add @MridulS to copyright


Former-commit-id: 7030d8d2e268c68e034b85b76bdd88d2057de06a

* Add jupyter-book to environment spec

* Add jupyter-book to environment spec


Former-commit-id: 69b5484f9ae4272f84a4eb2a4b521a17abfb5d12

* mkdocs first commit

* mkdocs first commit


Former-commit-id: ae0ea364fe28845a22e1d65bd30ad04c5159fddd

* Sneaking in Python gitignore

* Sneaking in Python gitignore


Former-commit-id: 01e8e31413cd05ed09bd2d00238113d9fcb2e588

* committing data before moving to another computer

* committing data before moving to another computer


Former-commit-id: 20a91bf69b0a50b7ce023cdd5302926915ac6198

* finished chapter 1

* finished chapter 1


Former-commit-id: 3211f2a7d2453e5f7fc4d2fb948c65f11ae39c48

* added static site pieces

* ran bfg cleaner

* took out comment line in .buildpacks

* Trigger commit for Dokku

* fixed config file name

* Switching over to Dockerfile-based deploy

* fixed copy error

* Added command to activate bash

* add dockerignore

* Add command to source bashrc

* change source cmd

* change conda activate to . activate

* add diagnostic which conda

* modify dockerfile

* manually configure path

* fixed docker install command'

* Add entrypoint for Docker container

* Add headers for feedback and supporting

* restricted initial setup

* removed custom source from environment spec file

* fixed Dockerfile

* ignoring ipynb_checkpoints

* commit to move to different computer

* midway commit on hubs chapter

* finished up degree centrality

* finished hubs (degree centrality) notebook

* Added style guide

* Add style guide

* removed 1st level heading

* Moved exercises solution info to correct place

Was in "exercises" section,
should instead be in "solutions" section.

* starting pre-commit

* Finished chapter on paths

* finished chapter on paths

* Fixed missing import in paths notebook.

* Finished chapter 6

* Docs for structures

* Added docstrings to structures.py

- Sneaking in black and isort fix on paths.py

* Added docstrings to all paths.py functions

* Docstrings added to each of the chapter solutions.

* Added mkdocstrings to environment spec

* Added solutions API docs

This is a pretty neat hack!
Use functions to house the answers
and then expose them all at once in an API docs page.

* Added special CSS for API docs

* Upgraded docs with API docs for solutions

* Added docstrings to all hubs solutions.

* Found out that mkdocstrings borks mknotebooks

* started graph io notebook

* made output HTML also use overflow

* Updated with admonition

* added chapter on testing

* Add page to learn more stuff

* whitespace changes

* switching to other computer

* Updated "learn more"

* Minor phrasing change to index

* Commented out advanced topics until it is made

* Added comments on first PDF compilation attempt

* Finished prototype of PDF compiler

Still left to do:

- Separate out chapters such that they start on new pages.

* configured mkdocs to execute notebooks

* added hypothes.is

* Finished PDF builder prototype

* Adding more chapters in

* add NB7 and 8 to mkdocs (#140)

h/t @MridulS!

* Updated gitignore

* Changed port for Makefile

* Finished up to 2nd exercise of bipartite notebook

* EOD commit 6 May 2020

* Finished bipartite first draft

* Update devdocs with render_html function

* Added a render_html convenience function

* Switched to using render_html

* Switched to using render_html for answers to questions

* Switched to using render_html for answers to questions

* Finished linear algebra draft

* Got rid of top level header

* Fixed up linear algebra chapter

* Started drafting statistical inference on graphs section

* Changed bipartite graph figure to matplotlib-generated one.

* Changed links to inline ones

* Added figure generation code

* Finished more prototyping

- Page breaks recognized! Amazing!
- Reconfigured book content.

It's time to put this one into action in the Dockerfile.

* Add dev container specification

* Add updated stats notebook

* Add content to chapter on GOT case study (#146)

* initial work on GoT

* GOT finsh up

* fix for docs build

* strip nboutput

* add load_data method for GOT data

* update dataset

* More stats content

* Minor update

* Finished stats notebook

* Add preface

* Building Markua collection of files

* Adding in test manuscript for leanpub

* Removed python script

* Testing travis deploy

* Deploying whole repo

* Now inserting top level markdown header

* Trying alternative output directory

* Trying a different build structure

* Add tabulate to environment

* fixed latex output for LFM

* Fixed inline LaTeX to LFM LaTeX

* Converting pandas head() to to_markdown()

* Fixed up images LFM compatibility

* preprocessing markdown tables

* swap image with new custom image instead of using the one from the article

* Fixed issue with long outputs

* I think I got markdown tables working finally

* set logging level to INFO

* Getting rid of more HTML

* Getting rid of more HTML

* restored cell content

* more fixes

* Added a few more automated validations

* Fixed final table output

* Add deploy to main branch

* Move Dockerfile into scripts

* Changed README

* Update index page

* moved notebooks into archive

* moved tutorial proposals to archive

* Moved images to archive

* Removed nbstripout commands from Makefile

* previewing deploy on jupyterbook branch

* Targeting deploys from main branch rather than jupyterbook branch

Co-authored-by: pyup-bot <[email protected]>
Co-authored-by: Mridul Seth <[email protected]>
Co-authored-by: Mridul Seth <[email protected]>
Co-authored-by: Mridul Seth <[email protected]>
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.

1 participant