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

Rflo/master #39

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Rflo/master #39

wants to merge 28 commits into from

Conversation

kown7
Copy link
Contributor

@kown7 kown7 commented Sep 28, 2020

  • using flit to package and upload to pypi
  • rmtoo-contrib-dir to get contrib/ directory, no need for environment variables anymore.

kown7 added 28 commits July 26, 2020 15:35
Fix #5

Squashed commit of the following:

commit de6dc4e
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 02:22:17 2020 +0200

    - remove unnecessary command

commit 8021795
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 02:15:36 2020 +0200

    - don't do

commit 8a009a2
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 01:58:15 2020 +0200

    - remove unnecessary command

commit f0141d4
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 01:46:02 2020 +0200

    rename to sltoo

commit 57df8e5
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 01:38:34 2020 +0200

    try again

commit 79c199f
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 01:28:49 2020 +0200

    flit build

commit 0fdf729
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 01:19:49 2020 +0200

    +do stuff

commit 5666765
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 01:04:49 2020 +0200

    illegal code

commit 599085d
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 00:48:24 2020 +0200

    gogogo

commit 423f120
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 00:37:34 2020 +0200

    ignore dist-folder

commit 77f41ff
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 00:36:31 2020 +0200

    testenv:flit2

commit bac58bc
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 00:31:35 2020 +0200

    change stuff

commit 9cf6e89
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Fri May 22 00:12:19 2020 +0200

    testenv:flit

commit a86e2be
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Thu May 21 23:59:42 2020 +0200

    actually build it there then

commit 37c2309
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Thu May 21 23:51:30 2020 +0200

    Build sdist with flit in tox environment

commit 216505b
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Thu May 21 23:34:04 2020 +0200

    build sdist

commit a908299
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Thu May 21 23:11:50 2020 +0200

    bump version number

commit d1253a9
Author: Kristoffer Nordstroem <kristoffer@nordstroem.ch>
Date:   Thu May 21 23:08:47 2020 +0200

    deploy
This fix seems rather brute-force-ish but the directories with those files
seems gone anyway. Hence there's probably no point in preserving it
This shall be reverted when traceability matrix will be implemented
The `doc/vmsetup` folder hasn't been touched and should be at some point.
@codecov-commenter
Copy link

codecov-commenter commented Sep 28, 2020

Codecov Report

Merging #39 into master will increase coverage by 0.14%.
The diff coverage is 92.30%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #39      +/-   ##
==========================================
+ Coverage   90.81%   90.95%   +0.14%     
==========================================
  Files         110      110              
  Lines        4703     4799      +96     
==========================================
+ Hits         4271     4365      +94     
- Misses        432      434       +2     
Impacted Files Coverage Δ
src/rmtoo/inputs/RDepConstraints.py 100.00% <ø> (ø)
src/rmtoo/inputs/RDepDependsOn.py 100.00% <ø> (ø)
src/rmtoo/inputs/RDepMasterNodes.py 100.00% <ø> (ø)
src/rmtoo/inputs/RDepNoDirectedCircles.py 100.00% <ø> (ø)
src/rmtoo/inputs/RDepOneComponent.py 100.00% <ø> (ø)
src/rmtoo/inputs/RDepPriority.py 100.00% <ø> (ø)
src/rmtoo/inputs/RDepSolvedBy.py 100.00% <ø> (ø)
src/rmtoo/inputs/ReqCE3.py 100.00% <ø> (ø)
src/rmtoo/inputs/ReqClass.py 100.00% <ø> (ø)
src/rmtoo/inputs/ReqConstraints.py 100.00% <ø> (ø)
... and 138 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 633c470...8ef7ff6. Read the comment docs.

@florath
Copy link
Owner

florath commented Sep 30, 2020

Hello!
Thanks for providing the changes / pull request.
I'm sorry, but I'm not able to merge this: it is just too big.
A pull / merge request should implement one feature / problem. What I see here is that many different aspects are merged into one request: some of them I'll not accept (or at least we should discuss them first). Example: you remove files which I (still) need.
Please split up the changes feature-wise and provide appropriate pull requests.

@kown7
Copy link
Contributor Author

kown7 commented Oct 2, 2020

It's basically just one feature: automated build/deploy using flit. I hardly see a point in splitting these commits. A git merge --squash isn't an option as it would break the tests again.

  • fhe first 5 commits are basic support for flit
    • Setting FLIT_PASSWORD in travis to upload automatically.
    • Only tagged builds will be uploaded.
  • 83223b5 to 86eaf85 removes setup.py support, as it duplicates most/all information in pyproject.toml
  • the last 8 commits put the contrib/ directory back into the distribution. This feature didn't work as intended.

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

3 participants