Merge pull request #433 from pypa/drop-samefile

RonnyPfannschmidt · web-flow · commit ea08eddf6015 · 2020-05-21T22:46:00.000+02:00
Drop samefile and use a conditional dependency for old pythons
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -26,6 +26,7 @@ jobs:
         with:
           python-version: ${{ matrix.python_version }}
           architecture: x64
+      - run: pip install -U setuptools
       - run: pip install -e .[toml] pytest
       - run: pytest
 
@@ -45,7 +46,8 @@ jobs:
           architecture: x64
       # self install testing needs some clarity
       # so its being executed without any other tools running
-      - run: pip install -U setuptools
+      - run: pip install -U setuptools jaraco.windows
+      - run: python setup.py egg_info
       - run: python setup.py sdist
       - run: easy_install dist/*
       - run: python testing/check_self_install.py
@@ -68,10 +70,10 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install --upgrade wheel setuptools
+        pip install --upgrade wheel setuptools jaraco.windows
+    - run: python setup.py egg_info
     - name: Build package
-      run: |
-        python setup.py bdist_egg
+      run: python setup.py bdist_egg
     - uses: actions/upload-artifact@v2
       with:
         name: dist
@@ -90,10 +92,10 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install --upgrade wheel setuptools
+        pip install --upgrade wheel setuptools jaraco.windows
+    - run: python setup.py egg_info
     - name: Build package
-      run: |
-        python setup.py bdist_wheel sdist
+      run: python setup.py bdist_wheel sdist
     - uses: actions/upload-artifact@v2
       with:
         name: dist
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,4 @@
 exclude *.nix
-exclude appveyor.yml
 exclude .travis.yaml
 exclude .pre-commit-config.yaml
 include *.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools>=34.4", "wheel"]
+requires = ["setuptools>=34.4", "wheel", "jaraco.windows; python_version < '3'"]
 build-backend = "setuptools.build_meta"
diff --git a/setup.cfg b/setup.cfg
@@ -1,9 +1,80 @@
-[bdist_wheel]
-universal=1
-
 [metadata]
 # ensure that the LICENSE file is included in the built wheels
 license_file = LICENSE
+license = MIT
+name = setuptools_scm
+url = https://github.com/pypa/setuptools_scm/
+author = Ronny Pfannschmidt
+author_email = opensource@ronnypfannschmidt.de
+description = the blessed package to manage your versions by scm tags
+long_description= file:README.rst
+
+
+classifiers=
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Topic :: Software Development :: Libraries
+    Topic :: Software Development :: Version Control
+    Topic :: System :: Software Distribution
+    Topic :: Utilities
+
+
+[options]
+zip_safe = true
+python_requires= >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
+install_requires=
+    setuptools
+    jaraco.windows; python_version=="2.7"
+packages=find:
+package_dir=
+   =src
+
+[options.packages.find]
+where=src
+
+[options.extras_require]
+toml = toml
+
+
+[options.entry_points]
+
+distutils.setup_keywords =
+    use_scm_version = setuptools_scm.integration:version_keyword
+
+setuptools.file_finders =
+    setuptools_scm = setuptools_scm.integration:find_files
+
+setuptools.finalize_distribution_options=
+    setuptools_scm = setuptools_scm.integration:infer_version
+
+setuptools_scm.parse_scm =
+    .hg = setuptools_scm.hg:parse
+    .git = setuptools_scm.git:parse
+
+setuptools_scm.parse_scm_fallback =
+    .hg_archival.txt = setuptools_scm.hg:parse_archival
+    PKG-INFO = setuptools_scm.hacks:parse_pkginfo
+    pip-egg-info = setuptools_scm.hacks:parse_pip_egg_info
+    setup.py = setuptools_scm.hacks:fallback_version
+
+setuptools_scm.files_command =
+    .hg = setuptools_scm.file_finder_hg:hg_find_files
+    .git = setuptools_scm.file_finder_git:git_find_files
+
+setuptools_scm.version_scheme =
+    guess-next-dev = setuptools_scm.version:guess_next_dev_version
+    post-release = setuptools_scm.version:postrelease_version
+    python-simplified-semver = setuptools_scm.version:simplified_semver_version
 
-[devpi:upload]
-formats=sdist,bdist_wheel
+setuptools_scm.local_scheme =
+    node-and-date = setuptools_scm.version:get_local_node_and_date
+    node-and-timestamp = setuptools_scm.version:get_local_node_and_timestamp
+    dirty-tag = setuptools_scm.version:get_local_dirty_tag
+    no-local-version = setuptools_scm.version:get_no_local_node
diff --git a/setup.py b/setup.py
@@ -24,6 +24,9 @@ def scm_config():
 
     sys.path.insert(0, src)
     pkg_resources.working_set.add_entry(src)
+    # FIXME: remove debug
+    print(src)
+    print(pkg_resources.working_set)
     from setuptools_scm.hacks import parse_pkginfo
     from setuptools_scm.git import parse as parse_git
     from setuptools_scm.version import guess_next_dev_version, get_local_node_and_date
@@ -46,79 +49,5 @@ def parse(root):
         return dict(version=get_version(root=here, parse=parse, **config))
 
 
-with open("README.rst") as fp:
-    long_description = fp.read()
-
-
-arguments = dict(
-    name="setuptools_scm",
-    url="https://github.com/pypa/setuptools_scm/",
-    zip_safe=True,
-    author="Ronny Pfannschmidt",
-    author_email="opensource@ronnypfannschmidt.de",
-    description=("the blessed package to manage your versions by scm tags"),
-    long_description=long_description,
-    license="MIT",
-    packages=["setuptools_scm"],
-    package_dir={"": "src"},
-    entry_points="""
-        [distutils.setup_keywords]
-        use_scm_version = setuptools_scm.integration:version_keyword
-
-        [setuptools.file_finders]
-        setuptools_scm = setuptools_scm.integration:find_files
-
-        [setuptools.finalize_distribution_options]
-        setuptools_scm = setuptools_scm.integration:infer_version
-
-        [setuptools_scm.parse_scm]
-        .hg = setuptools_scm.hg:parse
-        .git = setuptools_scm.git:parse
-
-        [setuptools_scm.parse_scm_fallback]
-        .hg_archival.txt = setuptools_scm.hg:parse_archival
-        PKG-INFO = setuptools_scm.hacks:parse_pkginfo
-        pip-egg-info = setuptools_scm.hacks:parse_pip_egg_info
-        setup.py = setuptools_scm.hacks:fallback_version
-
-        [setuptools_scm.files_command]
-        .hg = setuptools_scm.file_finder_hg:hg_find_files
-        .git = setuptools_scm.file_finder_git:git_find_files
-
-        [setuptools_scm.version_scheme]
-        guess-next-dev = setuptools_scm.version:guess_next_dev_version
-        post-release = setuptools_scm.version:postrelease_version
-        python-simplified-semver = setuptools_scm.version:simplified_semver_version
-        release-branch-semver = setuptools_scm.version:release_branch_semver
-
-        [setuptools_scm.local_scheme]
-        node-and-date = setuptools_scm.version:get_local_node_and_date
-        node-and-timestamp = \
-        setuptools_scm.version:get_local_node_and_timestamp
-        dirty-tag = setuptools_scm.version:get_local_dirty_tag
-        no-local-version = setuptools_scm.version:get_no_local_node
-    """,
-    classifiers=[
-        "Development Status :: 4 - Beta",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Topic :: Software Development :: Libraries",
-        "Topic :: Software Development :: Version Control",
-        "Topic :: System :: Software Distribution",
-        "Topic :: Utilities",
-    ],
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
-    extras_require=dict(toml=["toml", "setuptools>=42"]),
-)
-
 if __name__ == "__main__":
-    arguments.update(scm_config())
-    setuptools.setup(**arguments)
+    setuptools.setup(**scm_config())
diff --git a/src/setuptools_scm/git.py b/src/setuptools_scm/git.py
@@ -6,10 +6,7 @@
 import warnings
 
 
-try:
-    from os.path import samefile
-except ImportError:
-    from .win_py31_compat import samefile
+from os.path import samefile
 
 
 DEFAULT_DESCRIBE = "git describe --dirty --tags --long --match *[0-9]*"
diff --git a/src/setuptools_scm/win_py31_compat.py b/src/setuptools_scm/win_py31_compat.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`exclude *.nix`
`2`		`-exclude appveyor.yml`
`3`	`2`	`exclude .travis.yaml`
`4`	`3`	`exclude .pre-commit-config.yaml`
`5`	`4`	`include *.py`