entrouvert
/
debian-pywebpush
17
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

Mise à jour vers 1.14.0 (#85497) #2

Open
bdauvergne wants to merge 0 commits from wip/merge-1.14.0 into master
pull from: wip/merge-1.14.0
merge into: entrouvert:master
Conversation 1 Commits - Files Changed -
bdauvergne commented 2023-12-07 08:57:47 +01:00
Owner
Copy Link

L'historique du dépôt upstream a bougé (uniquement les messages de commit) mais le contenu est le même au même commit que master, il faut d'abord écraser master avec wip/sync-with-upstream, ensuite cette branche sera mergable.

L'historique du dépôt upstream a bougé (uniquement les messages de commit) mais le contenu est le même au même commit que master, il faut d'abord écraser master avec wip/sync-with-upstream, ensuite cette branche sera mergable.
bdauvergne added 106 commits 2023-12-07 08:57:48 +01:00
36555b602d Merge pull request #36 from web-push-libs/feat/35 
Convert README from markdown to restructured text
b6348a6dc4 Merge pull request #34 from web-push-libs/feat/33 
feat: update to http-ece 0.6.4 (with draft-06 support)
caf331dab8 feat: Allow VAPID with [gf]cm 
* added primative CLI
* dump as curl

closes #44
812b8c7110 feat: update to use Cryptography library 
* uses lastest ece(1.7.2) and vapid libraries (1.2.1)
* Will attempt to autofill vapid `aud` from the endpoint if VAPID
requested
* Allows for the older `'aesgcm'` and newer, albeit not as widely
supported `'aes128gcm'` encryption content types.
* Includes fixes provided by https://github.com/Flimm

NOTE: Currently BLOCKED due to
https://github.com/martinthomson/encrypted-content-encoding/issues/36

closes: #49, #48, #42
2979478561 Merge pull request #53 from web-push-libs/feat/49 
feat: update to use Cryptography library
d0461a350f Make README.rst acceptable to PyPI's website 
When running a check against README.rst, I got these errors:

    warning: check: Cannot analyze code. No Pygments lexer found for "commandline". (line 87)
    warning: check: Cannot analyze code. No Pygments lexer found for "pythonstub". (line 93)

I had previously ignored them, because they were just warnings.

However, according to this link, usage of non-builtin lexers will cause
the RST to not be recognised by PyPI.

https://github.com/twolfson/restructuredtext-lint/tree/0.14.2#pypi-issues
92a8c02a0c use cryptography==1.8.2 
Fixed a compilation bug affecting OpenSSL 1.1.0f.
Use py-vapid to 1.2.4 which uses cryptography==1.8.2
4728a3931e Merge pull request #59 from web-push-libs/bug/58 
bug: baseline to cryptography 1.8.2
e02be4c16f bug: update to use vapid 'from_string' function 
remove crypto upper version limit
bump py-vapid base version
af2070dd61 chore: version bump 
Update dependencies and use latest vapid library calls
2e95413167 Copy subscription before altering the keys. 
Altering subscriptions reference by changing the keys from string to
byte causes hard to debug issues in libraries. For exemple, trying to
call `json.dumps()` after initializing `WebPusher` throws an error
because json cannot handle bytes.
3c91545737
Merge pull request #84 from Chris-V/clone_subscriptions 
Copy subscription before altering the keys.
715d154e55
Merge pull request #86 from web-push-libs/feat/85 
added 'ttl' as argument for webpush function
bd2d72a024 version bump 
* New `webpush(ttl=0)` parameter
99669f8061
Update README.md 
In example part,   
vapid_claims={
                "sub": "YourNameHere@example.org",
            }
It will lead to an error which lacks "mailto" fields.
aa66fdeea3
Merge pull request #92 from web-push-libs/bug/90 
bug: return the remote server response in the WebpushException
14331e4890
Merge pull request #95 from arlopurcell/bug/94 
Add default 'exp' field to vapid claims dict
c24920b734
Merge pull request #98 from web-push-libs/feat/97 
feat: Move to RFC 8188 "aes128gcm" content encoding default
29ddda4508
chore: Add Code of Conduct 
As of January 1 2019, Mozilla requires that all GitHub projects include this CODE_OF_CONDUCT.md file in the project root. The file has two parts:

    Required Text - All text under the headings Community Participation Guidelines and How to Report, are required, and should not be altered.
    Optional Text - The Project Specific Etiquette heading provides a space to speak more specifically about ways people can work effectively and inclusively together. Some examples of those can be found on the Firefox Debugger project, and Common Voice. (The optional part is commented out in the raw template file, and will not be visible until you modify and uncomment that part.)

If you have any questions about this file, or Code of Conduct policies and procedures, please reach out to Mozilla-GitHub-Standards+CoC@mozilla.com.
051e1575a3
bug: stand-alone still used old encoding format (#109) 
* bug: stand-alone still used old encoding format
4919ec186a Select legacy GCM or actual FCM endpoint for send based on the gcm_key (#110) 
* Select legacy GCM or actual FCM endpoint for send based on the key provided.

* Fixed flake8 issue
1dceb01bc8 Use six.text_type instead of six.string_types (#119) 
In Python 2, using six.string_types causes the code to attempt to re-encode already encoded data because six.string_types matches Python 2 str and unicode data.  Using six.text_type makes sure that the code only attempts to encode unicode data.
12a894ddf1
Webpush headers (#123) 
* Support adding arbitrary HTTP headers when using webpush()

Useful for adding headers like `Topic` an `Urgency` that don't have
dedicated parameters.

* Send headers provided in the `--head` CLI argument
8fccd46be3
r/master/main 
Partially an experiment, and partly because it's shorter to type.
94516459c6
chore: Updates for 2021 (#135) 
* chore: Updates for 2021
* drop nose for pytest

Closes #124
336b1fb1ed
Support requests_session param in webpush fn too (#133) 
* support requests_session param in webpush fn too
* format for line length
* move new requests_session argument to the end of the arg list
bdauvergne changed title from WIP: mise à jour vers 1.14.0 to Mise à jour vers 1.14.0 2023-12-07 09:01:02 +01:00
bdauvergne changed title from Mise à jour vers 1.14.0 to Mise à jour vers 1.14.0 (#85497) 2024-01-10 10:28:06 +01:00
csechet approved these changes 2024-01-24 15:17:00 +01:00
csechet left a comment
Owner
Copy Link

J'ai pas bien compris, l'intention, si c'est de rebaser ou merger. Le merge fonctionne effectivement, mais si je rebase cette branche sur wip/sync-with-upstream j'ai des conflits. Mais vas-y, comme ça je verrai :)

J'ai pas bien compris, l'intention, si c'est de rebaser ou merger. Le merge fonctionne effectivement, mais si je rebase cette branche sur wip/sync-with-upstream j'ai des conflits. Mais vas-y, comme ça je verrai :)
bdauvergne commented 2024-01-24 16:21:51 +01:00
Author
Owner
Copy Link

J'ai pas bien compris, l'intention, si c'est de rebaser ou merger. Le merge fonctionne effectivement, mais si je rebase cette branche sur wip/sync-with-upstream j'ai des conflits. Mais vas-y, comme ça je verrai :)

sync-with-upstream c'est les même commits que master mais reposer au dessus du commit upstream correspondant:

commit 16e228d29e36bd6d979a1e33f93493d70f90d876
Merge: 9875a4b 3fe08ad
Author: JR Conlin <jrconlin@gmail.com>
Date:   Mon Apr 2 08:50:50 2018 -0700

    Merge pull request #92 from web-push-libs/bug/90
    
    bug: return the remote server response in the WebpushException

dans master, devient:

commit aa66fdeea3065dfd88904f9ae0de27d98e6a6767
Merge: 13e747d 5e81898
Author: JR Conlin <jrconlin@gmail.com>
Date:   Mon Apr 2 08:50:50 2018 -0700

    Merge pull request #92 from web-push-libs/bug/90
    
    bug: return the remote server response in the WebpushException

ensuite je rebase wip/sync-with-upstream sur le tag 1.14.0 upstream ça devient wip/rebase-1.14.0,
et wip/merge-1.14.0 c'est le merge de wip/rebase-1.14.0 dans wip/sync-with-upstream. L'idée étant de faire un git reset master wip/sync-with-upstream puis un git merge --ff wip/merge-1.14.0 et que ça ne lève aucune erreur.

> J'ai pas bien compris, l'intention, si c'est de rebaser ou merger. Le merge fonctionne effectivement, mais si je rebase cette branche sur wip/sync-with-upstream j'ai des conflits. Mais vas-y, comme ça je verrai :) sync-with-upstream c'est les même commits que master mais reposer au dessus du commit upstream correspondant: ``` commit 16e228d29e36bd6d979a1e33f93493d70f90d876 Merge: 9875a4b 3fe08ad Author: JR Conlin <jrconlin@gmail.com> Date: Mon Apr 2 08:50:50 2018 -0700 Merge pull request #92 from web-push-libs/bug/90 bug: return the remote server response in the WebpushException ``` dans master, devient: ``` commit aa66fdeea3065dfd88904f9ae0de27d98e6a6767 Merge: 13e747d 5e81898 Author: JR Conlin <jrconlin@gmail.com> Date: Mon Apr 2 08:50:50 2018 -0700 Merge pull request #92 from web-push-libs/bug/90 bug: return the remote server response in the WebpushException ``` ensuite je rebase wip/sync-with-upstream sur le tag 1.14.0 upstream ça devient wip/rebase-1.14.0, et wip/merge-1.14.0 c'est le merge de wip/rebase-1.14.0 dans wip/sync-with-upstream. L'idée étant de faire un `git reset master wip/sync-with-upstream` puis un `git merge --ff wip/merge-1.14.0` et que ça ne lève aucune erreur.
bdauvergne force-pushed wip/merge-1.14.0 from 2d102f15a5 to fa3bff4f50 2024-02-23 10:49:34 +01:00 Compare
This branch is already included in the target branch. There is nothing to merge.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b wip/merge-1.14.0 master
git pull origin wip/merge-1.14.0

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff wip/merge-1.14.0
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
csechet
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: entrouvert/debian-pywebpush#2
No description provided.
Delete Branch "wip/merge-1.14.0"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?