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.

Sign up for GitHub

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

Jump to bottom

#34: Relax black version requirements #88

Merged
merged 6 commits into from
Nov 29, 2021
Merged

#34: Relax black version requirements #88

merged 6 commits into from
Nov 29, 2021

Conversation

bryant-finney
Copy link
Collaborator

@bryant-finney bryant-finney commented Nov 20, 2021 •
edited
Loading

Closes #34

bryant-finney and others added 2 commits November 18, 2021 09:03
@bryant-finney @dependabot
Madoshakalaka#86 additional security updates (Madoshakalaka#85)
d27698c 
* Bump sqlalchemy from 1.1.14 to 1.3.0 in /tests/data/broken_1

Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 1.1.14 to 1.3.0.
- [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases)
- [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/main/CHANGES)
- [Commits](https://github.com/sqlalchemy/sqlalchemy/commits)

---
updated-dependencies:
- dependency-name: sqlalchemy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump sqlalchemy from 1.1.14 to 1.3.0 in /tests/data/extra_0

Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 1.1.14 to 1.3.0.
- [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases)
- [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/main/CHANGES)
- [Commits](https://github.com/sqlalchemy/sqlalchemy/commits)

---
updated-dependencies:
- dependency-name: sqlalchemy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump sqlalchemy from 1.1.14 to 1.3.0 in /tests/data

Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 1.1.14 to 1.3.0.
- [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases)
- [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/main/CHANGES)
- [Commits](https://github.com/sqlalchemy/sqlalchemy/commits)

---
updated-dependencies:
- dependency-name: sqlalchemy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump requests from 2.18.4 to 2.20.0 in /tests/data

Bumps [requests](https://github.com/psf/requests) from 2.18.4 to 2.20.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.18.4...v2.20.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@bryant-finney
Merge branch 'Madoshakalaka:master' into master
1c38493
@codecov-commenter
Copy link

codecov-commenter commented Nov 20, 2021 •
edited
Loading

Codecov Report

Merging #88 (bd9f6f4) into master (d3cc76f) will increase coverage by 0.13%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #88      +/-   ##
==========================================
+ Coverage   94.63%   94.77%   +0.13%     
==========================================
  Files          10       10              
  Lines         746      765      +19     
==========================================
+ Hits          706      725      +19     
  Misses         40       40
Impacted Files Coverage Δ
pipenv_setup/setup_updater.py 97.93% <100.00%> (+0.31%) ⬆️

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 d3cc76f...bd9f6f4. Read the comment docs.

@bryant-finney bryant-finney self-assigned this Nov 20, 2021
@bryant-finney bryant-finney mentioned this pull request Nov 20, 2021
Closed
@bryant-finney bryant-finney force-pushed the 34-relax-black-requirements branch 3 times, most recently from 45082ca to cd55bfa Compare November 21, 2021 03:26
@bryant-finney bryant-finney mentioned this pull request Nov 21, 2021
Open
@bryant-finney bryant-finney force-pushed the 34-relax-black-requirements branch 8 times, most recently from 290b749 to f6246b9 Compare November 21, 2021 23:34
@bryant-finney bryant-finney added this to In Progress in Enhancements Nov 22, 2021
@bryant-finney
[#34] squashed commits to add usage workflow
b95ee99 
commit 89df2f6ee260165003c4ef518fae531398acfa25
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Tue Nov 23 14:54:53 2021 -0500

    [#34] hopefully it works now 🤞

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit 88fbded0f401f29873f14ad4bc44d65976e319e0
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Tue Nov 23 14:49:28 2021 -0500

    [#34] `"` -> `'`

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit 6c0d3475796c6f8064968e7ec9dbcb6c4c3d5049
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Tue Nov 23 14:47:14 2021 -0500

    [#34] try again

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit 1dc7ac08fc98290f428b0ab1bd25ed0c0c51668f
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Tue Nov 23 14:41:52 2021 -0500

    [#34] don't split conditional accross multiple lines

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit 6d543c4c74f41916604e8b13d492b782d36f61af
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Tue Nov 23 14:37:31 2021 -0500

    [#34] simplify `extras` test

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit 7d8dd7aa36f2f125fc1be390cafd66b175eab8b3
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Tue Nov 23 14:28:17 2021 -0500

    [#34] update `usage` workflow strategy

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit 6cbb90f91440621b2e79396c60cd802cf3f220e7
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sun Nov 21 21:45:18 2021 -0500

    [#34] remove `PIPENV_SETUP` var

    It was causing Windows grief

commit 7f129718c3ec4ded67e6e6376537b7bb5e426601
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sun Nov 21 18:14:41 2021 -0500

    [#34] TDD: add failing `black` / `autopep8` tests

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit 16a967233a7ce8e784b822491a404767bb2563a1
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sun Nov 21 17:37:19 2021 -0500

    [#34] print `--help` to test installation

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit bc66d794f4b9993bedc1804bd91c2d772ef39da5
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sun Nov 21 16:16:41 2021 -0500

    [#34] WIP: add `usage` workflow

    this workflow is intended to test the installation of this project and
    its CLI

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>
@michi88 michi88 mentioned this pull request Nov 25, 2021
Open
@bryant-finney bryant-finney force-pushed the 34-relax-black-requirements branch 2 times, most recently from 8c039a4 to 6c8c063 Compare November 26, 2021 21:16
@bryant-finney
[#34] TDD: squash commits for adding tests
3ad861b 
commit d9c1b62006b6ebe31c0f3856d50d5632c5b4a353
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sat Nov 20 22:42:05 2021 -0500

    [#34] TDD: add failing test for closing #34

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit 82260142cfa27bf32d624be46957d5c8e14fd960
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sat Nov 20 22:15:00 2021 -0500

    [#34] add a third option: neither `black` nor `autopep8`

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit b12d85c988b89b85343f49ef7f47996e3a165b55
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sat Nov 20 21:59:50 2021 -0500

    [#34] add test for `autopep8` (not `black`)

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit 1a9e0b9ebe710de20a1e94c98cbcec7b5f20bd56
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sat Nov 20 21:57:00 2021 -0500

    [#34] correct import failures for python2.7

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit dbe08a3eb7159fa3f97fc8a23fdd9db31cff05fe
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sat Nov 20 20:41:04 2021 -0500

    [#34] add test for `black` import failures

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit e9113a0203d495de874bdb2099deaf25410d6107
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sat Nov 20 00:53:59 2021 -0500

    [#34] xfail test for < 3.6

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit f28f9ea20e028eb96fb1fa9fda326cb1e6c570d1
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sat Nov 20 00:23:30 2021 -0500

    [#34] add function to retrieve fmt module

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit a5005e521acd7c17c2f46724fbed8540845987f0
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sat Nov 20 00:18:06 2021 -0500

    [#34] `ModuleNotFoundError` -> `ImportError`

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit f349c194a248fdf8b17635639946ad31d0719ea3
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Sat Nov 20 00:05:36 2021 -0500

    [#34] update dummy import fixture; add tests

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit 74d49aeb79c85ef4d0869840bb563425f63cb3f0
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Fri Nov 19 23:21:53 2021 -0500

    [#34] add test for monkeypatching __import__

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

commit 3271762f845c691f0b7d819d62c572e052fff045
Author: Bryant Finney <bryant.finney@alumni.uah.edu>
Date:   Fri Nov 19 20:59:33 2021 -0500

    [#34] `isort setup_updater.py`

    Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>

Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>
@bryant-finney
[#34] black / autopep8 to dev dependencies
af246c5 
also add extras for both, and disable fail-fast in `ci.yml`

Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>
@bryant-finney bryant-finney force-pushed the 34-relax-black-requirements branch 2 times, most recently from 44f8b12 to 836816f Compare November 26, 2021 21:50
@bryant-finney
[#34] TDD: resolve remaining failing tests
bd9f6f4 
Signed-off-by: Bryant Finney <bryant.finney@alumni.uah.edu>
@bryant-finney bryant-finney marked this pull request as ready for review November 26, 2021 23:58
@bryant-finney
Copy link
Collaborator Author

@jshwi mind giving this a once-over? 🙂

@jshwi
Copy link
Contributor

jshwi commented Nov 27, 2021

@bryant-finney Totally, not a prob 😄 I'll get back to you asap!

@jshwi
Copy link
Contributor

jshwi commented Nov 28, 2021

@bryant-finney I ran this on a package that previously could not install this due to a conflicting version of black, and so far so good. And it runs as it is supposed to too. I'm going to look at the source code and see if anything stands out, or I feel we should be discussed. From what I saw previously, though, I don't think there are any issues. I'll try this with varying installations of black, or no black, just for a duress test. But I think this looks really good!!

@bryant-finney
Copy link
Collaborator Author

@jshwi excellent, thank you for digging into this 😃 I'll wait to merge until you've finished testing!

@jshwi
Copy link
Contributor

jshwi commented Nov 29, 2021 •
edited
Loading

@bryant-finney I could only find those two suggestions for 3ad861b (really just being picky, but any constructive discussion is good discussion!), going to look at the remaining two commits, but looking good! 🎉

edit: Come to think about it, not sure why the test passed without the explicit exception, and failed with it. Is it simply because patch_import only detects ImportErrors? If so, does it lose some of its functionality if an ImportError is not explicitly excepted?

@bryant-finney
Copy link
Collaborator Author

@jshwi I believe that because ModuleNotFound is a subclass of ImportError, catching ImportError will also catch ModuleNotFound.

But IIRC, the root issue was that python 2.7 doesn't actually raise ModuleNotFound, but rather simply raises ImportError. So the test was having problems with tox

@jshwi
Copy link
Contributor

jshwi commented Nov 29, 2021

@bryant-finney This looks good to merge as far as I can tell :)

@bryant-finney
Copy link
Collaborator Author

@jshwi awesome, thanks again for the review 😁

@bryant-finney bryant-finney merged commit e04bea6 into Madoshakalaka:master Nov 29, 2021
@jshwi
Copy link
Contributor

jshwi commented Nov 30, 2021

@bryant-finney Any time. Great work!

@benhowes benhowes mentioned this pull request Feb 2, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@bryant-finney bryant-finney

Labels
None yet
Projects
Enhancements
In Progress
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Strict dependency on black prevents usage of the latest black
3 participants
@bryant-finney @codecov-commenter @jshwi