Skip to content

Commit

Permalink
Merge pull request #487 from acsone/fix-pypi-upload-sbi
Browse files Browse the repository at this point in the history
Fix oca-pypi-upload
  • Loading branch information
sbidoul committed Dec 19, 2020
2 parents b9c963d + 2a6d500 commit f2d1be9
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions tools/pypi_upload.py
Expand Up @@ -2,20 +2,12 @@
# License AGPLv3 (https://www.gnu.org/licenses/agpl-3.0-standalone.html)
from __future__ import print_function
import contextlib
try:
import dbm.dumb as dumbdbm
except ImportError:
# python 2
import dumbdbm
import dbm.dumb as dumbdbm
import logging
import os
import subprocess
try:
from configparser import RawConfigParser
except ImportError:
from ConfigParser import RawConfigParser
from configparser import RawConfigParser

from wheel.install import WheelFile
from pkg_resources import parse_version

import click
Expand Down Expand Up @@ -45,9 +37,7 @@ def _split_filename(filename):
"""
basename = os.path.basename(filename)
if basename.endswith('.whl'):
wheelfile = WheelFile(basename)
package_name = wheelfile.parsed_filename.group('name')
package_ver = wheelfile.parsed_filename.group('ver')
package_name, package_ver, _ = basename.split("-", 2)
elif basename.endswith('.tar.gz'):
package_ver = basename.split('-')[-1][:-7]
package_name = basename[:-(len(package_ver) + 8)]
Expand Down

0 comments on commit f2d1be9

Please sign in to comment.