summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonny Pfannschmidt <opensource@ronnypfannschmidt.de>2020-05-21 23:42:28 +0200
committerGitHub <noreply@github.com>2020-05-21 23:42:28 +0200
commit8c460692289a4982e40bfe2780ac3e9850a2814b (patch)
tree75341ea6e463bcf0151dcf0ef9211fdbc66031fa
parentea08eddf6015ac07a52f531261fad62c82da4125 (diff)
parent4e304637a3e30f17f570fa21722f972cc1f8022c (diff)
downloadsetuptools-scm-8c460692289a4982e40bfe2780ac3e9850a2814b.tar.gz
Merge pull request #435 from pypa/release-prep
Release prep
-rw-r--r--CHANGELOG.rst7
-rw-r--r--default.nix14
-rw-r--r--setup.cfg1
3 files changed, 8 insertions, 14 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 26318dc..c326777 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,6 +7,13 @@ v4.0.0
* switch to github actions for ci
* fix documentation for ``tag_regex`` and add support for single digit versions
* document handling of enterprise distros with unsupported setuptools versions #312
+* switch to declarative metadata
+* drop the internal copy of samefile and use a dependency on jaraco.windows on legacy systems
+* select git tags based on the presence of numbers instead of dots
+* enable getting a version form a parent folder prefix
+* add release-branch-semver version scheme
+* make global configuration available to version metadata
+* drop official support for python 3.4
v3.5.0
======
diff --git a/default.nix b/default.nix
deleted file mode 100644
index 5305bec..0000000
--- a/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{pkgs ? import <nixpkgs> {}}:
-with pkgs.pythonPackages;
-buildPythonPackage {
- name = "setuptools_scm";
- src = ./.;
- version = "git";
- buildInputs = [
- setuptools
- pip
- pytest
- pkgs.git
- pkgs.mercurial
- ];
-}
diff --git a/setup.cfg b/setup.cfg
index 32f8cff..e603214 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,7 @@ classifiers=
Intended Audience :: Developers
License :: OSI Approved :: MIT License
Programming Language :: Python
+ Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6