##// END OF EJS Templates
release: Merge default into stable for release preparation
milka -
r931:eba75433 merge stable
parent child
Show More
@@ -0,0 +1,10
1 diff -rup configparser-4.0.2-orig/pyproject.toml configparser-4.0.2/pyproject.toml
2 --- configparser-4.0.2-orig/pyproject.toml 2021-03-22 21:28:11.000000000 +0100
3 +++ configparser-4.0.2/pyproject.toml 2021-03-22 21:28:11.000000000 +0100
4 @@ -1,5 +1,5 @@
5 [build-system]
6 -requires = ["setuptools>=40.7", "wheel", "setuptools_scm>=1.15"]
7 +requires = ["setuptools<=42.0", "wheel", "setuptools_scm<6.0.0"]
8 build-backend = "setuptools.build_meta"
9
10 [tool.black]
@@ -0,0 +1,7
1 diff -rup importlib-metadata-1.6.0-orig/yproject.toml importlib-metadata-1.6.0/pyproject.toml
2 --- importlib-metadata-1.6.0-orig/yproject.toml 2021-03-22 22:10:33.000000000 +0100
3 +++ importlib-metadata-1.6.0/pyproject.toml 2021-03-22 22:11:09.000000000 +0100
4 @@ -1,3 +1,3 @@
5 [build-system]
6 -requires = ["setuptools>=30.3", "wheel", "setuptools_scm"]
7 +requires = ["setuptools<42.0", "wheel", "setuptools_scm<6.0.0"]
@@ -0,0 +1,10
1 diff -rup zip-1.2.0-orig/pyproject.toml zip-1.2.0/pyproject.toml
2 --- zip-1.2.0-orig/pyproject.toml 2021-03-23 10:55:37.000000000 +0100
3 +++ zip-1.2.0/pyproject.toml 2021-03-23 10:56:05.000000000 +0100
4 @@ -1,5 +1,5 @@
5 [build-system]
6 -requires = ["setuptools>=34.4", "wheel", "setuptools_scm>=1.15"]
7 +requires = ["setuptools<42.0", "wheel", "setuptools_scm<6.0.0"]
8 build-backend = "setuptools.build_meta"
9
10 [tool.black]
@@ -1,6 +1,5
1 [bumpversion]
1 [bumpversion]
2 current_version = 4.24.1
2 current_version = 4.25.0
3 message = release: Bump version {current_version} to {new_version}
3 message = release: Bump version {current_version} to {new_version}
4
4
5 [bumpversion:file:vcsserver/VERSION]
5 [bumpversion:file:vcsserver/VERSION]
6
@@ -5,12 +5,10 done = false
5 done = true
5 done = true
6
6
7 [task:fixes_on_stable]
7 [task:fixes_on_stable]
8 done = true
9
8
10 [task:pip2nix_generated]
9 [task:pip2nix_generated]
11 done = true
12
10
13 [release]
11 [release]
14 state = prepared
12 state = in_progress
15 version = 4.24.1
13 version = 4.25.0
16
14
@@ -6,7 +6,7 diff -rup pytest-4.6.5-orig/setup.py pyt
6 setup(
6 setup(
7 use_scm_version={"write_to": "src/_pytest/_version.py"},
7 use_scm_version={"write_to": "src/_pytest/_version.py"},
8 - setup_requires=["setuptools-scm", "setuptools>=40.0"],
8 - setup_requires=["setuptools-scm", "setuptools>=40.0"],
9 + setup_requires=["setuptools-scm", "setuptools<=42.0"],
9 + setup_requires=["setuptools-scm<6.0.0", "setuptools<=42.0"],
10 package_dir={"": "src"},
10 package_dir={"": "src"},
11 # fmt: off
11 # fmt: off
12 extras_require={ No newline at end of file
12 extras_require={
@@ -21,9 +21,15 self: super: {
21 ];
21 ];
22 });
22 });
23
23
24 "ipython" = super."ipython".override (attrs: {
25 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
26 self."setuptools-scm"
27 ];
28 });
29
24 "gevent" = super."gevent".override (attrs: {
30 "gevent" = super."gevent".override (attrs: {
25 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
31 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
26 # NOTE: (marcink) odd requirements from gevent aren't set properly,
32 # NOTE: (marcink) odd requirements from gevent aren not set properly,
27 # thus we need to inject psutil manually
33 # thus we need to inject psutil manually
28 self."psutil"
34 self."psutil"
29 ];
35 ];
@@ -71,6 +77,48 self: super: {
71 ];
77 ];
72 });
78 });
73
79
80 "pytest-runner" = super."pytest-runner".override (attrs: {
81 propagatedBuildInputs = [
82 self."setuptools-scm"
83 ];
84 });
85
86 "py" = super."py".override (attrs: {
87 propagatedBuildInputs = [
88 self."setuptools-scm"
89 ];
90 });
91
92 "configparser" = super."configparser".override (attrs: {
93 patches = [
94 ./patches/configparser/pyproject.patch
95 ];
96 propagatedBuildInputs = [
97 self."setuptools-scm"
98 ];
99 });
100
101 "importlib-metadata" = super."importlib-metadata".override (attrs: {
102
103 patches = [
104 ./patches/importlib_metadata/pyproject.patch
105 ];
106
107 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
108 self."setuptools-scm"
109 ];
110
111 });
112
113 "zipp" = super."zipp".override (attrs: {
114 patches = [
115 ./patches/zipp/pyproject.patch
116 ];
117 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
118 self."setuptools-scm"
119 ];
120 });
121
74 # Avoid that base packages screw up the build process
122 # Avoid that base packages screw up the build process
75 inherit (basePythonPackages)
123 inherit (basePythonPackages)
76 setuptools;
124 setuptools;
@@ -784,7 +784,7 self: super: {
784 };
784 };
785 };
785 };
786 "rhodecode-vcsserver" = super.buildPythonPackage {
786 "rhodecode-vcsserver" = super.buildPythonPackage {
787 name = "rhodecode-vcsserver-4.24.1";
787 name = "rhodecode-vcsserver-4.25.0";
788 buildInputs = [
788 buildInputs = [
789 self."pytest"
789 self."pytest"
790 self."py"
790 self."py"
@@ -886,6 +886,19 self: super: {
886 license = [ pkgs.lib.licenses.mit ];
886 license = [ pkgs.lib.licenses.mit ];
887 };
887 };
888 };
888 };
889
890 "setuptools-scm" = super.buildPythonPackage {
891 name = "setuptools-scm-3.5.0";
892 doCheck = false;
893 src = fetchurl {
894 url = "https://files.pythonhosted.org/packages/b2/f7/60a645aae001a2e06cf4b8db2fba9d9f36b8fd378f10647e3e218b61b74b/setuptools_scm-3.5.0.tar.gz";
895 sha256 = "5bdf21a05792903cafe7ae0c9501182ab52497614fa6b1750d9dbae7b60c1a87";
896 };
897 meta = {
898 license = [ pkgs.lib.licenses.psfl ];
899 };
900 };
901
889 "simplegeneric" = super.buildPythonPackage {
902 "simplegeneric" = super.buildPythonPackage {
890 name = "simplegeneric-0.8.1";
903 name = "simplegeneric-0.8.1";
891 doCheck = false;
904 doCheck = false;
@@ -1,1 +1,1
1 4.24.1 No newline at end of file
1 4.25.0 No newline at end of file
@@ -38,6 +38,7 import svn.repos
38 from vcsserver import svn_diff, exceptions, subprocessio, settings
38 from vcsserver import svn_diff, exceptions, subprocessio, settings
39 from vcsserver.base import RepoFactory, raise_from_original, ArchiveNode, archive_repo
39 from vcsserver.base import RepoFactory, raise_from_original, ArchiveNode, archive_repo
40 from vcsserver.exceptions import NoContentException
40 from vcsserver.exceptions import NoContentException
41 from vcsserver.utils import safe_str
41 from vcsserver.vcs_base import RemoteBase
42 from vcsserver.vcs_base import RemoteBase
42
43
43 log = logging.getLogger(__name__)
44 log = logging.getLogger(__name__)
@@ -483,9 +484,7 class SvnRemote(RemoteBase):
483 if path and os.path.isdir(path):
484 if path and os.path.isdir(path):
484 opts['cwd'] = path
485 opts['cwd'] = path
485
486
486 safe_call = False
487 safe_call = opts.pop('_safe', False)
487 if '_safe' in opts:
488 safe_call = True
489
488
490 svnenv = os.environ.copy()
489 svnenv = os.environ.copy()
491 svnenv.update(opts.pop('extra_env', {}))
490 svnenv.update(opts.pop('extra_env', {}))
@@ -499,7 +498,7 class SvnRemote(RemoteBase):
499 return ''.join(p), ''.join(p.error)
498 return ''.join(p), ''.join(p.error)
500 except (EnvironmentError, OSError) as err:
499 except (EnvironmentError, OSError) as err:
501 if safe_call:
500 if safe_call:
502 return '', err
501 return '', safe_str(err).strip()
503 else:
502 else:
504 cmd = ' '.join(cmd) # human friendly CMD
503 cmd = ' '.join(cmd) # human friendly CMD
505 tb_err = ("Couldn't run svn command (%s).\n"
504 tb_err = ("Couldn't run svn command (%s).\n"
General Comments 0
You need to be logged in to leave comments. Login now