Skip to content

Commit

Permalink
License. (#445)
Browse files Browse the repository at this point in the history
* License.

* Removed Python 3.6 support
  • Loading branch information
tbenthompson committed Oct 7, 2021
1 parent 0abe4b0 commit 968d419
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
fail-fast: true
matrix:
PYTHON_VERSION: ['3.6', '3.7', '3.8', '3.9']
PYTHON_VERSION: ['3.7', '3.8', '3.9']
steps:
- name: Pull image
run: docker pull condaforge/mambaforge:latest
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/conda-build-linux-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
fail-fast: true
matrix:
CONDA_BUILD_YML:
- linux_64_python3.6_default.____cpython
- linux_64_python3.8_skylake.____cpython
- linux_64_python3.9_default.____cpython
steps:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/conda-build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
fail-fast: false
matrix:
CONDA_BUILD_YML:
- osx_64_python3.6_default.____cpython
- osx_64_python3.7_skylake.____cpython
- osx_arm64_python3.9.____cpython
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conda-build-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
CONDA_BUILD_YML:
- win_64_python3.6.____cpython
- win_64_python3.7.____cpython
steps:
- name: Checkout branch
uses: actions/checkout@v2.3.4
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ jobs:
fail-fast: false
matrix:
CONDA_BUILD_YML:
- linux_64_python3.6_default.____cpython
- linux_64_python3.6_skylake.____cpython
- linux_64_python3.7_default.____cpython
- linux_64_python3.7_skylake.____cpython
- linux_64_python3.8_default.____cpython
Expand Down Expand Up @@ -49,8 +47,6 @@ jobs:
fail-fast: false
matrix:
CONDA_BUILD_YML:
- osx_64_python3.6_default.____cpython
- osx_64_python3.6_skylake.____cpython
- osx_64_python3.7_default.____cpython
- osx_64_python3.7_skylake.____cpython
- osx_64_python3.8_default.____cpython
Expand Down Expand Up @@ -83,7 +79,6 @@ jobs:
fail-fast: false
matrix:
CONDA_BUILD_YML:
- win_64_python3.6.____cpython
- win_64_python3.7.____cpython
- win_64_python3.8.____cpython
- win_64_python3.9.____cpython
Expand Down
12 changes: 9 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
(C) 2020-2021 QuantCo Inc.
Copyright 2020-2021 QuantCo Inc, Christian Lorentzen

All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

The code and documentation is QuantCo-confidential and may not be distributed in source or binary forms without explicit written permission by QuantCo (info@quantco.com).
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9 changes: 2 additions & 7 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,11 @@ The first step is to set up a conda environment and install glum in editable mod
# Set up our pre-commit hooks for black, mypy, isort and flake8.
pre-commit install

# Set up the ***REMOVED*** conda channel. For the password, substitute in the correct password. You should be able to get the password by searching around on slack or asking on the glm_benchmarks slack channel!
conda config --system --prepend channels ***REMOVED***
conda config --system --set custom_channels.***REMOVED*** https://***REMOVED***:password@conda.***REMOVED***
# Set up a conda environment with name "glum"
conda install mamba=0.2.12
mamba env create
conda env create

# If you want to install the dependencies necessary for benchmarking against other GLM packages:
mamba env update -n glum --file environment-benchmark.yml
conda env update -n glum --file environment-benchmark.yml

# Install this package in editable mode.
conda activate glum
Expand Down
2 changes: 1 addition & 1 deletion docs/dev
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

trap "kill 0" EXIT

python -m http.server --directory _build/html 8001 &> /dev/null &
python -m http.server --directory _build/html 8000 &> /dev/null &

while true
do
Expand Down
2 changes: 1 addition & 1 deletion src/glum/_cd_fast.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Manoj Kumar <manojkumarsivaraj334@gmail.com>
#
# License: BSD 3 clause
# Substantial modifications by Ben Thompson <ben.thompson@quantco.com>
# Substantial modifications by Ben Thompson <t.ben.thompson@gmail.com>
#
# cython: boundscheck=False, wraparound=False, cdivision=True
from libc.math cimport fabs
Expand Down

0 comments on commit 968d419

Please sign in to comment.