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

New version 5.7.6 #211

Merged
merged 55 commits into from Apr 6, 2022
Merged

New version 5.7.6 #211

merged 55 commits into from Apr 6, 2022

Conversation

phoebe-p
Copy link
Member

No description provided.

allcontributors bot and others added 30 commits September 30, 2021 11:41
…s, infra, maintenance, review, test (#172)

* docs: update README.md [skip ci]

* docs: create .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: create .all-contributorsrc [skip ci]

* Fix all contributors stuff

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* Added the function that install numpy before everything

* Ignoring Codacy

* Removed pre-installation of numpy due to the installing during setup fase

* Modified the docs reflecting the change (numpy not needed)
* Correct some typos

* Add options for DA solver

* Add Green's function approximation for the DA solver

* Remove unused variable

* Use adaptive integration (closer to existing impl, allows for rtol)

* Correct some typos

* Exclude endpoint from integration (similar to solve_bvp method)

* Guard Green's method from extreme L values

* Add docstring in diffusion Green function

* Add science reference in diffusion Green function

* Move convolution integral function to top level

* Remove constant terms from convolution and reduce function args

* Docstring for functions computing the convolution integrals

* Add tests

* Update docs

Co-authored-by: thomas <thomas@thomasDebian.WORKGROUP>
Co-authored-by: thomas <thomas@thomasDebian>
@phoebe-p phoebe-p requested a review from dalonsoa March 23, 2022 04:32
@codecov
Copy link

codecov bot commented Mar 23, 2022

Codecov Report

Merging #211 (ef37a0e) into master (80a2602) will increase coverage by 0.38%.
The diff coverage is 93.47%.

@@            Coverage Diff             @@
##           master     #211      +/-   ##
==========================================
+ Coverage   45.47%   45.85%   +0.38%     
==========================================
  Files          84       84              
  Lines        9029     9100      +71     
==========================================
+ Hits         4106     4173      +67     
- Misses       4923     4927       +4     
Impacted Files Coverage Δ
solcore/light_source/smarts.py 11.45% <0.00%> (ø)
solcore/optics/rcwa.py 23.88% <0.00%> (ø)
solcore/science_tracker.py 26.53% <ø> (ø)
solcore/structure.py 91.75% <ø> (ø)
solcore/optics/beer_lambert.py 50.00% <73.33%> (+2.00%) ⬆️
solcore/absorption_calculator/tmm_core_vec.py 100.00% <100.00%> (ø)
solcore/analytic_solar_cells/__init__.py 100.00% <100.00%> (ø)
...re/analytic_solar_cells/depletion_approximation.py 100.00% <100.00%> (ø)
solcore/optics/tmm.py 91.35% <100.00%> (ø)
solcore/solar_cell_solver.py 66.46% <100.00%> (ø)
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 80a2602...ef37a0e. Read the comment docs.

Copy link
Collaborator

@dalonsoa dalonsoa left a comment

Choose a reason for hiding this comment

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

Let's merge the other branch, first and then go for this one.

@phoebe-p
Copy link
Member Author

phoebe-p commented Apr 1, 2022

What is the "correct" way to do this? I guess we want to make a new version, so should I bump the version (in conf.py, setup.cfg and solcore_config.txt) in develop first and then merge that into master? Also, for the documentation, I am not sure which branches it is currently tracking but I think it's master and devel (not sure what "latest" means), but we don't use devel anymore, so I think this should be changed to tracking develop. I think this has to be updated on readthedocs directly, not sure I am able to access that?

@dalonsoa
Copy link
Collaborator

dalonsoa commented Apr 1, 2022

We are using a tool called bump2version that does the bumping for us in the correct places (as configured in setup.cfg), commit the changes and creates a tag.

I would do the following:

  1. Merge develop into master and pull the latest version of master to your computer.
  2. Use bump2version to bump the version locally.
  3. Push the new commit and the new tag back to the repo with git push and git push --tags, respectively.
  4. Create a new release in GitHub, selecting the new tag and creating automatic release notes as described here.
  5. Merge master into develop.

About Read The Docs, let me check what is tracking. I'll see if I can transfer you the control of it or, at the very least, give you access.

@phoebe-p phoebe-p merged commit 21d247a into master Apr 6, 2022
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.

None yet

4 participants