From 72c22f9610a2c5c4e7271c97b3a8318378a67c8e Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 28 May 2019 12:15:14 -0400 Subject: [PATCH 1/8] packages/ - improvements to project structures. - Update setup.py to reflect Galaxy no longer supports Python 3.4. - Move PROJECT_DESCRIPTION into a variable imported into setup.py dynamically, reducing the differences in setup.py across packages. - Fix some project descriptions. - Fix versions and HISTORY.rst for a release this cycle, didn't get any 19.5.0 packages out. --- packages/data/HISTORY.rst | 4 ++-- packages/data/galaxy/project_galaxy_data.py | 3 ++- packages/data/setup.py | 3 +-- packages/job_metrics/HISTORY.rst | 2 +- packages/job_metrics/galaxy/project_galaxy_job_metrics.py | 1 + packages/job_metrics/setup.py | 3 +-- packages/objectstore/HISTORY.rst | 4 ++-- packages/objectstore/galaxy/project_galaxy_objectstore.py | 3 ++- packages/objectstore/setup.py | 3 +-- packages/tool_util/HISTORY.rst | 2 +- packages/tool_util/galaxy/project_galaxy_tool_util.py | 1 + packages/tool_util/setup.py | 2 -- packages/util/HISTORY.rst | 4 ++-- packages/util/galaxy/project_galaxy_util.py | 3 ++- packages/util/setup.py | 4 ++-- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/data/HISTORY.rst b/packages/data/HISTORY.rst index c49739afaf3..ec2f0e746e9 100644 --- a/packages/data/HISTORY.rst +++ b/packages/data/HISTORY.rst @@ -6,7 +6,7 @@ History .. to_doc --------------------- -19.5.0.dev0 +19.9.0.dev0 --------------------- -* Initial import from dev branch of Galaxy during 19.05 release cycle. +* Initial import from dev branch of Galaxy during 19.09 development cycle. diff --git a/packages/data/galaxy/project_galaxy_data.py b/packages/data/galaxy/project_galaxy_data.py index 2dc2d71d64d..f31e64795fb 100644 --- a/packages/data/galaxy/project_galaxy_data.py +++ b/packages/data/galaxy/project_galaxy_data.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- -__version__ = '19.5.0.dev0' +__version__ = '19.9.0.dev0' PROJECT_NAME = "galaxy-data" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" PROJECT_URL = "https://github.com/galaxyproject/galaxy" PROJECT_AUTHOR = 'Galaxy Project and Community' +PROJECT_DESCRIPTION = 'Galaxy Datatype Framework and Datatypes' PROJECT_EMAIL = 'jmchilton@gmail.com' RAW_CONTENT_URL = "https://raw.github.com/%s/%s/master/" % ( PROJECT_USERAME, PROJECT_NAME diff --git a/packages/data/setup.py b/packages/data/setup.py index 9d63ce30e1c..ab2288bb27f 100644 --- a/packages/data/setup.py +++ b/packages/data/setup.py @@ -26,9 +26,9 @@ with open('%s/project_galaxy_data.py' % SOURCE_DIR, 'rb') as f: PROJECT_URL = get_var("PROJECT_URL") PROJECT_AUTHOR = get_var("PROJECT_AUTHOR") PROJECT_EMAIL = get_var("PROJECT_EMAIL") + PROJECT_DESCRIPTION = get_var("PROJECT_DESCRIPTION") TEST_DIR = 'tests' -PROJECT_DESCRIPTION = 'Galaxy Datatype Framework and Datatypes' PACKAGES = [ 'galaxy', 'galaxy.datatypes', @@ -101,7 +101,6 @@ setup( 'Natural Language :: English', "Programming Language :: Python :: 2", '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', diff --git a/packages/job_metrics/HISTORY.rst b/packages/job_metrics/HISTORY.rst index 470356353e5..ec2f0e746e9 100644 --- a/packages/job_metrics/HISTORY.rst +++ b/packages/job_metrics/HISTORY.rst @@ -9,4 +9,4 @@ History 19.9.0.dev0 --------------------- -* Initial import from dev branch of Galaxy during 19.09 release cycle. +* Initial import from dev branch of Galaxy during 19.09 development cycle. diff --git a/packages/job_metrics/galaxy/project_galaxy_job_metrics.py b/packages/job_metrics/galaxy/project_galaxy_job_metrics.py index 36ca5348e51..c8a4b73626f 100644 --- a/packages/job_metrics/galaxy/project_galaxy_job_metrics.py +++ b/packages/job_metrics/galaxy/project_galaxy_job_metrics.py @@ -6,6 +6,7 @@ PROJECT_NAME = "galaxy-job-metrics" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" PROJECT_URL = "https://github.com/galaxyproject/galaxy" PROJECT_AUTHOR = 'Galaxy Project and Community' +PROJECT_DESCRIPTION = 'Galaxy Job Metrics' PROJECT_EMAIL = 'jmchilton@gmail.com' RAW_CONTENT_URL = "https://raw.github.com/%s/%s/master/" % ( PROJECT_USERAME, PROJECT_NAME diff --git a/packages/job_metrics/setup.py b/packages/job_metrics/setup.py index 19aa3645b3f..6bf37538863 100644 --- a/packages/job_metrics/setup.py +++ b/packages/job_metrics/setup.py @@ -26,9 +26,9 @@ with open('%s/project_galaxy_job_metrics.py' % SOURCE_DIR, 'rb') as f: PROJECT_URL = get_var("PROJECT_URL") PROJECT_AUTHOR = get_var("PROJECT_AUTHOR") PROJECT_EMAIL = get_var("PROJECT_EMAIL") + PROJECT_DESCRIPTION = get_var("PROJECT_DESCRIPTION") TEST_DIR = 'tests' -PROJECT_DESCRIPTION = 'Galaxy Job Metrics' PACKAGES = [ 'galaxy', 'galaxy.job_metrics', @@ -91,7 +91,6 @@ setup( 'Natural Language :: English', "Programming Language :: Python :: 2", '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', diff --git a/packages/objectstore/HISTORY.rst b/packages/objectstore/HISTORY.rst index c49739afaf3..ec2f0e746e9 100644 --- a/packages/objectstore/HISTORY.rst +++ b/packages/objectstore/HISTORY.rst @@ -6,7 +6,7 @@ History .. to_doc --------------------- -19.5.0.dev0 +19.9.0.dev0 --------------------- -* Initial import from dev branch of Galaxy during 19.05 release cycle. +* Initial import from dev branch of Galaxy during 19.09 development cycle. diff --git a/packages/objectstore/galaxy/project_galaxy_objectstore.py b/packages/objectstore/galaxy/project_galaxy_objectstore.py index f64be773ba9..de883b37181 100644 --- a/packages/objectstore/galaxy/project_galaxy_objectstore.py +++ b/packages/objectstore/galaxy/project_galaxy_objectstore.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- -__version__ = '19.5.0.dev0' +__version__ = '19.9.0.dev0' PROJECT_NAME = "galaxy-objectstore" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" PROJECT_URL = "https://github.com/galaxyproject/galaxy" PROJECT_AUTHOR = 'Galaxy Project and Community' +PROJECT_DESCRIPTION = 'Galaxy Objectstore Framework and Plugins' PROJECT_EMAIL = 'jmchilton@gmail.com' RAW_CONTENT_URL = "https://raw.github.com/%s/%s/master/" % ( PROJECT_USERAME, PROJECT_NAME diff --git a/packages/objectstore/setup.py b/packages/objectstore/setup.py index 3b3d519ec0b..16ab7ef5f51 100644 --- a/packages/objectstore/setup.py +++ b/packages/objectstore/setup.py @@ -26,9 +26,9 @@ with open('%s/project_galaxy_objectstore.py' % SOURCE_DIR, 'rb') as f: PROJECT_URL = get_var("PROJECT_URL") PROJECT_AUTHOR = get_var("PROJECT_AUTHOR") PROJECT_EMAIL = get_var("PROJECT_EMAIL") + PROJECT_DESCRIPTION = get_var("PROJECT_DESCRIPTION") TEST_DIR = 'tests' -PROJECT_DESCRIPTION = 'Galaxy Datatype Framework and Datatypes' PACKAGES = [ 'galaxy', 'galaxy.objectstore', @@ -89,7 +89,6 @@ setup( 'Natural Language :: English', "Programming Language :: Python :: 2", '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', diff --git a/packages/tool_util/HISTORY.rst b/packages/tool_util/HISTORY.rst index 470356353e5..ec2f0e746e9 100644 --- a/packages/tool_util/HISTORY.rst +++ b/packages/tool_util/HISTORY.rst @@ -9,4 +9,4 @@ History 19.9.0.dev0 --------------------- -* Initial import from dev branch of Galaxy during 19.09 release cycle. +* Initial import from dev branch of Galaxy during 19.09 development cycle. diff --git a/packages/tool_util/galaxy/project_galaxy_tool_util.py b/packages/tool_util/galaxy/project_galaxy_tool_util.py index 80fd1069067..7fb8e4c0ae3 100644 --- a/packages/tool_util/galaxy/project_galaxy_tool_util.py +++ b/packages/tool_util/galaxy/project_galaxy_tool_util.py @@ -6,6 +6,7 @@ PROJECT_NAME = "galaxy-tool-util" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" PROJECT_URL = "https://github.com/galaxyproject/galaxy" PROJECT_AUTHOR = 'Galaxy Project and Community' +PROJECT_DESCRIPTION = 'Galaxy Tool and Tool Dependency Utilities' PROJECT_EMAIL = 'jmchilton@gmail.com' RAW_CONTENT_URL = "https://raw.github.com/%s/%s/master/" % ( PROJECT_USERAME, PROJECT_NAME diff --git a/packages/tool_util/setup.py b/packages/tool_util/setup.py index 2170880d3b5..a86dc04c068 100644 --- a/packages/tool_util/setup.py +++ b/packages/tool_util/setup.py @@ -28,7 +28,6 @@ with open('%s/project_galaxy_tool_util.py' % SOURCE_DIR, 'rb') as f: PROJECT_EMAIL = get_var("PROJECT_EMAIL") TEST_DIR = 'tests' -PROJECT_DESCRIPTION = 'Galaxy Tool Utilities' PACKAGES = [ 'galaxy', 'galaxy.tool_util', @@ -103,7 +102,6 @@ setup( 'Natural Language :: English', "Programming Language :: Python :: 2", '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', diff --git a/packages/util/HISTORY.rst b/packages/util/HISTORY.rst index c49739afaf3..ec2f0e746e9 100644 --- a/packages/util/HISTORY.rst +++ b/packages/util/HISTORY.rst @@ -6,7 +6,7 @@ History .. to_doc --------------------- -19.5.0.dev0 +19.9.0.dev0 --------------------- -* Initial import from dev branch of Galaxy during 19.05 release cycle. +* Initial import from dev branch of Galaxy during 19.09 development cycle. diff --git a/packages/util/galaxy/project_galaxy_util.py b/packages/util/galaxy/project_galaxy_util.py index 770df42ba3d..98f4f9436ae 100644 --- a/packages/util/galaxy/project_galaxy_util.py +++ b/packages/util/galaxy/project_galaxy_util.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- -__version__ = '19.5.0.dev0' +__version__ = '19.9.0.dev0' PROJECT_NAME = "galaxy-util" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" PROJECT_URL = "https://github.com/galaxyproject/galaxy" PROJECT_AUTHOR = 'Galaxy Project and Community' +PROJECT_DESCRIPTION = 'Galaxy Generic Utilities' PROJECT_EMAIL = 'jmchilton@gmail.com' RAW_CONTENT_URL = "https://raw.github.com/%s/%s/master/" % ( PROJECT_USERAME, PROJECT_NAME diff --git a/packages/util/setup.py b/packages/util/setup.py index 212c29cfda4..e02de21f05f 100644 --- a/packages/util/setup.py +++ b/packages/util/setup.py @@ -26,11 +26,12 @@ with open('%s/project_galaxy_util.py' % SOURCE_DIR, 'rb') as f: PROJECT_URL = get_var("PROJECT_URL") PROJECT_AUTHOR = get_var("PROJECT_AUTHOR") PROJECT_EMAIL = get_var("PROJECT_EMAIL") + PROJECT_DESCRIPTION = get_var("PROJECT_DESCRIPTION") TEST_DIR = 'tests' -PROJECT_DESCRIPTION = 'Galaxy Datatype Framework and Datatypes' PACKAGES = [ 'galaxy', + 'galaxy.exceptions', 'galaxy.util', 'galaxy.util.logging', 'galaxy.util.path', @@ -93,7 +94,6 @@ setup( 'Natural Language :: English', "Programming Language :: Python :: 2", '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', From 93d097185c8935add47bfcd0ce1e278717f1c633 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 28 May 2019 12:47:22 -0400 Subject: [PATCH 2/8] packages/ - add development requirements for publishing, linting artifacts --- packages/data/dev-requirements.txt | 1 + packages/job_metrics/dev-requirements.txt | 1 + packages/objectstore/dev-requirements.txt | 1 + packages/package-dev-requirements.txt | 9 +++++++++ packages/tool_util/dev-requirements.txt | 1 + packages/util/dev-requirements.txt | 1 + 6 files changed, 14 insertions(+) create mode 120000 packages/data/dev-requirements.txt create mode 120000 packages/job_metrics/dev-requirements.txt create mode 120000 packages/objectstore/dev-requirements.txt create mode 100644 packages/package-dev-requirements.txt create mode 120000 packages/tool_util/dev-requirements.txt create mode 120000 packages/util/dev-requirements.txt diff --git a/packages/data/dev-requirements.txt b/packages/data/dev-requirements.txt new file mode 120000 index 00000000000..467b90d7a23 --- /dev/null +++ b/packages/data/dev-requirements.txt @@ -0,0 +1 @@ +../package-dev-requirements.txt \ No newline at end of file diff --git a/packages/job_metrics/dev-requirements.txt b/packages/job_metrics/dev-requirements.txt new file mode 120000 index 00000000000..467b90d7a23 --- /dev/null +++ b/packages/job_metrics/dev-requirements.txt @@ -0,0 +1 @@ +../package-dev-requirements.txt \ No newline at end of file diff --git a/packages/objectstore/dev-requirements.txt b/packages/objectstore/dev-requirements.txt new file mode 120000 index 00000000000..467b90d7a23 --- /dev/null +++ b/packages/objectstore/dev-requirements.txt @@ -0,0 +1 @@ +../package-dev-requirements.txt \ No newline at end of file diff --git a/packages/package-dev-requirements.txt b/packages/package-dev-requirements.txt new file mode 100644 index 00000000000..034ad598066 --- /dev/null +++ b/packages/package-dev-requirements.txt @@ -0,0 +1,9 @@ +# For testing +pytest + +# For dev +sphinx + +# For release +wheel +twine diff --git a/packages/tool_util/dev-requirements.txt b/packages/tool_util/dev-requirements.txt new file mode 120000 index 00000000000..467b90d7a23 --- /dev/null +++ b/packages/tool_util/dev-requirements.txt @@ -0,0 +1 @@ +../package-dev-requirements.txt \ No newline at end of file diff --git a/packages/util/dev-requirements.txt b/packages/util/dev-requirements.txt new file mode 120000 index 00000000000..467b90d7a23 --- /dev/null +++ b/packages/util/dev-requirements.txt @@ -0,0 +1 @@ +../package-dev-requirements.txt \ No newline at end of file From a49debffdc2851ed86e62314d8e198687b8bdc6d Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 28 May 2019 13:30:38 -0400 Subject: [PATCH 3/8] packages/ - add Makefile(s) for building projects. Uses a stripped down, updated variant of like Pulsar/Planemo/ephemeris Makefile stuff. Modified in dozens of ways for tags, version and path differences, etc.. Symbolic links to keep everything in line. --- packages/build_scripts/commit_version.py | 43 +++++++++ packages/build_scripts/new_version.py | 56 ++++++++++++ .../print_version_for_release.py | 24 +++++ packages/data/Makefile | 1 + packages/data/scripts | 1 + packages/data/setup.py | 1 + packages/job_metrics/Makefile | 1 + packages/job_metrics/scripts | 1 + packages/job_metrics/setup.py | 1 + packages/objectstore/Makefile | 1 + packages/objectstore/scripts | 1 + packages/objectstore/setup.py | 1 + packages/package.Makefile | 88 +++++++++++++++++++ packages/tool_util/Makefile | 1 + packages/tool_util/scripts | 1 + packages/tool_util/setup.py | 2 + packages/util/Makefile | 1 + packages/util/scripts | 1 + packages/util/setup.py | 1 + 19 files changed, 227 insertions(+) create mode 100644 packages/build_scripts/commit_version.py create mode 100644 packages/build_scripts/new_version.py create mode 100644 packages/build_scripts/print_version_for_release.py create mode 120000 packages/data/Makefile create mode 120000 packages/data/scripts create mode 120000 packages/job_metrics/Makefile create mode 120000 packages/job_metrics/scripts create mode 120000 packages/objectstore/Makefile create mode 120000 packages/objectstore/scripts create mode 100644 packages/package.Makefile create mode 120000 packages/tool_util/Makefile create mode 120000 packages/tool_util/scripts create mode 120000 packages/util/Makefile create mode 120000 packages/util/scripts diff --git a/packages/build_scripts/commit_version.py b/packages/build_scripts/commit_version.py new file mode 100644 index 00000000000..99787f57237 --- /dev/null +++ b/packages/build_scripts/commit_version.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python +# Modify version... +import datetime +import os +import re +import subprocess +import sys + + +PROJECT_DIRECTORY = os.path.join(os.path.dirname(__file__), "..") +PROJECT_DIRECTORY_NAME = os.path.basename(os.path.abspath(PROJECT_DIRECTORY)) +PROJECT_MODULE_FILENAME = "galaxy_%s.py" % PROJECT_DIRECTORY_NAME +PROJECT_NAME = PROJECT_DIRECTORY_NAME.replace("_", "-") + + +def main(argv): + source_dir = argv[1] + version = argv[2] + history_path = os.path.join(PROJECT_DIRECTORY, "HISTORY.rst") + history = open(history_path, "r").read() + today = datetime.datetime.today() + today_str = today.strftime('%Y-%m-%d') + history = history.replace(".dev0", " (%s)" % today_str) + open(history_path, "w").write(history) + mod_path = os.path.join(PROJECT_DIRECTORY, source_dir, PROJECT_MODULE_FILENAME) + mod = open(mod_path, "r").read() + mod = re.sub("__version__ = '[\d\.]*\.dev0'", + "__version__ = '%s'" % version, + mod) + mod = open(mod_path, "w").write(mod) + tag = "galaxy-%s-%s" % (PROJECT_NAME, version) + shell(["git", "commit", "-m", "Version %s of %s (tag %s)." % (version, PROJECT_NAME, tag), + "HISTORY.rst", mod_path]) + shell(["git", "tag", tag]) + + +def shell(cmds, **kwds): + p = subprocess.Popen(cmds, **kwds) + return p.wait() + + +if __name__ == "__main__": + main(sys.argv) diff --git a/packages/build_scripts/new_version.py b/packages/build_scripts/new_version.py new file mode 100644 index 00000000000..13cd66cd088 --- /dev/null +++ b/packages/build_scripts/new_version.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# Modify version... +import os +import re +import subprocess +import sys +from distutils.version import StrictVersion + + +PROJECT_DIRECTORY = os.path.join(os.path.dirname(__file__), "..") +PROJECT_DIRECTORY_NAME = os.path.basename(os.path.abspath(PROJECT_DIRECTORY)) +PROJECT_MODULE_FILENAME = "galaxy_%s.py" % PROJECT_DIRECTORY_NAME +PROJECT_NAME = PROJECT_DIRECTORY_NAME.replace("_", "-") + + +def main(argv): + source_dir = argv[1] + old_version = StrictVersion(argv[2]) + old_version_tuple = old_version.version + new_version_tuple = list(old_version_tuple) + new_version_tuple[1] = old_version_tuple[1] + 1 + new_version_tuple[2] = 0 + new_version = ".".join(map(str, new_version_tuple)) + + history_path = os.path.join(PROJECT_DIRECTORY, "HISTORY.rst") + history = open(history_path, "r").read() + + def extend(from_str, line): + from_str += "\n" + return history.replace(from_str, from_str + line + "\n" ) + + history = extend(".. to_doc", """ +--------------------- +%s.dev0 +--------------------- + + """ % new_version) + open(history_path, "w").write(history) + + mod_path = os.path.join(PROJECT_DIRECTORY, source_dir, PROJECT_MODULE_FILENAME) + mod = open(mod_path, "r").read() + mod = re.sub("__version__ = '[\d\.]+'", + "__version__ = '%s.dev0'" % new_version, + mod, 1) + mod = open(mod_path, "w").write(mod) + shell(["git", "commit", "-m", "Starting work on %s %s" % (PROJECT_NAME, new_version), + "HISTORY.rst", mod_path]) + + +def shell(cmds, **kwds): + p = subprocess.Popen(cmds, **kwds) + return p.wait() + + +if __name__ == "__main__": + main(sys.argv) diff --git a/packages/build_scripts/print_version_for_release.py b/packages/build_scripts/print_version_for_release.py new file mode 100644 index 00000000000..2c4f31d43ff --- /dev/null +++ b/packages/build_scripts/print_version_for_release.py @@ -0,0 +1,24 @@ +from __future__ import print_function + +import ast +import re +import os +import sys +from distutils.version import LooseVersion + +PROJECT_DIRECTORY = os.path.join(os.path.dirname(__file__), "..") +PROJECT_DIRECTORY_NAME = os.path.basename(os.path.abspath(PROJECT_DIRECTORY)) +PROJECT_MODULE_FILENAME = "galaxy_%s.py" % PROJECT_DIRECTORY_NAME + +source_dir = sys.argv[1] +PROJECT_MODULE_PATH = os.path.join(PROJECT_DIRECTORY, source_dir, PROJECT_MODULE_FILENAME) + +_version_re = re.compile(r'__version__\s+=\s+(.*)') + +with open(PROJECT_MODULE_PATH, 'rb') as f: + version = str(ast.literal_eval(_version_re.search( + f.read().decode('utf-8')).group(1))) + +# Strip .devN +version_tuple = LooseVersion(version).version[0:3] +print(".".join(map(str, version_tuple))) diff --git a/packages/data/Makefile b/packages/data/Makefile new file mode 120000 index 00000000000..37af8bae5ba --- /dev/null +++ b/packages/data/Makefile @@ -0,0 +1 @@ +../package.Makefile \ No newline at end of file diff --git a/packages/data/scripts b/packages/data/scripts new file mode 120000 index 00000000000..9aec9dc5a06 --- /dev/null +++ b/packages/data/scripts @@ -0,0 +1 @@ +../build_scripts \ No newline at end of file diff --git a/packages/data/setup.py b/packages/data/setup.py index ab2288bb27f..a5b2fbae0e3 100644 --- a/packages/data/setup.py +++ b/packages/data/setup.py @@ -77,6 +77,7 @@ setup( version=version, description=PROJECT_DESCRIPTION, long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', author=PROJECT_AUTHOR, author_email=PROJECT_EMAIL, url=PROJECT_URL, diff --git a/packages/job_metrics/Makefile b/packages/job_metrics/Makefile new file mode 120000 index 00000000000..37af8bae5ba --- /dev/null +++ b/packages/job_metrics/Makefile @@ -0,0 +1 @@ +../package.Makefile \ No newline at end of file diff --git a/packages/job_metrics/scripts b/packages/job_metrics/scripts new file mode 120000 index 00000000000..9aec9dc5a06 --- /dev/null +++ b/packages/job_metrics/scripts @@ -0,0 +1 @@ +../build_scripts \ No newline at end of file diff --git a/packages/job_metrics/setup.py b/packages/job_metrics/setup.py index 6bf37538863..1e6851979c2 100644 --- a/packages/job_metrics/setup.py +++ b/packages/job_metrics/setup.py @@ -67,6 +67,7 @@ setup( version=version, description=PROJECT_DESCRIPTION, long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', author=PROJECT_AUTHOR, author_email=PROJECT_EMAIL, url=PROJECT_URL, diff --git a/packages/objectstore/Makefile b/packages/objectstore/Makefile new file mode 120000 index 00000000000..37af8bae5ba --- /dev/null +++ b/packages/objectstore/Makefile @@ -0,0 +1 @@ +../package.Makefile \ No newline at end of file diff --git a/packages/objectstore/scripts b/packages/objectstore/scripts new file mode 120000 index 00000000000..9aec9dc5a06 --- /dev/null +++ b/packages/objectstore/scripts @@ -0,0 +1 @@ +../build_scripts \ No newline at end of file diff --git a/packages/objectstore/setup.py b/packages/objectstore/setup.py index 16ab7ef5f51..444e4337388 100644 --- a/packages/objectstore/setup.py +++ b/packages/objectstore/setup.py @@ -65,6 +65,7 @@ setup( version=version, description=PROJECT_DESCRIPTION, long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', author=PROJECT_AUTHOR, author_email=PROJECT_EMAIL, url=PROJECT_URL, diff --git a/packages/package.Makefile b/packages/package.Makefile new file mode 100644 index 00000000000..89b7e1798cd --- /dev/null +++ b/packages/package.Makefile @@ -0,0 +1,88 @@ +# Location of virtualenv used for development. +VENV?=.venv +# Open resource on Mac OS X or Linux +OPEN_RESOURCE=bash -c 'open $$0 || xdg-open $$0' +# Source virtualenv to execute command (flake8, sphinx, twine, etc...) +IN_VENV=if [ -f $(VENV)/bin/activate ]; then . $(VENV)/bin/activate; fi; +UPSTREAM?=galaxyproject +SOURCE_DIR?=galaxy +BUILD_SCRIPTS_DIR=scripts +VERSION?=$(shell python $(BUILD_SCRIPTS_DIR)/print_version_for_release.py $(SOURCE_DIR)) +PROJECT_NAME?="galaxy-$(shell basename $(CURDIR))" +PROJECT_NAME:=$(subst _,-,$(PROJECT_NAME)) +TEST_DIR?=test +TESTS?=$(SOURCE_DIR) $(TEST_DIR) + +.PHONY: clean-pyc clean-build docs clean + +help: + @echo "clean - remove all build, test, coverage and Python artifacts" + @echo "clean-build - remove build artifacts" + @echo "clean-pyc - remove Python file artifacts" + @echo "clean-test - remove test and coverage artifacts" + @echo "setup-venv - setup a development virutalenv in current directory." + @echo "lint-dist - twine check dist results, including validating README content" + @echo "dist - package project for PyPI distribution" + +clean: clean-build clean-pyc clean-tests + +clean-build: + rm -fr build/ + rm -fr dist/ + rm -fr galaxy_*.egg-info + +clean-pyc: + find . -name '*.pyc' -exec rm -f {} + + find . -name '*.pyo' -exec rm -f {} + + find . -name '*~' -exec rm -f {} + + find . -name '__pycache__' -exec rm -fr {} + + +clean-tests: + rm -fr .tox/ + +setup-venv: + if [ ! -d $(VENV) ]; then virtualenv $(VENV); exit; fi; + $(IN_VENV) pip install -r requirements.txt && pip install -r dev-requirements.txt + +test: + $(IN_VENV) pytest $(TESTS) + +develop: + python setup.py develop + +dist: clean + $(IN_VENV) python setup.py sdist bdist_wheel + ls -l dist + +lint-dist: dist + $(IN_VENV) twine check dist/* + +_release-test-artifacts: + $(IN_VENV) twine upload -r test dist/* + $(OPEN_RESOURCE) https://testpypi.python.org/pypi/$(PROJECT_NAME) + +release-test-artifacts: lint-dist _release-test-artifacts + +_release-artifacts: + @while [ -z "$$CONTINUE" ]; do \ + read -r -p "Have you executed release-test and reviewed results? [y/N]: " CONTINUE; \ + done ; \ + [ $$CONTINUE = "y" ] || [ $$CONTINUE = "Y" ] || (echo "Exiting."; exit 1;) + @echo "Releasing" + $(IN_VENV) twine upload dist/* + +release-artifacts: release-test-artifacts _release-artifacts + +commit-version: + $(IN_VENV) python $(BUILD_SCRIPTS_DIR)/commit_version.py $(SOURCE_DIR) $(VERSION) + +new-version: + $(IN_VENV) python $(BUILD_SCRIPTS_DIR)/new_version.py $(SOURCE_DIR) $(VERSION) + +release-local: commit-version release-artifacts new-version + +push-release: + git push $(UPSTREAM) dev + git push upstream $(UPSTREAM)/tags/galaxy-$(PROJECT_NAME)-$(VERSION) + +release: release-local push-release diff --git a/packages/tool_util/Makefile b/packages/tool_util/Makefile new file mode 120000 index 00000000000..37af8bae5ba --- /dev/null +++ b/packages/tool_util/Makefile @@ -0,0 +1 @@ +../package.Makefile \ No newline at end of file diff --git a/packages/tool_util/scripts b/packages/tool_util/scripts new file mode 120000 index 00000000000..9aec9dc5a06 --- /dev/null +++ b/packages/tool_util/scripts @@ -0,0 +1 @@ +../build_scripts \ No newline at end of file diff --git a/packages/tool_util/setup.py b/packages/tool_util/setup.py index a86dc04c068..9645f9942fd 100644 --- a/packages/tool_util/setup.py +++ b/packages/tool_util/setup.py @@ -26,6 +26,7 @@ with open('%s/project_galaxy_tool_util.py' % SOURCE_DIR, 'rb') as f: PROJECT_URL = get_var("PROJECT_URL") PROJECT_AUTHOR = get_var("PROJECT_AUTHOR") PROJECT_EMAIL = get_var("PROJECT_EMAIL") + PROJECT_DESCRIPTION = get_var("PROJECT_DESCRIPTION") TEST_DIR = 'tests' PACKAGES = [ @@ -78,6 +79,7 @@ setup( version=version, description=PROJECT_DESCRIPTION, long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', author=PROJECT_AUTHOR, author_email=PROJECT_EMAIL, url=PROJECT_URL, diff --git a/packages/util/Makefile b/packages/util/Makefile new file mode 120000 index 00000000000..37af8bae5ba --- /dev/null +++ b/packages/util/Makefile @@ -0,0 +1 @@ +../package.Makefile \ No newline at end of file diff --git a/packages/util/scripts b/packages/util/scripts new file mode 120000 index 00000000000..9aec9dc5a06 --- /dev/null +++ b/packages/util/scripts @@ -0,0 +1 @@ +../build_scripts \ No newline at end of file diff --git a/packages/util/setup.py b/packages/util/setup.py index e02de21f05f..ee54c34e225 100644 --- a/packages/util/setup.py +++ b/packages/util/setup.py @@ -70,6 +70,7 @@ setup( version=version, description=PROJECT_DESCRIPTION, long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', author=PROJECT_AUTHOR, author_email=PROJECT_EMAIL, url=PROJECT_URL, From 9c6482b5ebcd0e7b5d8016ea8f0e8074c56a20fd Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 28 May 2019 15:12:12 -0400 Subject: [PATCH 4/8] packages/ - Allow dev releases (sort of) --- .ci/flake8_blacklist.txt | 4 ++ packages/build_scripts/commit_version.py | 28 +++++----- packages/build_scripts/new_version.py | 56 ++++++++++++------- .../print_version_for_release.py | 17 +++--- packages/package.Makefile | 7 ++- 5 files changed, 68 insertions(+), 44 deletions(-) diff --git a/.ci/flake8_blacklist.txt b/.ci/flake8_blacklist.txt index 33db66f40a0..26ece30af32 100644 --- a/.ci/flake8_blacklist.txt +++ b/.ci/flake8_blacklist.txt @@ -2,6 +2,10 @@ .tox .venv .venv3 +packages/*/.venv +packages/*/build +packages/*/dist +packages/venv node_modules database doc/build diff --git a/packages/build_scripts/commit_version.py b/packages/build_scripts/commit_version.py index 99787f57237..af5df92e416 100644 --- a/packages/build_scripts/commit_version.py +++ b/packages/build_scripts/commit_version.py @@ -7,27 +7,29 @@ import subprocess import sys -PROJECT_DIRECTORY = os.path.join(os.path.dirname(__file__), "..") +DEV_RELEASE = os.environ.get("DEV_RELEASE", None) == "1" +PROJECT_DIRECTORY = os.getcwd() PROJECT_DIRECTORY_NAME = os.path.basename(os.path.abspath(PROJECT_DIRECTORY)) -PROJECT_MODULE_FILENAME = "galaxy_%s.py" % PROJECT_DIRECTORY_NAME +PROJECT_MODULE_FILENAME = "project_galaxy_%s.py" % PROJECT_DIRECTORY_NAME PROJECT_NAME = PROJECT_DIRECTORY_NAME.replace("_", "-") def main(argv): source_dir = argv[1] version = argv[2] - history_path = os.path.join(PROJECT_DIRECTORY, "HISTORY.rst") - history = open(history_path, "r").read() - today = datetime.datetime.today() - today_str = today.strftime('%Y-%m-%d') - history = history.replace(".dev0", " (%s)" % today_str) - open(history_path, "w").write(history) mod_path = os.path.join(PROJECT_DIRECTORY, source_dir, PROJECT_MODULE_FILENAME) - mod = open(mod_path, "r").read() - mod = re.sub("__version__ = '[\d\.]*\.dev0'", - "__version__ = '%s'" % version, - mod) - mod = open(mod_path, "w").write(mod) + if not DEV_RELEASE: + history_path = os.path.join(PROJECT_DIRECTORY, "HISTORY.rst") + history = open(history_path, "r").read() + today = datetime.datetime.today() + today_str = today.strftime('%Y-%m-%d') + history = history.replace(".dev0", " (%s)" % today_str) + open(history_path, "w").write(history) + mod = open(mod_path, "r").read() + mod = re.sub("__version__ = '[\d\.]*\.dev0'", + "__version__ = '%s'" % version, + mod) + mod = open(mod_path, "w").write(mod) tag = "galaxy-%s-%s" % (PROJECT_NAME, version) shell(["git", "commit", "-m", "Version %s of %s (tag %s)." % (version, PROJECT_NAME, tag), "HISTORY.rst", mod_path]) diff --git a/packages/build_scripts/new_version.py b/packages/build_scripts/new_version.py index 13cd66cd088..f12605c4b54 100644 --- a/packages/build_scripts/new_version.py +++ b/packages/build_scripts/new_version.py @@ -7,41 +7,55 @@ import sys from distutils.version import StrictVersion -PROJECT_DIRECTORY = os.path.join(os.path.dirname(__file__), "..") +DEV_RELEASE = os.environ.get("DEV_RELEASE", None) == "1" +PROJECT_DIRECTORY = os.getcwd() PROJECT_DIRECTORY_NAME = os.path.basename(os.path.abspath(PROJECT_DIRECTORY)) -PROJECT_MODULE_FILENAME = "galaxy_%s.py" % PROJECT_DIRECTORY_NAME +PROJECT_MODULE_FILENAME = "project_galaxy_%s.py" % PROJECT_DIRECTORY_NAME PROJECT_NAME = PROJECT_DIRECTORY_NAME.replace("_", "-") def main(argv): source_dir = argv[1] - old_version = StrictVersion(argv[2]) - old_version_tuple = old_version.version - new_version_tuple = list(old_version_tuple) - new_version_tuple[1] = old_version_tuple[1] + 1 - new_version_tuple[2] = 0 - new_version = ".".join(map(str, new_version_tuple)) + version = argv[2] + if not DEV_RELEASE: + old_version = StrictVersion(version) + old_version_tuple = old_version.version + new_version_tuple = list(old_version_tuple) + new_version_tuple[1] = old_version_tuple[1] + 1 + new_version_tuple[2] = 0 + new_version = ".".join(map(str, new_version_tuple)) + new_dev_version = 0 + else: + dev_version = re.compile(r'dev([\d]+)').search(version).group(1) + new_dev_version = int(dev_version) + 1 + new_version = version.replace("dev%s" % dev_version, "dev%s" % new_dev_version) history_path = os.path.join(PROJECT_DIRECTORY, "HISTORY.rst") - history = open(history_path, "r").read() + if not DEV_RELEASE: + history = open(history_path, "r").read() - def extend(from_str, line): - from_str += "\n" - return history.replace(from_str, from_str + line + "\n" ) + def extend(from_str, line): + from_str += "\n" + return history.replace(from_str, from_str + line + "\n") - history = extend(".. to_doc", """ ---------------------- -%s.dev0 ---------------------- + history = extend(".. to_doc", """ + --------------------- + %s.dev0 + --------------------- - """ % new_version) - open(history_path, "w").write(history) +""" % new_version) + open(history_path, "w").write(history) mod_path = os.path.join(PROJECT_DIRECTORY, source_dir, PROJECT_MODULE_FILENAME) mod = open(mod_path, "r").read() - mod = re.sub("__version__ = '[\d\.]+'", - "__version__ = '%s.dev0'" % new_version, - mod, 1) + if not DEV_RELEASE: + mod = re.sub("__version__ = '[\d\.]+'", + "__version__ = '%s.dev0'" % new_version, + mod, 1) + else: + mod = re.sub("dev%s" % dev_version, + "dev%s" % new_dev_version, + mod, 1) mod = open(mod_path, "w").write(mod) shell(["git", "commit", "-m", "Starting work on %s %s" % (PROJECT_NAME, new_version), "HISTORY.rst", mod_path]) diff --git a/packages/build_scripts/print_version_for_release.py b/packages/build_scripts/print_version_for_release.py index 2c4f31d43ff..7fa53f94b53 100644 --- a/packages/build_scripts/print_version_for_release.py +++ b/packages/build_scripts/print_version_for_release.py @@ -1,24 +1,27 @@ from __future__ import print_function import ast -import re import os +import re import sys from distutils.version import LooseVersion -PROJECT_DIRECTORY = os.path.join(os.path.dirname(__file__), "..") +DEV_RELEASE = os.environ.get("DEV_RELEASE", None) == "1" +PROJECT_DIRECTORY = os.getcwd() PROJECT_DIRECTORY_NAME = os.path.basename(os.path.abspath(PROJECT_DIRECTORY)) -PROJECT_MODULE_FILENAME = "galaxy_%s.py" % PROJECT_DIRECTORY_NAME +PROJECT_MODULE_FILENAME = "project_galaxy_%s.py" % PROJECT_DIRECTORY_NAME source_dir = sys.argv[1] PROJECT_MODULE_PATH = os.path.join(PROJECT_DIRECTORY, source_dir, PROJECT_MODULE_FILENAME) _version_re = re.compile(r'__version__\s+=\s+(.*)') - with open(PROJECT_MODULE_PATH, 'rb') as f: version = str(ast.literal_eval(_version_re.search( f.read().decode('utf-8')).group(1))) -# Strip .devN -version_tuple = LooseVersion(version).version[0:3] -print(".".join(map(str, version_tuple))) +if not DEV_RELEASE: + # Strip .devN + version_tuple = LooseVersion(version).version[0:3] + print(".".join(map(str, version_tuple))) +else: + print(version) diff --git a/packages/package.Makefile b/packages/package.Makefile index 89b7e1798cd..89536ddea59 100644 --- a/packages/package.Makefile +++ b/packages/package.Makefile @@ -7,7 +7,8 @@ IN_VENV=if [ -f $(VENV)/bin/activate ]; then . $(VENV)/bin/activate; fi; UPSTREAM?=galaxyproject SOURCE_DIR?=galaxy BUILD_SCRIPTS_DIR=scripts -VERSION?=$(shell python $(BUILD_SCRIPTS_DIR)/print_version_for_release.py $(SOURCE_DIR)) +DEV_RELEASE?=0 +VERSION?=$(shell DEV_RELEASE=$(DEV_RELEASE) python $(BUILD_SCRIPTS_DIR)/print_version_for_release.py $(SOURCE_DIR) $(DEV_RELEASE)) PROJECT_NAME?="galaxy-$(shell basename $(CURDIR))" PROJECT_NAME:=$(subst _,-,$(PROJECT_NAME)) TEST_DIR?=test @@ -74,10 +75,10 @@ _release-artifacts: release-artifacts: release-test-artifacts _release-artifacts commit-version: - $(IN_VENV) python $(BUILD_SCRIPTS_DIR)/commit_version.py $(SOURCE_DIR) $(VERSION) + $(IN_VENV) DEV_RELEASE=$(DEV_RELEASE) python $(BUILD_SCRIPTS_DIR)/commit_version.py $(SOURCE_DIR) $(VERSION) new-version: - $(IN_VENV) python $(BUILD_SCRIPTS_DIR)/new_version.py $(SOURCE_DIR) $(VERSION) + $(IN_VENV) DEV_RELEASE=$(DEV_RELEASE) python $(BUILD_SCRIPTS_DIR)/new_version.py $(SOURCE_DIR) $(VERSION) release-local: commit-version release-artifacts new-version From 0018e878124c4b054cb3d75f1e51957cd1fcc324 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 28 May 2019 16:08:15 -0400 Subject: [PATCH 5/8] packages/ - fix bug in job metrics packages listing --- packages/job_metrics/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/job_metrics/setup.py b/packages/job_metrics/setup.py index 1e6851979c2..8970bc45aec 100644 --- a/packages/job_metrics/setup.py +++ b/packages/job_metrics/setup.py @@ -32,7 +32,7 @@ TEST_DIR = 'tests' PACKAGES = [ 'galaxy', 'galaxy.job_metrics', - 'galaxy.job_metrics.instrumers', + 'galaxy.job_metrics.instrumenters', 'galaxy.job_metrics.collectl', ] ENTRY_POINTS = ''' From 113d296fbfe9af07240efad0da4a5e9c19fc1cf1 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 28 May 2019 16:11:59 -0400 Subject: [PATCH 6/8] packages/ - build universal wheels (Python 2/3 compat) --- setup.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.cfg b/setup.cfg index 9f71b41c5cb..4eafad8d715 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,6 @@ +[wheel] +universal = 1 + [flake8] # These are exceptions allowed by Galaxy style guidelines. # E128 continuation line under-indented for visual indent From 905a40d0906a2f9da277d7fc262730d444974da5 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 28 May 2019 15:48:19 -0400 Subject: [PATCH 7/8] packages/ - update package versions to reflect pre-releases to PyPI. --- packages/data/galaxy/project_galaxy_data.py | 2 +- packages/job_metrics/galaxy/project_galaxy_job_metrics.py | 2 +- packages/objectstore/galaxy/project_galaxy_objectstore.py | 2 +- packages/tool_util/galaxy/project_galaxy_tool_util.py | 2 +- packages/util/galaxy/project_galaxy_util.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/data/galaxy/project_galaxy_data.py b/packages/data/galaxy/project_galaxy_data.py index f31e64795fb..b7c780d82ab 100644 --- a/packages/data/galaxy/project_galaxy_data.py +++ b/packages/data/galaxy/project_galaxy_data.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -__version__ = '19.9.0.dev0' +__version__ = '19.9.0.dev1' PROJECT_NAME = "galaxy-data" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" diff --git a/packages/job_metrics/galaxy/project_galaxy_job_metrics.py b/packages/job_metrics/galaxy/project_galaxy_job_metrics.py index c8a4b73626f..755ea7bf08c 100644 --- a/packages/job_metrics/galaxy/project_galaxy_job_metrics.py +++ b/packages/job_metrics/galaxy/project_galaxy_job_metrics.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -__version__ = '19.9.0.dev0' +__version__ = '19.9.0.dev1' PROJECT_NAME = "galaxy-job-metrics" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" diff --git a/packages/objectstore/galaxy/project_galaxy_objectstore.py b/packages/objectstore/galaxy/project_galaxy_objectstore.py index de883b37181..9aae9df3e85 100644 --- a/packages/objectstore/galaxy/project_galaxy_objectstore.py +++ b/packages/objectstore/galaxy/project_galaxy_objectstore.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -__version__ = '19.9.0.dev0' +__version__ = '19.9.0.dev1' PROJECT_NAME = "galaxy-objectstore" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" diff --git a/packages/tool_util/galaxy/project_galaxy_tool_util.py b/packages/tool_util/galaxy/project_galaxy_tool_util.py index 7fb8e4c0ae3..c6440bf685a 100644 --- a/packages/tool_util/galaxy/project_galaxy_tool_util.py +++ b/packages/tool_util/galaxy/project_galaxy_tool_util.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -__version__ = '19.9.0.dev0' +__version__ = '19.9.0.dev1' PROJECT_NAME = "galaxy-tool-util" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" diff --git a/packages/util/galaxy/project_galaxy_util.py b/packages/util/galaxy/project_galaxy_util.py index 98f4f9436ae..1333aebadd2 100644 --- a/packages/util/galaxy/project_galaxy_util.py +++ b/packages/util/galaxy/project_galaxy_util.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -__version__ = '19.9.0.dev0' +__version__ = '19.9.0.dev2' PROJECT_NAME = "galaxy-util" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" From 500a5cc46dba4956788adae16e6bc7913208ec59 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 28 May 2019 16:38:39 -0400 Subject: [PATCH 8/8] Fix regex linting in packages/build_scripts. --- packages/build_scripts/commit_version.py | 2 +- packages/build_scripts/new_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/build_scripts/commit_version.py b/packages/build_scripts/commit_version.py index af5df92e416..93a001f4886 100644 --- a/packages/build_scripts/commit_version.py +++ b/packages/build_scripts/commit_version.py @@ -26,7 +26,7 @@ def main(argv): history = history.replace(".dev0", " (%s)" % today_str) open(history_path, "w").write(history) mod = open(mod_path, "r").read() - mod = re.sub("__version__ = '[\d\.]*\.dev0'", + mod = re.sub(r"__version__ = '[\d\.]*\.dev0'", "__version__ = '%s'" % version, mod) mod = open(mod_path, "w").write(mod) diff --git a/packages/build_scripts/new_version.py b/packages/build_scripts/new_version.py index f12605c4b54..7de8a8c8ef7 100644 --- a/packages/build_scripts/new_version.py +++ b/packages/build_scripts/new_version.py @@ -49,7 +49,7 @@ def main(argv): mod_path = os.path.join(PROJECT_DIRECTORY, source_dir, PROJECT_MODULE_FILENAME) mod = open(mod_path, "r").read() if not DEV_RELEASE: - mod = re.sub("__version__ = '[\d\.]+'", + mod = re.sub(r"__version__ = '[\d\.]+'", "__version__ = '%s.dev0'" % new_version, mod, 1) else: