Skip to content

Commit

Permalink
Remove project metadata from setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
jlubken committed Mar 30, 2022
1 parent 58f75fe commit ffd8a3e
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 27 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ repos:
- id: python-no-log-warn
- id: python-use-type-annotations
- repo: https://github.com/psf/black
rev: 21.12b0
rev: 22.3.0
hooks:
- id: black
additional_dependencies: ['click==8.0.4']
language_version: python3.10
types: [python]
- repo: https://github.com/pycqa/pylint
rev: v2.12.2
rev: v2.13.2
hooks:
- id: pylint
language: system
Expand All @@ -49,7 +49,7 @@ repos:
- repo: local
hooks:
- id: pytest
entry: python setup.py test
entry: pytest
language: system
pass_filenames: false
name: pytest
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ services:
postgres:
build:
context: ./postgres
dockerfile: dockerfile
target: postgres
environment:
- POSTGRES_USER=postgres
Expand All @@ -29,6 +30,7 @@ services:
test:
build:
context: .
dockerfile: dockerfile
target: test
environment:
- CONFIG=./local/test.yaml
Expand Down
1 change: 1 addition & 0 deletions dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ENV FREETDS /etc/freetds
ENV PATH /root/.local/bin:$PATH
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
COPY freetds.conf /etc/freetds/
COPY license.txt .
COPY readme.md .
COPY setup.cfg .
COPY setup.py .
Expand Down
10 changes: 8 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[build-system]
requires = [
"pip>=22.0.4",
"pytest-runner>=6.0.0",
"setuptools>=61.2.0",
"setuptools_scm[toml]>=6.4.2",
"wheel>=0.37.1",
Expand All @@ -27,12 +28,17 @@ classifiers = [
"Topic :: Utilities",
]
description = "An opinionated library to help deploy data science projects"
dynamic = ["dependencies", "version"]
license = { file = "./license.txt" }
dynamic = ["dependencies", "optional-dependencies", "version"]
license = { file = "license.txt" }
name = "dsdk"
requires-python = ">=3.7.4"
readme = "readme.md"

[project.urls]
Homepage = "https://github.com/pennsignals/dsdk"
Source = "https://github.com/pennsignals/dsdk"
Tracker = "https://github.com/pennsignals/dsdk/issues"

[tool.black]
line-length = 79
target-version = ["py37","py38","py39","py310"]
Expand Down
11 changes: 0 additions & 11 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ universal = 1
tests_require = pytest
zip_safe = false

[aliases]
test = pytest

[flake8]
max-complexity = 10
max-line-length = 79
Expand All @@ -23,14 +20,6 @@ coverage_flags =
cover: true
nocover: false

[metadata]
long_description = file: readme.md
long_descritpion_content_type = text/markdown
name = dsdk
project_urls =
Issue Tracker = https://github.com/pennsignals/dsdk/issues
url = https://github.com/pennsignals/dsdk

[mypy]
follow_imports = normal
ignore_missing_imports = True
16 changes: 5 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,31 +1,27 @@
# -*- coding: utf-8 -*-
"""DSDK."""
"""Data Science Development/Deployment Toolkit."""

from setuptools import find_packages, setup

INSTALL_REQUIRES = (
(
"cfgenvy@"
"git+https://github.com/pennsignals/cfgenvy.git"
"@1.3.3#egg=cfgenvy"
"@1.3.4#egg=cfgenvy"
),
"numpy>=1.15.4",
"pandas>=0.23.4",
"pip>=21.3.1",
"pip>=22.0.4",
"requests>=2.26.0",
"setuptools>=60.3.1",
"setuptools>=61.2.0",
"setuptools_scm[toml]>=6.4.2",
"wheel>=0.37.1",
)

PYMSSQL_REQUIRES = ("cython>=0.29.21", "pymssql>=2.2.3")

PSYCOPG2_REQUIRES = ("psycopg2-binary>=2.8.6",)

SETUP_REQUIRES = (
"pytest-runner>=5.2",
"setuptools_scm[toml]>=4.1.2",
)

TEST_REQUIRES = (
"astroid",
"black",
Expand Down Expand Up @@ -66,7 +62,5 @@
packages=find_packages("src"),
package_dir={"": "src"},
python_requires=">=3.7",
setup_requires=SETUP_REQUIRES,
tests_require=TEST_REQUIRES,
use_scm_version={"local_scheme": "dirty-tag"},
)

0 comments on commit ffd8a3e

Please sign in to comment.