Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update zlib version #219

Merged
merged 5 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 37 additions & 32 deletions bin/ma5
Original file line number Diff line number Diff line change
@@ -1,78 +1,83 @@
#!/usr/bin/env python

################################################################################
#
#
# Copyright (C) 2012-2023 Jack Araz, Eric Conte & Benjamin Fuks
# The MadAnalysis development team, email: <[email protected]>
#
#
# This file is part of MadAnalysis 5.
# Official website: <https://github.com/MadAnalysis/madanalysis5>
#
#
# MadAnalysis 5 is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
#
# MadAnalysis 5 is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with MadAnalysis 5. If not, see <http://www.gnu.org/licenses/>
#
#
################################################################################


################################################################################
# MAIN PROGRAM
################################################################################

"""This is the main executable, a simple frontend to set up the PYTHONPATH
and call immediately the command line interface scripts"""
"""
This is the main executable, a simple frontend to set up the PYTHONPATH
and call immediately the command line interface scripts
"""

# Checking if the correct release of Python is installed
import importlib
import os
import sys
if sys.version_info[0] != 3 or sys.version_info[1] <= 6:
sys.exit('Python release '+ sys.version + ' is detected.\n' + \
'MadAnalysis 5 works only with Python version 3.6 or more recent version.\n' + \
'Please upgrade your Python installation.')

# Checking if the correct release of Python is installed
if sys.version_info[0] != 3 or sys.version_info[1] <= 6:
sys.exit(
"Python release "
+ sys.version
+ " is detected.\n"
+ "MadAnalysis 5 works only with Python version 3.6 or more recent version.\n"
+ "Please upgrade your Python installation."
)

# Checking that the 'six' package is present
try:
import six
except:
sys.exit('The python "six" module is not found on your system and it is required for MadAnalysis 5 for ' +\
'a question of Python 2/3 compatibility. Please install it with the following command:\n' +\
'pip install six')
if not importlib.util.find_spec("six"):
sys.exit(
'The python "six" module is not found on your system and it is required for MadAnalysis 5 for '
+ "a question of Python 2/3 compatibility. Please install it with the following command:\n"
+ "pip install six"
)

# Getting the parent directory (ma5 root dir) of the script real path (bin)
import os
import optparse
ma5dir = os.path.split(os.path.dirname(os.path.realpath( __file__ )))[0]
ma5dir = os.path.split(os.path.dirname(os.path.realpath(__file__)))[0]
if not os.path.isdir(ma5dir):
sys.exit('Detected MadAnalysis 5 general folder is not correct:\n' +\
ma5dir)
os.environ['MA5_BASE']=ma5dir
sys.exit("Detected MadAnalysis 5 general folder is not correct:\n" + ma5dir)
os.environ["MA5_BASE"] = ma5dir

# Adding the MadAnalysis 5 folder to the current PYTHONPATH
# -> allowing to use MadAnalysis 5 python files
sys.path.insert(0, ma5dir)

# Adding the python service folder to the current PYTHONPATH
servicedir = ma5dir+'/tools/ReportGenerator/Services/'
servicedir = ma5dir + "/tools/ReportGenerator/Services/"
servicedir = os.path.normpath(servicedir)
if not os.path.isdir(servicedir):
sys.exit('Detected MadAnalysis 5 service folder is not correct:\n' + ma5dir)
sys.exit("Detected MadAnalysis 5 service folder is not correct:\n" + ma5dir)
sys.path.insert(0, servicedir)

# Release version
# Do not touch it !!!!!
version = "1.10.11"
date = "2023/08/18"
# Do not touch it !!!!!
version = "1.10.12"
date = "2023/09/13"

# Loading the MadAnalysis session
import madanalysis.core.launcher
madanalysis.core.launcher.LaunchMA5(version, date, ma5dir)


madanalysis.core.launcher.LaunchMA5(version, date, ma5dir)
5 changes: 4 additions & 1 deletion doc/releases/changelog-v1.10.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Release version 1.10.7
# Release version 1.10

## New features since last release

Expand Down Expand Up @@ -68,6 +68,9 @@

## Bug fixes

* Permanently fix the zlib version to the latest.
([#219](https://github.com/MadAnalysis/madanalysis5/pull/219))

* Zero division error fixed in the simplified likelihoods workflow.
([#4](https://github.com/MadAnalysis/madanalysis5/pull/4))

Expand Down
Loading
Loading