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

fix: replace pipes for python 3.13 #92

Merged
merged 2 commits into from
Oct 21, 2024
Merged

fix: replace pipes for python 3.13 #92

merged 2 commits into from
Oct 21, 2024
+35 −42

Conversation

branchvincent
Copy link
Contributor

Fixes #90

This fixes compatibility with python 3.13, which removed the pipes module

Also, I took the opportunity to migrate to pyproject.toml, which supersedes setup.py and MANIFEST.in. Here's how I verified this change:

$ git checkout HEAD^ && uv build -o /tmp/before && rm *.egg-info
$ git switch - && uv build -o /tmp/after 
$ uvx diffoscope /tmp/before/*.tar.gz /tmp/after/*.tar.gz
Diff (I recommend also running diffoscope locally so you can see the colorized diff) 

--- /tmp/before/apkleaks-2.6.2.tar.gz
+++ /tmp/after/apkleaks-2.6.2.tar.gz
├── filetype from file(1)
│ @@ -1 +1 @@
│ -gzip compressed data, was "apkleaks-2.6.2.tar", last modified: Sun Oct 20 23:55:50 2024, max compression
│ +gzip compressed data, was "apkleaks-2.6.2.tar", last modified: Sun Oct 20 23:56:24 2024, max compression
├── apkleaks-2.6.2.tar
│ ├── file list
│ │ @@ -1,25 +1,24 @@
│ │ -drwxr-xr-x   0 branch     (501) staff       (20)        0 2024-10-20 23:55:50.814253 apkleaks-2.6.2/
│ │ +drwxr-xr-x   0 branch     (501) staff       (20)        0 2024-10-20 23:56:24.908507 apkleaks-2.6.2/
│ │  -rw-r--r--   0 branch     (501) staff       (20)    11345 2024-10-20 21:48:18.000000 apkleaks-2.6.2/LICENSE
│ │ --rw-r--r--   0 branch     (501) staff       (20)      108 2024-10-20 23:55:50.000000 apkleaks-2.6.2/MANIFEST.in
│ │ --rw-r--r--   0 branch     (501) staff       (20)     5629 2024-10-20 23:55:50.813893 apkleaks-2.6.2/PKG-INFO
│ │ +-rw-r--r--   0 branch     (501) staff       (20)     5658 2024-10-20 23:56:24.908191 apkleaks-2.6.2/PKG-INFO
│ │  -rw-r--r--   0 branch     (501) staff       (20)     5151 2024-10-20 21:48:18.000000 apkleaks-2.6.2/README.md
│ │  -rw-r--r--   0 branch     (501) staff       (20)        6 2024-10-20 21:48:18.000000 apkleaks-2.6.2/VERSION
│ │ -drwxr-xr-x   0 branch     (501) staff       (20)        0 2024-10-20 23:55:50.811434 apkleaks-2.6.2/apkleaks/
│ │ +drwxr-xr-x   0 branch     (501) staff       (20)        0 2024-10-20 23:56:24.905909 apkleaks-2.6.2/apkleaks/
│ │  -rw-r--r--   0 branch     (501) staff       (20)        0 2024-10-20 21:48:18.000000 apkleaks-2.6.2/apkleaks/__init__.py
│ │  -rw-r--r--   0 branch     (501) staff       (20)     5288 2024-10-20 23:10:10.000000 apkleaks-2.6.2/apkleaks/apkleaks.py
│ │  -rwxr-xr-x   0 branch     (501) staff       (20)     1692 2024-10-20 21:48:18.000000 apkleaks-2.6.2/apkleaks/cli.py
│ │  -rw-r--r--   0 branch     (501) staff       (20)      201 2024-10-20 21:48:18.000000 apkleaks-2.6.2/apkleaks/colors.py
│ │  -rw-r--r--   0 branch     (501) staff       (20)      704 2024-10-20 21:48:18.000000 apkleaks-2.6.2/apkleaks/utils.py
│ │ -drwxr-xr-x   0 branch     (501) staff       (20)        0 2024-10-20 23:55:50.813596 apkleaks-2.6.2/apkleaks.egg-info/
│ │ --rw-r--r--   0 branch     (501) staff       (20)     5629 2024-10-20 23:55:50.000000 apkleaks-2.6.2/apkleaks.egg-info/PKG-INFO
│ │ --rw-r--r--   0 branch     (501) staff       (20)      396 2024-10-20 23:55:50.000000 apkleaks-2.6.2/apkleaks.egg-info/SOURCES.txt
│ │ --rw-r--r--   0 branch     (501) staff       (20)        1 2024-10-20 23:55:50.000000 apkleaks-2.6.2/apkleaks.egg-info/dependency_links.txt
│ │ --rw-r--r--   0 branch     (501) staff       (20)       47 2024-10-20 23:55:50.000000 apkleaks-2.6.2/apkleaks.egg-info/entry_points.txt
│ │ --rw-r--r--   0 branch     (501) staff       (20)       21 2024-10-20 23:55:50.000000 apkleaks-2.6.2/apkleaks.egg-info/requires.txt
│ │ --rw-r--r--   0 branch     (501) staff       (20)       16 2024-10-20 23:55:50.000000 apkleaks-2.6.2/apkleaks.egg-info/top_level.txt
│ │ -drwxr-xr-x   0 branch     (501) staff       (20)        0 2024-10-20 23:55:50.813147 apkleaks-2.6.2/config/
│ │ +drwxr-xr-x   0 branch     (501) staff       (20)        0 2024-10-20 23:56:24.907874 apkleaks-2.6.2/apkleaks.egg-info/
│ │ +-rw-r--r--   0 branch     (501) staff       (20)     5658 2024-10-20 23:56:24.000000 apkleaks-2.6.2/apkleaks.egg-info/PKG-INFO
│ │ +-rw-r--r--   0 branch     (501) staff       (20)      390 2024-10-20 23:56:24.000000 apkleaks-2.6.2/apkleaks.egg-info/SOURCES.txt
│ │ +-rw-r--r--   0 branch     (501) staff       (20)        1 2024-10-20 23:56:24.000000 apkleaks-2.6.2/apkleaks.egg-info/dependency_links.txt
│ │ +-rw-r--r--   0 branch     (501) staff       (20)       47 2024-10-20 23:56:24.000000 apkleaks-2.6.2/apkleaks.egg-info/entry_points.txt
│ │ +-rw-r--r--   0 branch     (501) staff       (20)       21 2024-10-20 23:56:24.000000 apkleaks-2.6.2/apkleaks.egg-info/requires.txt
│ │ +-rw-r--r--   0 branch     (501) staff       (20)       16 2024-10-20 23:56:24.000000 apkleaks-2.6.2/apkleaks.egg-info/top_level.txt
│ │ +drwxr-xr-x   0 branch     (501) staff       (20)        0 2024-10-20 23:56:24.907438 apkleaks-2.6.2/config/
│ │  -rw-r--r--   0 branch     (501) staff       (20)      829 2024-10-20 21:48:18.000000 apkleaks-2.6.2/config/notkeyhacks.json
│ │  -rw-r--r--   0 branch     (501) staff       (20)     4619 2024-10-20 21:48:18.000000 apkleaks-2.6.2/config/regexes.json
│ │ +-rw-r--r--   0 branch     (501) staff       (20)      847 2024-10-20 23:56:24.000000 apkleaks-2.6.2/pyproject.toml
│ │  -rw-r--r--   0 branch     (501) staff       (20)       21 2024-10-20 21:48:18.000000 apkleaks-2.6.2/requirements.txt
│ │ --rw-r--r--   0 branch     (501) staff       (20)       38 2024-10-20 23:55:50.814319 apkleaks-2.6.2/setup.cfg
│ │ --rw-r--r--   0 branch     (501) staff       (20)     1193 2024-10-20 23:55:50.000000 apkleaks-2.6.2/setup.py
│ │ +-rw-r--r--   0 branch     (501) staff       (20)       38 2024-10-20 23:56:24.908577 apkleaks-2.6.2/setup.cfg
│ ├── apkleaks-2.6.2/PKG-INFO
│ │ @@ -1,19 +1,19 @@
│ │  Metadata-Version: 2.1
│ │  Name: apkleaks
│ │  Version: 2.6.2
│ │  Summary: Scanning APK file for URIs, endpoints & secrets.
│ │ -Home-page: https://github.com/dwisiswant0/apkleaks/
│ │ -Author: dwisiswant0
│ │ -Author-email: [email protected]
│ │ +Author-email: dwisiswant0 <[email protected]>
│ │  License: Apache License 2.0
│ │ +Project-URL: Homepage, https://github.com/dwisiswant0/apkleaks/
│ │  Classifier: Development Status :: 3 - Alpha
│ │  Classifier: Natural Language :: English
│ │  Classifier: Topic :: Security
│ │  Classifier: Topic :: Utilities
│ │ +Requires-Python: >=3.8
│ │  Description-Content-Type: text/markdown
│ │  License-File: LICENSE
│ │  Requires-Dist: pyaxmlparser>=0.3.24
│ │  
│ │  # APKLeaks
│ │  [![version](https://badge.fury.io/gh/dwisiswant0%2fapkleaks.svg)](https://badge.fury.io/gh/dwisiswant0%2fapkleaks.svg)
│ │  [![contributions](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/dwisiswant0/apkleaks/issues)
│ ├── apkleaks-2.6.2/apkleaks.egg-info/PKG-INFO
│ │ @@ -1,19 +1,19 @@
│ │  Metadata-Version: 2.1
│ │  Name: apkleaks
│ │  Version: 2.6.2
│ │  Summary: Scanning APK file for URIs, endpoints & secrets.
│ │ -Home-page: https://github.com/dwisiswant0/apkleaks/
│ │ -Author: dwisiswant0
│ │ -Author-email: [email protected]
│ │ +Author-email: dwisiswant0 <[email protected]>
│ │  License: Apache License 2.0
│ │ +Project-URL: Homepage, https://github.com/dwisiswant0/apkleaks/
│ │  Classifier: Development Status :: 3 - Alpha
│ │  Classifier: Natural Language :: English
│ │  Classifier: Topic :: Security
│ │  Classifier: Topic :: Utilities
│ │ +Requires-Python: >=3.8
│ │  Description-Content-Type: text/markdown
│ │  License-File: LICENSE
│ │  Requires-Dist: pyaxmlparser>=0.3.24
│ │  
│ │  # APKLeaks
│ │  [![version](https://badge.fury.io/gh/dwisiswant0%2fapkleaks.svg)](https://badge.fury.io/gh/dwisiswant0%2fapkleaks.svg)
│ │  [![contributions](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/dwisiswant0/apkleaks/issues)
│ ├── apkleaks-2.6.2/apkleaks.egg-info/SOURCES.txt
│ │ @@ -1,13 +1,12 @@
│ │  LICENSE
│ │ -MANIFEST.in
│ │  README.md
│ │  VERSION
│ │ +pyproject.toml
│ │  requirements.txt
│ │ -setup.py
│ │  apkleaks/__init__.py
│ │  apkleaks/apkleaks.py
│ │  apkleaks/cli.py
│ │  apkleaks/colors.py
│ │  apkleaks/utils.py
│ │  apkleaks.egg-info/PKG-INFO
│ │  apkleaks.egg-info/SOURCES.txt

dwisiswant0
dwisiswant0 approved these changes Oct 21, 2024
View reviewed changes
Copy link
Owner

@dwisiswant0 dwisiswant0 left a comment

Choose a reason for hiding this comment

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

Thanks, @branchvincent! This is fye, merging it now.

@dwisiswant0 dwisiswant0 merged commit 1abc5d6 into dwisiswant0:master Oct 21, 2024
2 checks passed
@branchvincent branchvincent deleted the py313 branch October 21, 2024 02:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dwisiswant0 dwisiswant0

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

No module named 'pipes' under py3.13
2 participants
@branchvincent @dwisiswant0