You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2020/04/30 16:07:56 UTC
[couchdb] branch 3.0.x-backports-verbump created (now 59827c5)
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a change to branch 3.0.x-backports-verbump
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
at 59827c5 Fix python-black target for Windows
This branch includes the following new commits:
new ded9f12 Bump version to 3.0.1
new 74a91ec allow to run 'javascript' target with other test targets in the same 'make' process
new 59827c5 Fix python-black target for Windows
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb] 03/03: Fix python-black target for Windows
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch 3.0.x-backports-verbump
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 59827c51c6ad5d216a010b1a6648dcfd56c5b789
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Thu Apr 30 09:07:37 2020 -0700
Fix python-black target for Windows
---
Makefile.win | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.win b/Makefile.win
index 198c945..700e7b1 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -186,7 +186,7 @@ python-black: .venv/bin/black
@python.exe -c "import sys; exit(1 if sys.version_info >= (3,6) else 0)" || \
.venv\Scripts\black.exe --check \
--exclude="build/|buck-out/|dist/|_build/|\.git/|\.hg/|\.mypy_cache/|\.nox/|\.tox/|\.venv/|src/rebar/pr2relnotes.py|src/fauxton" \
- build-aux\*.py dev\run test\javascript\run src\mango\test\*.py src\docs\src\conf.py src\docs\ext\*.py .
+ build-aux dev\run test\javascript\run src\mango\test src\docs\src\conf.py src\docs\ext .
python-black-update: .venv/bin/black
@python.exe -c "import sys; exit(1 if sys.version_info < (3,6) else 0)" || \
@@ -194,7 +194,7 @@ python-black-update: .venv/bin/black
@python.exe -c "import sys; exit(1 if sys.version_info >= (3,6) else 0)" || \
.venv\Scripts\black.exe \
--exclude="build/|buck-out/|dist/|_build/|\.git/|\.hg/|\.mypy_cache/|\.nox/|\.tox/|\.venv/|src/rebar/pr2relnotes.py|src/fauxton" \
- build-aux\*.py dev\run test\javascript\run src\mango\test\*.py src\docs\src\conf.py src\docs\ext\*.py .
+ build-aux dev\run test\javascript\run src\mango\test src\docs\src\conf.py src\docs\ext .
.PHONY: elixir
elixir: export MIX_ENV=integration
[couchdb] 01/03: Bump version to 3.0.1
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch 3.0.x-backports-verbump
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit ded9f128a2bd4f4f917b612eef2a6fda86f3231f
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Thu Apr 30 09:06:04 2020 -0700
Bump version to 3.0.1
---
rel/reltool.config | 2 +-
version.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rel/reltool.config b/rel/reltool.config
index a576f9c..27a9975 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -12,7 +12,7 @@
{sys, [
{lib_dirs, ["../src"]},
- {rel, "couchdb", "3.0.0", [
+ {rel, "couchdb", "3.0.1", [
%% stdlib
asn1,
compiler,
diff --git a/version.mk b/version.mk
index 9ca09ab..8aa6ae0 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
vsn_major=3
vsn_minor=0
-vsn_patch=0
+vsn_patch=1
[couchdb] 02/03: allow to run 'javascript' target with other test
targets in the same 'make' process
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch 3.0.x-backports-verbump
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 74a91eced272d0208d794dbd688ec4fbfc84e8e2
Author: Juanjo Rodriguez <ju...@apache.org>
AuthorDate: Tue Mar 24 08:51:33 2020 +0100
allow to run 'javascript' target with other test targets in the same 'make' process
---
Makefile | 4 +++-
Makefile.win | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 7d047cb..56d6d51 100644
--- a/Makefile
+++ b/Makefile
@@ -260,7 +260,9 @@ elixir-credo: elixir-init
.PHONY: javascript
# target: javascript - Run JavaScript test suites or specific ones defined by suites option
javascript: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
-javascript: devclean
+javascript:
+
+ @$(MAKE) devclean
@mkdir -p share/www/script/test
ifeq ($(IN_RELEASE), true)
@cp test/javascript/tests/lorem*.txt share/www/script/test/
diff --git a/Makefile.win b/Makefile.win
index 7030089..198c945 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -235,7 +235,8 @@ elixir-credo: elixir-init
.PHONY: javascript
# target: javascript - Run JavaScript test suites or specific ones defined by suites option
javascript: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
-javascript: devclean
+javascript:
+ @$(MAKE) devclean
-@mkdir share\www\script\test
ifeq ($(IN_RELEASE), true)
@copy test\javascript\tests\lorem*.txt share\www\script\test