Use setuptools_scm

posit-dev · Jun 17, 2020 · 71114ef · 71114ef
1 parent da18bae
commit 71114ef
Show file tree

Hide file tree

Showing 10 changed files with 130 additions and 116 deletions.
diff --git a/.coveragerc b/.coveragerc
diff --git a/.gitignore b/.gitignore
@@ -1,17 +1,18 @@
 *.pyc
-/build/
-/dist/
+.DS_Store
+.coverage
+.vagrant
+/*.egg
+/*.egg-info
+/*.eggs
 /.conda/
+/.idea/
 /.jupyter/
 /.local/
-/.idea/
+/build/
+/dist/
 /node_modules/
 /notebooks*/
-/*.egg-info
-/*.egg
-/*.eggs
-.DS_Store
-.vagrant
-rsconnect/tests/testdata/**/rsconnect-python/
-.coverage
+/rsconnect/version.py
 htmlcov
+rsconnect/tests/testdata/**/rsconnect-python/
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION := $(shell cat rsconnect/version.txt).$(shell printenv BUILD_NUMBER || echo 9999)
+VERSION := $(shell python setup.py --version)
 HOSTNAME := $(shell hostname)
 
 RUNNER = docker run \

diff --git a/Pipfile b/Pipfile
@@ -5,12 +5,15 @@ verify_ssl = true
 
 [dev-packages]
 black = "*"
+coverage = "*"
 flake8 = "*"
 funcsigs = "*"
+importlib-metadata = "*"
 ipython = "*"
 pytest = "*"
 pytest-cov = "*"
-importlib-metadata = "*"
+setuptools_scm = "*"
+toml = "*"
 
 [packages]
 click = ">=7.0.0"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,12 @@
+[build-system]
+requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4"]
+
 [tool.black]
 line-length = 120
 target-version = ['py27', 'py35', 'py36', 'py37', 'py38']
+
+[tool.coverage.run]
+omit = ["rsconnect/tests/*"]
+
+[tool.setuptools_scm]
+write_to = "rsconnect/version.py"
diff --git a/rsconnect/__init__.py b/rsconnect/__init__.py
@@ -1,3 +1 @@
-from os.path import join, dirname
-
-VERSION = open(join(dirname(__file__), "version.txt"), "r").read().strip()
+from rsconnect.version import version as VERSION  # noqa
diff --git a/rsconnect/version.txt b/rsconnect/version.txt
diff --git a/setup.cfg b/setup.cfg
@@ -2,4 +2,28 @@
 universal = 1
 
 [metadata]
+author = Michael Marchetti
+author_email = [email protected]
+description = Python integration with RStudio Connect
+license = GPL-2.0
 license_file = LICENSE.md
+long_description = file:README.md
+long_description_content_type = text/markdown
+name = rsconnect_python
+url = http://github.com/rstudio/rsconnect-python
+project_urls =
+    Documentation = https://docs.rstudio.com/rsconnect-python
+
+[options]
+install_requires =
+    six>=1.14.0
+    click>=7.0.0
+setup_requires =
+    setuptools
+packages = rsconnect
+python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
+zip_safe = true
+
+[options.entry_points]
+console_scripts =
+    rsconnect = rsconnect.main:cli