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

certbot: 0.31.0 -> ... -> 0.35.0 #61203

Closed
wants to merge 3 commits into from
Closed

certbot: 0.31.0 -> ... -> 0.35.0 #61203

wants to merge 3 commits into from
+4 −3

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented May 9, 2019

Motivation for this change

Whoops, I guess I haven't been sending these for a while :3.

Tests disabled because they require docker (integration testing),
dunno if there's a way to run non-docker tests or such, suggestions
welcome :).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@ofborg ofborg bot requested a review from domenkozar May 9, 2019 18:35
@c0bw3b
Copy link
Contributor

c0bw3b commented May 9, 2019

That could be squashed into one commit

@dtzWill
Copy link
Member Author

dtzWill commented May 9, 2019

That could be squashed into one commit

Yes, haha :3. It definitely should be squashed.

@dtzWill dtzWill force-pushed the update/certbot-0.34.x branch from ec0094c to 959cc26 Compare May 9, 2019 21:35
mmahut
mmahut reviewed May 21, 2019
View reviewed changes
Copy link
Member

@mmahut mmahut left a comment

Choose a reason for hiding this comment

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

nix-review builds fine, but I'm getting an import module failure

# ./certbot 
Fatal Python error: initsite: Failed to import the site module
Traceback (most recent call last):
  File "/nix/store/yf4i32dx953p2dv2agfdyxdwg6ba0l61-python3.7-setuptools-41.0.1/lib/python3.7/site-packages/site.py", line 73, in <module>
    __boot()
  File "/nix/store/yf4i32dx953p2dv2agfdyxdwg6ba0l61-python3.7-setuptools-41.0.1/lib/python3.7/site-packages/site.py", line 26, in __boot
    import imp  # Avoid import loop in Python 3
  File "/nix/store/s5f3vpmig33nk4zyk228q55wdydd3pc2-python3-3.7.3/lib/python3.7/imp.py", line 27, in <module>
    import tokenize
  File "/nix/store/s5f3vpmig33nk4zyk228q55wdydd3pc2-python3-3.7.3/lib/python3.7/tokenize.py", line 33, in <module>
    import re
  File "/nix/store/s5f3vpmig33nk4zyk228q55wdydd3pc2-python3-3.7.3/lib/python3.7/re.py", line 143, in <module>
    class RegexFlag(enum.IntFlag):
AttributeError: module 'enum' has no attribute 'IntFlag'

@dtzWill dtzWill mentioned this pull request May 31, 2019
Closed
10 tasks
dtzWill added 3 commits June 6, 2019 22:12
@dtzWill
certbot: 0.31.0 -> 0.34.2

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
3da5479 
(also python3Packages.acme, same source)

Notes for releases I've used along the way, FWIW:

https://github.com/certbot/certbot/blob/v0.32.0/CHANGELOG.md
https://github.com/certbot/certbot/blob/v0.33.1/CHANGELOG.md
https://github.com/certbot/certbot/blob/v0.34.0/CHANGELOG.md
https://github.com/certbot/certbot/blob/v0.34.1/CHANGELOG.md
https://github.com/certbot/certbot/blob/v0.34.2/CHANGELOG.md

* add pytest dep
* add pyyaml dep
* disable tests, failure trying to invoke 'docker'
@dtzWill
certbot: simplify, NFC
3d7d775
@dtzWill
certbot: 0.34.2 -> 0.35.0
f43b5d4
@dtzWill dtzWill force-pushed the update/certbot-0.34.x branch from f7b4fd5 to f43b5d4 Compare June 7, 2019 03:13
@dtzWill dtzWill changed the title certbot: 0.31.0 -> ... -> 0.34.2 certbot: 0.31.0 -> ... -> 0.35.0 Jun 7, 2019
@dtzWill
Copy link
Member Author

dtzWill commented Jun 7, 2019

Can't reproduce import problem, and seems to work fine in deployments (unless we've decoupled it from nginx module's enableACME).

Not sure how to resolve-- any thoughts? If I get a chance I'll see if our acme test does indeed include executing this, which would at least give some positive indicator things are okay :).

aanderse
aanderse approved these changes Sep 1, 2019
View reviewed changes
Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

@dtzWill @mmahut I do not get the error you report. Seems to be OK. Would be very nice to merge this before feature freeze. Anyone agree to merge?

@mmahut
Copy link
Member

mmahut commented Sep 1, 2019

That's odd, fresh NixOS installation and nix-review I still got:

nix-shell:~/.cache/nix-review/pr-61203/results/certbot/bin]$ ./certbot 
Fatal Python error: initsite: Failed to import the site module
Traceback (most recent call last):
  File "/nix/store/5zx5pcjw349dyf0iybarq0l6a5p974kx-python3.7-setuptools-41.0.1/lib/python3.7/site-packages/site.py", line 73, in <module>
    __boot()
  File "/nix/store/5zx5pcjw349dyf0iybarq0l6a5p974kx-python3.7-setuptools-41.0.1/lib/python3.7/site-packages/site.py", line 26, in __boot
    import imp  # Avoid import loop in Python 3
  File "/nix/store/xw06hkwpxyjxil3d5h374imxp3qhkscq-python3-3.7.4/lib/python3.7/imp.py", line 27, in <module>
    import tokenize
  File "/nix/store/xw06hkwpxyjxil3d5h374imxp3qhkscq-python3-3.7.4/lib/python3.7/tokenize.py", line 33, in <module>
    import re
  File "/nix/store/xw06hkwpxyjxil3d5h374imxp3qhkscq-python3-3.7.4/lib/python3.7/re.py", line 143, in <module>
    class RegexFlag(enum.IntFlag):
AttributeError: module 'enum' has no attribute 'IntFlag'

@aanderse
Copy link
Member

aanderse commented Sep 5, 2019

@mmahut I've checked again and it appears that when I run the executable from nix-review I get the same error as you, but if I checkout the PR and rebase on master then running the executable is fine. Can you confirm if running certbot from a checkout works or not please?

@mmahut
Copy link
Member

mmahut commented Sep 5, 2019

@aanderse oh, you are right. This is good to go.

aanderse
aanderse reviewed Sep 5, 2019
View reviewed changes
pkgs/tools/admin/certbot/default.nix
@@ -40,7 +40,8 @@ python3Packages.buildPythonApplication rec {
done
'';

doCheck = !stdenv.isDarwin; # On Hydra Darwin tests fail with "Too many open files".
checkInputs = with python3Packages; [ pytest pyyaml ];
Copy link
Member

Choose a reason for hiding this comment

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

@dtzWill if doCheck is false why are you adding checkInputs?

@aanderse
Copy link
Member

ping @dtzWill

@flokli flokli mentioned this pull request Oct 18, 2019
Closed
@c0bw3b
Copy link
Contributor

c0bw3b commented Oct 25, 2019

Obsolete after #71291

@c0bw3b c0bw3b closed this Oct 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmahut mmahut

@aanderse aanderse

@c0bw3b c0bw3b

@domenkozar domenkozar

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dtzWill @c0bw3b @mmahut @aanderse