Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
abdullahselek authored Mar 31, 2024
2 parents 9a75331 + 18c1512 commit 5ac00a6
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
operating-system: [ubuntu-20.04, windows-latest, macos-latest]

steps:
Expand Down
9 changes: 4 additions & 5 deletions requirements.testing.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
pytest>=5.4.3,<6.2.5
pytest-cov>=2.10.0,<3.0.0
pytest-runner>=5.2,<5.3.1
pytest==8.1.1
pytest-cov==5.0.0
pytest-runner==6.0.1
codecov==2.1.13
responses==0.25.0
six>=1.15.0,<1.16.0
tox>=3.15.2,<3.24.4
tox==4.14.2
tox-pyenv==1.1.0
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
requests>=2.25.1,<3
Requests>=2.25.1,<3
80 changes: 42 additions & 38 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,62 +1,66 @@
#!/usr/bin/env python

import codecs
import os
import re
import codecs

from setuptools import setup, find_packages

from setuptools import find_packages, setup

cwd = os.path.abspath(os.path.dirname(__file__))


def read(filename):
with codecs.open(os.path.join(cwd, filename), 'rb', 'utf-8') as h:
with codecs.open(os.path.join(cwd, filename), "rb", "utf-8") as h:
return h.read()

metadata = read(os.path.join(cwd, 'herepy', '__init__.py'))

metadata = read(os.path.join(cwd, "herepy", "__init__.py"))


def extract_metaitem(meta):
meta_match = re.search(r"""^__{meta}__\s+=\s+['\"]([^'\"]*)['\"]""".format(meta=meta),
metadata, re.MULTILINE)
meta_match = re.search(
r"""^__{meta}__\s+=\s+['\"]([^'\"]*)['\"]""".format(meta=meta),
metadata,
re.MULTILINE,
)
if meta_match:
return meta_match.group(1)
raise RuntimeError('Unable to find __{meta}__ string.'.format(meta=meta))
raise RuntimeError("Unable to find __{meta}__ string.".format(meta=meta))


with open('requirements.txt') as f:
with open("requirements.txt") as f:
requirements = f.read().splitlines()

setup(
name='herepy',
version=extract_metaitem('version'),
license=extract_metaitem('license'),
description=extract_metaitem('description'),
long_description=(read('README.rst')),
long_description_content_type='text/x-rst',
author=extract_metaitem('author'),
author_email=extract_metaitem('email'),
maintainer=extract_metaitem('author'),
maintainer_email=extract_metaitem('email'),
url=extract_metaitem('url'),
download_url=extract_metaitem('download_url'),
packages=find_packages(exclude=('tests', 'docs')),
name="herepy",
version=extract_metaitem("version"),
license=extract_metaitem("license"),
description=extract_metaitem("description"),
long_description=(read("README.rst")),
long_description_content_type="text/x-rst",
author=extract_metaitem("author"),
author_email=extract_metaitem("email"),
maintainer=extract_metaitem("author"),
maintainer_email=extract_metaitem("email"),
url=extract_metaitem("url"),
download_url=extract_metaitem("download_url"),
packages=find_packages(exclude=("tests", "docs")),
package_data={"herepy": ["py.typed"]},
platforms=['Any'],
python_requires=">=3.5",
platforms=["Any"],
python_requires=">=3.8",
install_requires=requirements,
keywords='here api, here technologies, here python api clients, rest api clients',
keywords="here api, here technologies, here python api clients, rest api clients",
classifiers=[
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Topic :: Software Development :: Libraries :: Python Modules',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Topic :: Software Development :: Libraries :: Python Modules",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
],
)

0 comments on commit 5ac00a6

Please sign in to comment.