Skip to content

Commit

Permalink
Ensure the import from setuptools succeeds
Browse files Browse the repository at this point in the history
Bump version
Bump testing versions of setuptools
Add Python 3.13 proper
Make sure to run `twine check --strict` during tests

fixes #26
  • Loading branch information
arcivanov committed Jan 26, 2025
1 parent 2985d89 commit 940651c
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 15 deletions.
12 changes: 6 additions & 6 deletions .github/exclusions.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@
"pip-version": "22.3"
},
{
"python-version": "3.13-dev",
"python-version": "3.13",
"setuptools-version": "65.7"
},
{
"python-version": "3.13-dev",
"python-version": "3.13",
"setuptools-version": "65.7"
},
{
"python-version": "3.13-dev",
"python-version": "3.13",
"setuptools-version": "64.0"
},
{
"python-version": "3.13-dev",
"python-version": "3.13",
"setuptools-version": "63.4"
},
{
"python-version": "3.13-dev",
"python-version": "3.13",
"setuptools-version": "62.6"
},
{
"python-version": "3.13-dev",
"python-version": "3.13",
"pip-version": "22.3"
}
]
11 changes: 6 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@ jobs:
pip-version:
- '24.2'
setuptools-version:
- '75.1'
- '75.8'
- '75.7'
- '74.1'
- '73.0'
- '72.1'
- '71.1'
- '70.3'
- '69.5'
wheel-version:
- '0.44'
- '0.45.1'
- '0.42.0'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -70,7 +71,7 @@ jobs:
python-version: '3.12'
deploy: ${{ github.event_name == 'push' }}
deploy-pip: '24.2'
deploy-setuptools: '75.1'
deploy-setuptools: '75.8'
exclude: ${{ needs.read-exclusions.outputs.BUILD_EXCLUSIONS }}
secrets: inherit
needs: [ read-exclusions ]
Expand Down Expand Up @@ -150,15 +151,15 @@ jobs:
uses: ./.github/workflows/template.yml
with:
os: ubuntu-latest
python-version: '3.13-dev'
python-version: '3.13'
exclude: ${{ needs.read-exclusions.outputs.BUILD_EXCLUSIONS }}
secrets: inherit
needs: [ read-exclusions ]
build-macos-py313:
uses: ./.github/workflows/template.yml
with:
os: macos-13
python-version: '3.13-dev'
python-version: '3.13'
exclude: ${{ needs.read-exclusions.outputs.BUILD_EXCLUSIONS }}
secrets: inherit
needs: [ build-ubuntu-py313, read-exclusions ]
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ jobs:
- '23.3'
- '22.3'
setuptools-version:
- '75.1'
- '75.8'
- '75.7'
- '74.1'
- '73.0'
- '72.2'
Expand Down
3 changes: 2 additions & 1 deletion build.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
use_plugin("filter_resources")

name = "wheel_axle"
version = "0.0.9"
version = "0.0.10.dev"

summary = "Axle is Python wheel enhancement library"
authors = [Author("Karellen, Inc.", "[email protected]")]
Expand Down Expand Up @@ -69,6 +69,7 @@ def set_properties(project):
if "WHEEL_VER" not in environ:
project.depends_on("wheel", ">=0.37.0")
project.depends_on("wheel-axle-runtime", "<1.0,>0.0.5")
project.build_depends_on("twine")

project.set_property("coverage_break_build", False)
project.set_property("cram_fail_if_no_tests", False)
Expand Down
2 changes: 2 additions & 0 deletions src/integrationtest/python/build_axle_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ def build_axle(self, dir_name, *extra_args):
sys.argv.clear()
sys.argv.extend(old_sys_argv)

check_call(["twine", "check", "--strict", f"{self.dist_dir}/*.whl"])

def install(self, wheel_file, user=False, deps=[]):
check_call([sys.executable, "-m", "pip", "install", "--pre"] +
(["--user", "--force-reinstall"] if user else []) +
Expand Down
4 changes: 2 additions & 2 deletions src/main/python/wheel_axle/bdist_axle/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@

try:
# SetupTools >= 70.1
from setuptools.command.bdist_wheel import bdist_wheel as _bdist_wheel, python
except ImportError:
from setuptools.command.bdist_wheel import bdist_wheel as _bdist_wheel, python_tag
except ImportError as e:
try:
# Wheel >= 0.44.0
from wheel._bdist_wheel import bdist_wheel as _bdist_wheel, python_tag
Expand Down

0 comments on commit 940651c

Please sign in to comment.