From b204470c52cfb479b7792816a900ddcb02df8e17 Mon Sep 17 00:00:00 2001 From: Dmitriy Kunitskiy Date: Thu, 24 Jun 2021 13:21:17 -0700 Subject: [PATCH] refactor: undo the great unpinning (#1267) * undo the great unpinning Signed-off-by: Dmitriy Kunitskiy * remove all extra requires Signed-off-by: Dmitriy Kunitskiy * dev back to all Signed-off-by: Dmitriy Kunitskiy Signed-off-by: Amom --- common/requirements-common.txt | 1 - common/setup.py | 34 +++++++++++++++++++++++----------- frontend/setup.py | 2 +- metadata/setup.py | 2 +- requirements-common.txt | 27 ++++++++++++++------------- search/setup.py | 2 +- 6 files changed, 40 insertions(+), 28 deletions(-) delete mode 120000 common/requirements-common.txt diff --git a/common/requirements-common.txt b/common/requirements-common.txt deleted file mode 120000 index 920184283b..0000000000 --- a/common/requirements-common.txt +++ /dev/null @@ -1 +0,0 @@ -../requirements-common.txt \ No newline at end of file diff --git a/common/setup.py b/common/setup.py index acb174f3bd..9f2e070db2 100644 --- a/common/setup.py +++ b/common/setup.py @@ -4,20 +4,13 @@ from setuptools import find_packages, setup -__version__ = '0.16.0' +__version__ = '0.17.0' -requirements_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'requirements-common.txt') -with open(requirements_path) as requirements_file: - requirements_common = requirements_file.readlines() requirements_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'requirements-dev.txt') with open(requirements_path) as requirements_file: requirements_dev = requirements_file.readlines() -# avoid circular references -requirements_common = [r for r in requirements_common if not r.startswith('amundsen-common')] - -all_deps = requirements_common + requirements_dev setup( name='amundsen-common', @@ -29,10 +22,29 @@ maintainer='Amundsen TSC', maintainer_email='amundsen-tsc@lists.lfai.foundation', packages=find_packages(exclude=['tests*']), - install_requires=requirements_common, + install_requires=[ + # Packages in here should rarely be pinned. This is because these + # packages (at the specified version) are required for project + # consuming this library. By pinning to a specific version you are the + # number of projects that can consume this or forcing them to + # upgrade/downgrade any dependencies pinned here in their project. + # + # Generally packages listed here are pinned to a major version range. + # + # e.g. + # Python FooBar package for foobaring + # pyfoobar>=1.0, <2.0 + # + # This will allow for any consuming projects to use this library as + # long as they have a version of pyfoobar equal to or greater than 1.x + # and less than 2.x installed. + 'Flask>=1.0.2', + 'attrs>=19.0.0', + 'marshmallow>=3.0', + 'marshmallow3-annotations>=1.0.0' + ], extras_require={ - 'all': all_deps, - 'dev': requirements_dev + 'all': requirements_dev }, python_requires=">=3.6", package_data={'amundsen_common': ['py.typed']}, diff --git a/frontend/setup.py b/frontend/setup.py index 7c20f9acc1..a24124db8c 100644 --- a/frontend/setup.py +++ b/frontend/setup.py @@ -45,7 +45,7 @@ def build_js() -> None: with open(requirements_path) as requirements_file: requirements_dev = requirements_file.readlines() -__version__ = '3.9.0' +__version__ = '3.10.0' oidc = ['flaskoidc==1.0.0'] pyarrrow = ['pyarrow==3.0.0'] diff --git a/metadata/setup.py b/metadata/setup.py index d3e31269d0..2e872f69a9 100644 --- a/metadata/setup.py +++ b/metadata/setup.py @@ -5,7 +5,7 @@ from setuptools import find_packages, setup -__version__ = '3.6.0' +__version__ = '3.7.0' requirements_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'requirements.txt') with open(requirements_path) as requirements_file: diff --git a/requirements-common.txt b/requirements-common.txt index 5f0c6b6a3b..0670c7885d 100644 --- a/requirements-common.txt +++ b/requirements-common.txt @@ -3,23 +3,24 @@ # Common dependencies (common, frontend, metadata, search) ------------------------------------------------------------- +# It is recommended to always pin the exact version (not range) - otherwise common upgrade won't trigger unit tests +# on all repositories reyling on this file and any issues that arise from common upgrade might be missed. amundsen-common>=0.15.3 attrs>=19.1.0 -boto3>=1.17.23 -click>=7.0 -flasgger>=0.9.5 -Flask>=1.0.2 -Flask-RESTful>=0.3.6 -flask-cors>=3.0.8 +boto3==1.17.23 +click==7.0 +flasgger==0.9.5 +Flask==1.0.2 +Flask-RESTful==0.3.6 +flask-cors==3.0.8 Jinja2>=2.10.1 jsonschema>=3.0.1,<4.0 marshmallow>=3.0,<=3.6 marshmallow3-annotations>=1.0.0 -pytz>=2021.1 -requests>=2.25.1 -requests-aws4auth>=1.1.0 -six>=1.13.0 -statsd>=3.2.1 -typing>=3.6.4 +pytz==2021.1 +requests==2.25.1 +requests-aws4auth==1.1.0 +statsd==3.2.1 +typing==3.6.4 werkzeug>=2.0.0 -wheel>=0.36.2 +wheel==0.36.2 diff --git a/search/setup.py b/search/setup.py index 2b2bbae596..1d359eb8b1 100644 --- a/search/setup.py +++ b/search/setup.py @@ -5,7 +5,7 @@ from setuptools import find_packages, setup -__version__ = '2.9.0' +__version__ = '2.10.0' oidc = ['flaskoidc==1.0.0']