Skip to content

Commit

Permalink
refactor: undo the great unpinning (amundsen-io#1267)
Browse files Browse the repository at this point in the history
* undo the great unpinning

Signed-off-by: Dmitriy Kunitskiy <[email protected]>

* remove all extra requires

Signed-off-by: Dmitriy Kunitskiy <[email protected]>

* dev back to all

Signed-off-by: Dmitriy Kunitskiy <[email protected]>
Signed-off-by: Amom <[email protected]>
  • Loading branch information
Dmitriy Kunitskiy authored and amommendes committed Jul 22, 2021
1 parent eec3119 commit b204470
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 28 deletions.
1 change: 0 additions & 1 deletion common/requirements-common.txt

This file was deleted.

34 changes: 23 additions & 11 deletions common/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -29,10 +22,29 @@
maintainer='Amundsen TSC',
maintainer_email='[email protected]',
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']},
Expand Down
2 changes: 1 addition & 1 deletion frontend/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion metadata/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
27 changes: 14 additions & 13 deletions requirements-common.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion search/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from setuptools import find_packages, setup

__version__ = '2.9.0'
__version__ = '2.10.0'

oidc = ['flaskoidc==1.0.0']

Expand Down

0 comments on commit b204470

Please sign in to comment.