From 8c6ad55e679d5257b39acd451c7c89b99e29d583 Mon Sep 17 00:00:00 2001 From: arunjose696 Date: Mon, 24 Jun 2024 01:25:13 -0500 Subject: [PATCH] fix conflict --- modin/tests/pandas/dataframe/test_indexing.py | 6 +- versioneer.py | 400 +++++------------- 2 files changed, 96 insertions(+), 310 deletions(-) diff --git a/modin/tests/pandas/dataframe/test_indexing.py b/modin/tests/pandas/dataframe/test_indexing.py index 935b49cd318..a47474eb76c 100644 --- a/modin/tests/pandas/dataframe/test_indexing.py +++ b/modin/tests/pandas/dataframe/test_indexing.py @@ -21,11 +21,7 @@ from pandas._testing import ensure_clean import modin.pandas as pd -<<<<<<< HEAD -from modin.config import MinRowPartitionSize, NPartitions, UsePlainPandasQueryCompiler -======= -from modin.config import MinPartitionSize, NativeDataframeMode, NPartitions ->>>>>>> 1984aa1f (renaming to PlainPandasQueryCompiler to NativeDataframeMode) +from modin.config import MinRowPartitionSize, NativeDataframeMode, NPartitions from modin.pandas.indexing import is_range_like from modin.pandas.testing import assert_index_equal from modin.tests.pandas.utils import ( diff --git a/versioneer.py b/versioneer.py index 71109f05c02..0ae83dbaaf9 100644 --- a/versioneer.py +++ b/versioneer.py @@ -1,12 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD # Version: 0.29 -======= -======= - ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) -# Version: 0.18 ->>>>>>> 4e967422 (fixing tests) """The Versioneer - like a rocketeer, but for versions. @@ -368,16 +360,11 @@ def get_root() -> str: setup_py = os.path.join(root, "setup.py") pyproject_toml = os.path.join(root, "pyproject.toml") versioneer_py = os.path.join(root, "versioneer.py") -<<<<<<< HEAD if not ( os.path.exists(setup_py) or os.path.exists(pyproject_toml) or os.path.exists(versioneer_py) ): -======= - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): -<<<<<<< HEAD ->>>>>>> 4e967422 (fixing tests) err = ( "Versioneer was unable to run the project root directory. " "Versioneer requires setup.py to be executed from " @@ -385,13 +372,6 @@ def get_root() -> str: "or in a way that lets it use sys.argv[0] to find the root " "(like 'python path/to/setup.py COMMAND')." ) -======= - err = ("Versioneer was unable to run the project root directory. " - "Versioneer requires setup.py to be executed from " - "its immediate directory (like 'python setup.py COMMAND'), " - "or in a way that lets it use sys.argv[0] to find the root " - "(like 'python path/to/setup.py COMMAND').") ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) raise VersioneerBadRootError(err) try: # Certain runtime workflows (setup.py install/develop in a setuptools @@ -403,23 +383,11 @@ def get_root() -> str: my_path = os.path.realpath(os.path.abspath(__file__)) me_dir = os.path.normcase(os.path.splitext(my_path)[0]) vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0]) -<<<<<<< HEAD if me_dir != vsr_dir and "VERSIONEER_PEP518" not in globals(): print( "Warning: build in %s is using versioneer.py from %s" % (os.path.dirname(my_path), versioneer_py) -======= - if me_dir != vsr_dir: -<<<<<<< HEAD - print( - "Warning: build in %s is using versioneer.py from %s" - % (os.path.dirname(me), versioneer_py) ->>>>>>> 4e967422 (fixing tests) ) -======= - print("Warning: build in %s is using versioneer.py from %s" - % (os.path.dirname(me), versioneer_py)) ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) except NameError: pass return root @@ -455,17 +423,6 @@ def get_config_from_root(root: str) -> VersioneerConfig: # common VersioneerConfig users at the moment. We verify against # `None` values elsewhere where it matters -<<<<<<< HEAD -======= - def get(parser, name): - if parser.has_option("versioneer", name): - return parser.get("versioneer", name) - return None -<<<<<<< HEAD - ->>>>>>> 4e967422 (fixing tests) -======= ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) cfg = VersioneerConfig() cfg.VCS = section["VCS"] cfg.style = section.get("style", "") @@ -493,24 +450,17 @@ class NotThisMethod(Exception): HANDLERS: Dict[str, Dict[str, Callable]] = {} -<<<<<<< HEAD def register_vcs_handler(vcs: str, method: str) -> Callable: # decorator """Create decorator to mark a method as the handler of a VCS.""" def decorate(f: Callable) -> Callable: -======= -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): ->>>>>>> 4e967422 (fixing tests) """Store f in HANDLERS[vcs][method].""" HANDLERS.setdefault(vcs, {})[method] = f return f + return decorate -<<<<<<< HEAD -<<<<<<< HEAD def run_command( commands: List[str], args: List[str], @@ -519,13 +469,6 @@ def run_command( hide_stderr: bool = False, env: Optional[Dict[str, str]] = None, ) -> Tuple[Optional[str], Optional[int]]: -======= -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=None): ->>>>>>> 4e967422 (fixing tests) -======= -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) """Call the given command(s).""" assert isinstance(commands, list) process = None @@ -541,29 +484,14 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, try: dispcmd = str([command] + args) # remember shell=False, so use git.cmd on windows, not just git -<<<<<<< HEAD -<<<<<<< HEAD process = subprocess.Popen( [command] + args, -======= - p = subprocess.Popen( - [c] + args, ->>>>>>> 4e967422 (fixing tests) cwd=cwd, env=env, stdout=subprocess.PIPE, stderr=(subprocess.PIPE if hide_stderr else None), -<<<<<<< HEAD **popen_kwargs, -======= ->>>>>>> 4e967422 (fixing tests) ) -======= - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) break except OSError as e: if e.errno == errno.ENOENT: @@ -585,17 +513,9 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, return stdout, process.returncode -<<<<<<< HEAD LONG_VERSION_PY[ "git" -<<<<<<< HEAD ] = r''' -======= -] = ''' ->>>>>>> 4e967422 (fixing tests) -======= -LONG_VERSION_PY['git'] = ''' ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) # This file helps to compute a version number in source trees obtained from # git-archive tarball (such as those provided by githubs download-from-tag # feature). Distribution tarballs (built by setup.py sdist) and build @@ -1340,15 +1260,7 @@ def git_versions_from_keywords( # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of # just "foo-1.0". If we see a "tag: " prefix, prefer those. TAG = "tag: " -<<<<<<< HEAD -<<<<<<< HEAD tags = {r[len(TAG) :] for r in refs if r.startswith(TAG)} -======= - tags = set([r[len(TAG) :] for r in refs if r.startswith(TAG)]) ->>>>>>> 4e967422 (fixing tests) -======= - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) if not tags: # Either we're using git < 1.8.3, or there really are no tags. We use # a heuristic: assume all version tags have a digit. The old git %d @@ -1357,15 +1269,7 @@ def git_versions_from_keywords( # between branches and tags. By ignoring refnames without digits, we # filter out many common branch names like "release" and # "stabilization", as well as "HEAD" and "master". -<<<<<<< HEAD -<<<<<<< HEAD tags = {r for r in refs if re.search(r"\d", r)} -======= - tags = set([r for r in refs if re.search(r"\d", r)]) ->>>>>>> 4e967422 (fixing tests) -======= - tags = set([r for r in refs if re.search(r'\d', r)]) ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) if verbose: print("discarding '%s', no digits" % ",".join(refs - tags)) if verbose: @@ -1373,31 +1277,31 @@ def git_versions_from_keywords( for ref in sorted(tags): # sorting will prefer e.g. "2.0" over "2.0rc1" if ref.startswith(tag_prefix): -<<<<<<< HEAD r = ref[len(tag_prefix) :] -<<<<<<< HEAD # Filter out refs that exactly match prefix or that don't start # with a number once the prefix is stripped (mostly a concern # when prefix is '') if not re.match(r"\d", r): continue -======= ->>>>>>> 4e967422 (fixing tests) -======= - r = ref[len(tag_prefix):] ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) if verbose: print("picking %s" % r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} + return { + "version": r, + "full-revisionid": keywords["full"].strip(), + "dirty": False, + "error": None, + "date": date, + } # no suitable tags, so version is "0+unknown", but full hex is still there if verbose: print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} + return { + "version": "0+unknown", + "full-revisionid": keywords["full"].strip(), + "dirty": False, + "error": "no suitable tags", + "date": None, + } @register_vcs_handler("git", "pieces_from_vcs") @@ -1414,8 +1318,6 @@ def git_pieces_from_vcs( if sys.platform == "win32": GITS = ["git.cmd", "git.exe"] -<<<<<<< HEAD -<<<<<<< HEAD # GIT_DIR can interfere with correct operation of Versioneer. # It may be intended to be passed to the Versioneer-versioned project, # but that should not change where we get our version from. @@ -1424,13 +1326,6 @@ def git_pieces_from_vcs( runner = functools.partial(runner, env=env) _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root, hide_stderr=not verbose) -======= - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, hide_stderr=True) ->>>>>>> 4e967422 (fixing tests) -======= - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) if rc != 0: if verbose: print("Directory %s not under git control" % root) @@ -1438,12 +1333,7 @@ def git_pieces_from_vcs( # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] # if there isn't one, this yields HEX[-dirty] (no NUM) -<<<<<<< HEAD -<<<<<<< HEAD describe_out, rc = runner( -======= - describe_out, rc = run_command( ->>>>>>> 4e967422 (fixing tests) GITS, [ "describe", @@ -1452,20 +1342,10 @@ def git_pieces_from_vcs( "--always", "--long", "--match", -<<<<<<< HEAD f"{tag_prefix}[[:digit:]]*", -======= - "%s*" % tag_prefix, ->>>>>>> 4e967422 (fixing tests) ], cwd=root, ) -======= - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%s*" % tag_prefix], - cwd=root) ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) # --long was added in git-1.5.5 if describe_out is None: raise NotThisMethod("'git describe' failed") @@ -1520,25 +1400,16 @@ def git_pieces_from_vcs( dirty = git_describe.endswith("-dirty") pieces["dirty"] = dirty if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] + git_describe = git_describe[: git_describe.rindex("-dirty")] # now we have TAG-NUM-gHEX or HEX if "-" in git_describe: # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) + mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe) if not mo: -<<<<<<< HEAD # unparsable. Maybe git-describe is misbehaving? -======= - # unparseable. Maybe git-describe is misbehaving? -<<<<<<< HEAD ->>>>>>> 4e967422 (fixing tests) pieces["error"] = "unable to parse git-describe output: '%s'" % describe_out -======= - pieces["error"] = ("unable to parse git-describe output: '%s'" - % describe_out) ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) return pieces # tag @@ -1547,10 +1418,12 @@ def git_pieces_from_vcs( if verbose: fmt = "tag '%s' doesn't start with prefix '%s'" print(fmt % (full_tag, tag_prefix)) - pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" - % (full_tag, tag_prefix)) + pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % ( + full_tag, + tag_prefix, + ) return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] + pieces["closest-tag"] = full_tag[len(tag_prefix) :] # distance: number of commits since tag pieces["distance"] = int(mo.group(2)) @@ -1561,8 +1434,6 @@ def git_pieces_from_vcs( else: # HEX: no tags pieces["closest-tag"] = None -<<<<<<< HEAD -<<<<<<< HEAD out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root) pieces["distance"] = len(out.split()) # total number of commits @@ -1571,24 +1442,6 @@ def git_pieces_from_vcs( # Use only the last line. Previous lines may contain GPG signature # information. date = date.splitlines()[-1] -======= - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[ - 0 - ].strip() ->>>>>>> 4e967422 (fixing tests) -======= - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], - cwd=root)[0].strip() ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) return pieces @@ -1648,7 +1501,6 @@ def versions_from_parentdir( for _ in range(3): dirname = os.path.basename(root) if dirname.startswith(parentdir_prefix): -<<<<<<< HEAD return { "version": dirname[len(parentdir_prefix) :], "full-revisionid": None, @@ -1656,23 +1508,14 @@ def versions_from_parentdir( "error": None, "date": None, } -<<<<<<< HEAD rootdirs.append(root) root = os.path.dirname(root) # up a level -======= -======= - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level ->>>>>>> 4e967422 (fixing tests) if verbose: - print("Tried directories %s but none started with prefix %s" % - (str(rootdirs), parentdir_prefix)) + print( + "Tried directories %s but none started with prefix %s" + % (str(rootdirs), parentdir_prefix) + ) raise NotThisMethod("rootdir doesn't start with parentdir_prefix") @@ -1701,11 +1544,13 @@ def versions_from_file(filename: str) -> Dict[str, Any]: contents = f.read() except OSError: raise NotThisMethod("unable to read _version.py") - mo = re.search(r"version_json = '''\n(.*)''' # END VERSION_JSON", - contents, re.M | re.S) + mo = re.search( + r"version_json = '''\n(.*)''' # END VERSION_JSON", contents, re.M | re.S + ) if not mo: - mo = re.search(r"version_json = '''\r\n(.*)''' # END VERSION_JSON", - contents, re.M | re.S) + mo = re.search( + r"version_json = '''\r\n(.*)''' # END VERSION_JSON", contents, re.M | re.S + ) if not mo: raise NotThisMethod("no version_json in _version.py") return json.loads(mo.group(1)) @@ -1713,16 +1558,7 @@ def versions_from_file(filename: str) -> Dict[str, Any]: def write_to_version_file(filename: str, versions: Dict[str, Any]) -> None: """Write the given version number to the given _version.py file.""" -<<<<<<< HEAD -======= - os.unlink(filename) -<<<<<<< HEAD ->>>>>>> 4e967422 (fixing tests) contents = json.dumps(versions, sort_keys=True, indent=1, separators=(",", ": ")) -======= - contents = json.dumps(versions, sort_keys=True, - indent=1, separators=(",", ": ")) ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) with open(filename, "w") as f: f.write(SHORT_VERSION_PY % contents) @@ -1754,8 +1590,7 @@ def render_pep440(pieces: Dict[str, Any]) -> str: rendered += ".dirty" else: # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], - pieces["short"]) + rendered = "0+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) if pieces["dirty"]: rendered += ".dirty" return rendered @@ -1945,11 +1780,13 @@ def render_git_describe_long(pieces: Dict[str, Any]) -> str: def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]: """Render the given version pieces into the requested style.""" if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} + return { + "version": "unknown", + "full-revisionid": pieces.get("long"), + "dirty": None, + "error": pieces["error"], + "date": None, + } if not style or style == "default": style = "pep440" # the default @@ -1973,9 +1810,13 @@ def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]: else: raise ValueError("unknown style '%s'" % style) - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} + return { + "version": rendered, + "full-revisionid": pieces["long"], + "dirty": pieces["dirty"], + "error": None, + "date": pieces.get("date"), + } class VersioneerBadRootError(Exception): @@ -1997,19 +1838,10 @@ def get_versions(verbose: bool = False) -> Dict[str, Any]: assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg" handlers = HANDLERS.get(cfg.VCS) assert handlers, "unrecognized VCS '%s'" % cfg.VCS -<<<<<<< HEAD verbose = verbose or bool(cfg.verbose) # `bool()` used to avoid `None` -======= - verbose = verbose or cfg.verbose -<<<<<<< HEAD ->>>>>>> 4e967422 (fixing tests) assert ( cfg.versionfile_source is not None ), "please set versioneer.versionfile_source" -======= - assert cfg.versionfile_source is not None, \ - "please set versioneer.versionfile_source" ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix" versionfile_abs = os.path.join(root, cfg.versionfile_source) @@ -2063,9 +1895,13 @@ def get_versions(verbose: bool = False) -> Dict[str, Any]: if verbose: print("unable to compute version") - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, "error": "unable to compute version", - "date": None} + return { + "version": "0+unknown", + "full-revisionid": None, + "dirty": None, + "error": "unable to compute version", + "date": None, + } def get_version() -> str: @@ -2118,6 +1954,7 @@ def run(self) -> None: print(" date: %s" % vers.get("date")) if vers["error"]: print(" error: %s" % vers["error"]) + cmds["version"] = cmd_version # we override "build_py" in setuptools @@ -2157,10 +1994,10 @@ def run(self) -> None: # now locate _version.py in the new build/ directory and replace # it with an updated value if cfg.versionfile_build: - target_versionfile = os.path.join(self.build_lib, - cfg.versionfile_build) + target_versionfile = os.path.join(self.build_lib, cfg.versionfile_build) print("UPDATING %s" % target_versionfile) write_to_version_file(target_versionfile, versions) + cmds["build_py"] = cmd_build_py if "build_ext" in cmds: @@ -2220,17 +2057,21 @@ def run(self) -> None: os.unlink(target_versionfile) with open(cfg.versionfile_source, "w") as f: LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % - {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) + f.write( + LONG + % { + "DOLLAR": "$", + "STYLE": cfg.style, + "TAG_PREFIX": cfg.tag_prefix, + "PARENTDIR_PREFIX": cfg.parentdir_prefix, + "VERSIONFILE_SOURCE": cfg.versionfile_source, + } + ) + cmds["build_exe"] = cmd_build_exe del cmds["build_py"] - if 'py2exe' in sys.modules: # py2exe enabled? + if "py2exe" in sys.modules: # py2exe enabled? try: from py2exe.setuptools_buildexe import py2exe as _py2exe # type: ignore except ImportError: @@ -2249,13 +2090,17 @@ def run(self) -> None: os.unlink(target_versionfile) with open(cfg.versionfile_source, "w") as f: LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % - {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) + f.write( + LONG + % { + "DOLLAR": "$", + "STYLE": cfg.style, + "TAG_PREFIX": cfg.tag_prefix, + "PARENTDIR_PREFIX": cfg.parentdir_prefix, + "VERSIONFILE_SOURCE": cfg.versionfile_source, + } + ) + cmds["py2exe"] = cmd_py2exe # sdist farms its file list building out to egg_info @@ -2322,8 +2167,10 @@ def make_release_tree(self, base_dir: str, files: List[str]) -> None: # updated value target_versionfile = os.path.join(base_dir, cfg.versionfile_source) print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, - self._versioneer_generated_versions) + write_to_version_file( + target_versionfile, self._versioneer_generated_versions + ) + cmds["sdist"] = cmd_sdist return cmds @@ -2383,26 +2230,9 @@ def do_setup() -> int: root = get_root() try: cfg = get_config_from_root(root) -<<<<<<< HEAD -<<<<<<< HEAD except (OSError, configparser.NoSectionError, configparser.NoOptionError) as e: if isinstance(e, (OSError, configparser.NoSectionError)): -======= - except ( - EnvironmentError, - configparser.NoSectionError, - configparser.NoOptionError, - ) as err: - if isinstance(err, (EnvironmentError, configparser.NoSectionError)): ->>>>>>> 4e967422 (fixing tests) print("Adding sample versioneer config to setup.cfg", file=sys.stderr) -======= - except (EnvironmentError, configparser.NoSectionError, - configparser.NoOptionError) as err: - if isinstance(err, (EnvironmentError, configparser.NoSectionError)): - print("Adding sample versioneer config to setup.cfg", - file=sys.stderr) ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) with open(os.path.join(root, "setup.cfg"), "a") as f: f.write(SAMPLE_CONFIG) print(CONFIG_ERROR, file=sys.stderr) @@ -2411,23 +2241,19 @@ def do_setup() -> int: print(" creating %s" % cfg.versionfile_source) with open(cfg.versionfile_source, "w") as f: LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - -<<<<<<< HEAD + f.write( + LONG + % { + "DOLLAR": "$", + "STYLE": cfg.style, + "TAG_PREFIX": cfg.tag_prefix, + "PARENTDIR_PREFIX": cfg.parentdir_prefix, + "VERSIONFILE_SOURCE": cfg.versionfile_source, + } + ) + ipy = os.path.join(os.path.dirname(cfg.versionfile_source), "__init__.py") -<<<<<<< HEAD maybe_ipy: Optional[str] = ipy -======= ->>>>>>> 4e967422 (fixing tests) -======= - ipy = os.path.join(os.path.dirname(cfg.versionfile_source), - "__init__.py") ->>>>>>> 352ca3b6 (removing additional parameter from try_cast_to_pandas) if os.path.exists(ipy): try: with open(ipy, "r") as f: @@ -2448,43 +2274,7 @@ def do_setup() -> int: print(" %s unmodified" % ipy) else: print(" %s doesn't exist, ok" % ipy) -<<<<<<< HEAD maybe_ipy = None -======= - ipy = None - - # Make sure both the top-level "versioneer.py" and versionfile_source - # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so - # they'll be copied into source distributions. Pip won't be able to - # install the package without this. - manifest_in = os.path.join(root, "MANIFEST.in") - simple_includes = set() - try: - with open(manifest_in, "r") as f: - for line in f: - if line.startswith("include "): - for include in line.split()[1:]: - simple_includes.add(include) - except EnvironmentError: - pass - # That doesn't cover everything MANIFEST.in can do - # (http://docs.python.org/2/distutils/sourcedist.html#commands), so - # it might give some false negatives. Appending redundant 'include' - # lines is safe, though. - if "versioneer.py" not in simple_includes: - print(" appending 'versioneer.py' to MANIFEST.in") - with open(manifest_in, "a") as f: - f.write("include versioneer.py\n") - else: - print(" 'versioneer.py' already in MANIFEST.in") - if cfg.versionfile_source not in simple_includes: - print(" appending versionfile_source ('%s') to MANIFEST.in" % - cfg.versionfile_source) - with open(manifest_in, "a") as f: - f.write("include %s\n" % cfg.versionfile_source) - else: - print(" versionfile_source already in MANIFEST.in") ->>>>>>> 4e967422 (fixing tests) # Make VCS-specific changes. For git, this means creating/changing # .gitattributes to mark _version.py for export-subst keyword