Gitlab will migrate to a new storage backend starting 0300 UTC on 2020-04-04. We do not anticipate a maintenance window for this migration. Performance may be impacted over the weekend. Thanks for your patience.

Commit 405d011b authored by Leo Pound Singer's avatar Leo Pound Singer

Revert "Drop support for Python 3.6"

This reverts commit 84f31caf.
parent 14876258
......@@ -7,7 +7,7 @@ if [ -f /etc/bashrc ]; then
fi
source /cvmfs/ligo-containers.opensciencegrid.org/lscsoft/conda/latest/etc/profile.d/conda.sh
conda activate ligo-py37
conda activate ligo-py36
# Add user site directory to the PATH. On Linux, this is usuall ~/.local/bin.
export PATH="$(python -m site --user-base)/bin${PATH+:${PATH}}"
......
......@@ -27,7 +27,7 @@ stages:
# Build source distribution
sdist:
image: python:3.7-slim
image: python:3.6-slim
stage: dist
variables:
GIT_STRATEGY: fetch
......@@ -44,7 +44,7 @@ sdist:
# Build binary distribution
bdist:
image: python:3.7-slim
image: python:3.6-slim
stage: test
<<: *in-tmpdir
script:
......@@ -77,6 +77,8 @@ bdist:
only:
changes:
- requirements.txt
dependencies/python3.6:
<<: *dependencies
dependencies/python3.7:
<<: *dependencies
......@@ -97,12 +99,15 @@ dependencies/python3.7:
- htmlcov/
reports:
junit: junit.xml
test/python3.6:
image: $CI_REGISTRY_IMAGE/dependencies/python3.6:$CI_COMMIT_REF_NAME
<<: *test
test/python3.7:
image: $CI_REGISTRY_IMAGE/dependencies/python3.7:$CI_COMMIT_REF_NAME
<<: *test
lint:
image: $CI_REGISTRY_IMAGE/dependencies/python3.7:$CI_COMMIT_REF_NAME
image: $CI_REGISTRY_IMAGE/dependencies/python3.6:$CI_COMMIT_REF_NAME
stage: test
variables:
GIT_STRATEGY: fetch
......@@ -165,12 +170,14 @@ associate commits in Sentry:
- if [ "${CI_COMMIT_TAG:0:1}" = "v" ]; then docker tag $IMAGE_TAG ${IMAGE_TAG%:*}:latest; docker push ${IMAGE_TAG%:*}:latest; fi
dependencies:
- bdist
docker/python3.6:
<<: *docker
docker/python3.7:
<<: *docker
# Generate documentation
doc:
image: python:3.7-slim
image: python:3.6-slim
stage: test
<<: *in-tmpdir
script:
......@@ -196,12 +203,12 @@ pages:
only:
- master
dependencies:
- test/python3.7
- test/python3.6
# Upload package to PyPI
pypi:
stage: deploy
image: python:3.7-slim
image: python:3.6-slim
script:
- pip install twine
- twine upload *.tar.* *.whl
......@@ -309,8 +316,8 @@ release:
pipenv install --system --deploy
# FIXME: remove pip uninstall temporary directories left behind due to
# bug with pip on NFS. See https://github.com/pypa/pip/issues/6327
chmod -R ug+rwx .local/lib/python3.7/site-packages/~* || true
rm -rf .local/lib/python3.7/site-packages/~* || true
chmod -R ug+rwx .local/lib/python3.6/site-packages/~* || true
rm -rf .local/lib/python3.6/site-packages/~* || true
gwcelery condor resubmit
EOF
......
......@@ -60,9 +60,6 @@ This is the initial release of GWCelery for O3b.
- Remove skymap generation from PE DAG so that it will not be generated twice.
- Drop support for Python 3.6 so that we can use the ``check_output`` keyword
argument that was added to ``suprocess.run()`` in Python 3.7.
0.8.7 (2019-09-14)
------------------
......
......@@ -14,4 +14,4 @@ ipykernel = "*"
flower = {git = "https://github.com/lpsinger/flower",ref = "custom-stats"}
[requires]
python_version = "3.7"
python_version = "3.6"
......@@ -9,7 +9,7 @@ testing on any machine.
To install
----------
GWCelery requires Python >= 3.7.
GWCelery requires Python >= 3.6.
The easiest way to install it is with ``venv`` and ``pip``::
......
kombu <= 4.5.0 # FIXME: https://github.com/celery/celery/issues/5261
aiocontextvars; python_version <= "3.6" # see https://docs.sentry.io/platforms/python/tornado/
astropy
celery[redis] == 4.3.0
comet
......
......@@ -36,6 +36,7 @@ classifiers =
License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
Operating System :: POSIX
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Topic :: Internet
Topic :: Scientific/Engineering :: Astronomy
......@@ -47,7 +48,7 @@ project_urls =
[options]
packages = find:
python_requires = >=3.7
python_requires = >=3.6
[options.entry_points]
celery.commands =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment