From bde98fdf6c8bb0bb0334c6f80dbc7979dcbb44e9 Mon Sep 17 00:00:00 2001 From: Adam Whittingham Date: Tue, 24 Oct 2023 15:43:09 +0100 Subject: [PATCH] Swap to twine for releases --- Makefile | 5 +++- PyCronofy.egg-info/PKG-INFO | 9 ++++++ PyCronofy.egg-info/SOURCES.txt | 38 +++++++++++++++++++++++++ PyCronofy.egg-info/dependency_links.txt | 1 + PyCronofy.egg-info/requires.txt | 2 ++ PyCronofy.egg-info/top_level.txt | 1 + pyproject.toml | 21 ++++++++++++++ requirements.txt | 1 + setup.cfg | 2 +- setup.py | 36 ----------------------- 10 files changed, 78 insertions(+), 38 deletions(-) create mode 100644 PyCronofy.egg-info/PKG-INFO create mode 100644 PyCronofy.egg-info/SOURCES.txt create mode 100644 PyCronofy.egg-info/dependency_links.txt create mode 100644 PyCronofy.egg-info/requires.txt create mode 100644 PyCronofy.egg-info/top_level.txt create mode 100644 pyproject.toml delete mode 100644 setup.py diff --git a/Makefile b/Makefile index f139bb0..af4c4b3 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ init_ci: .PHONY: init init: + python -m pip install --upgrade pip build pip install --requirement requirements.txt .PHONY: version @@ -45,7 +46,9 @@ pytest: release: test # Check pypi configured test -f ~/.pypirc - python setup.py sdist upload --repository pypi + pythom -m build + twine upload -r testpypi dist/* + # twine upload -r pypi dist/* git tag $(CURRENT_VERSION) git push --tags git push diff --git a/PyCronofy.egg-info/PKG-INFO b/PyCronofy.egg-info/PKG-INFO new file mode 100644 index 0000000..2ae2508 --- /dev/null +++ b/PyCronofy.egg-info/PKG-INFO @@ -0,0 +1,9 @@ +Metadata-Version: 2.1 +Name: PyCronofy +Version: 2.0.0 +Summary: Python library for Cronofy +Author-email: VenueBook , Cronofy +Requires-Python: >=3.7 +License-File: LICENCE.txt +Requires-Dist: requests>=2.20.0 +Requires-Dist: pytz>=2013.7 diff --git a/PyCronofy.egg-info/SOURCES.txt b/PyCronofy.egg-info/SOURCES.txt new file mode 100644 index 0000000..77577a9 --- /dev/null +++ b/PyCronofy.egg-info/SOURCES.txt @@ -0,0 +1,38 @@ +CHANGELOG.md +LICENCE.txt +MANIFEST.in +README.md +pyproject.toml +requirements-ci.txt +requirements.txt +setup.cfg +PyCronofy.egg-info/PKG-INFO +PyCronofy.egg-info/SOURCES.txt +PyCronofy.egg-info/dependency_links.txt +PyCronofy.egg-info/requires.txt +PyCronofy.egg-info/top_level.txt +pycronofy/__init__.py +pycronofy/auth.py +pycronofy/batch.py +pycronofy/client.py +pycronofy/datetime_utils.py +pycronofy/exceptions.py +pycronofy/pagination.py +pycronofy/request_handler.py +pycronofy/settings.py +pycronofy/validation.py +pycronofy/tests/__init__.py +pycronofy/tests/common_data.py +pycronofy/tests/test_application_calendar.py +pycronofy/tests/test_auth.py +pycronofy/tests/test_availability.py +pycronofy/tests/test_batch.py +pycronofy/tests/test_client.py +pycronofy/tests/test_conferencing_services.py +pycronofy/tests/test_custom_datacenter.py +pycronofy/tests/test_datetime_utils.py +pycronofy/tests/test_pagination.py +pycronofy/tests/test_real_time_scheduling.py +pycronofy/tests/test_real_time_sequencing.py +pycronofy/tests/test_request_handler.py +pycronofy/tests/test_validation.py \ No newline at end of file diff --git a/PyCronofy.egg-info/dependency_links.txt b/PyCronofy.egg-info/dependency_links.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/PyCronofy.egg-info/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/PyCronofy.egg-info/requires.txt b/PyCronofy.egg-info/requires.txt new file mode 100644 index 0000000..074abd7 --- /dev/null +++ b/PyCronofy.egg-info/requires.txt @@ -0,0 +1,2 @@ +requests>=2.20.0 +pytz>=2013.7 diff --git a/PyCronofy.egg-info/top_level.txt b/PyCronofy.egg-info/top_level.txt new file mode 100644 index 0000000..e8f66da --- /dev/null +++ b/PyCronofy.egg-info/top_level.txt @@ -0,0 +1 @@ +pycronofy diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..f643bb2 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,21 @@ +[project] +name = "PyCronofy" +version = "2.0.0" +requires-python = ">=3.7" +dependencies = [ + "requests>=2.20.0", + "pytz>=2013.7", +] +description = 'Python library for Cronofy' +authors = [ + {name = "VenueBook", email = "dev@venuebook.com"}, + {name = "Cronofy", email = "support@cronofy.com"}, +] + +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[options.packages.find] +exclude = + =pycronofy.test* diff --git a/requirements.txt b/requirements.txt index d429c38..6dc71dc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,5 @@ pytz>=2018.9 pytest>=6.2.4 pytest-cov>=2.12.1 responses>=0.5.0 +twine>=4.0.2 flake8 diff --git a/setup.cfg b/setup.cfg index 0499089..ad388d2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,4 +2,4 @@ universal = 1 [metadata] -description-file = README.md \ No newline at end of file +description_file = README.md diff --git a/setup.py b/setup.py deleted file mode 100644 index 218c4e2..0000000 --- a/setup.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python -from distutils.core import setup -import os -import re -import codecs - -here = os.path.abspath(os.path.dirname(__file__)) - - -def read(*parts): - with codecs.open(os.path.join(here, *parts), 'r') as fp: - return fp.read() - - -def find_version(*file_paths): - version_file = read(*file_paths) - version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", - version_file, re.M) - if version_match: - return version_match.group(1) - raise RuntimeError("Unable to find version string.") - - -setup( - name='PyCronofy', - version=find_version("pycronofy", "__init__.py"), - description='Python library for Cronofy', - author='VenueBook', - author_email='dev@venuebook.com', - url='https://github.com/cronofy/pycronofy', - packages=['pycronofy'], - install_requires=[ - "requests>=2.20.0", - "pytz>=2013.7", - ], -)