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

fix: Install pip and pip-tools in upgrade script #70

Closed
wants to merge 11 commits into from
Closed
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
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,20 @@ docs: ## generate Sphinx HTML documentation, including API docs
# Define PIP_COMPILE_OPTS=-v to get more information during make upgrade.
PIP_COMPILE = pip-compile --upgrade $(PIP_COMPILE_OPTS)


COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt
.PHONY: $(COMMON_CONSTRAINTS_TXT)
$(COMMON_CONSTRAINTS_TXT):
wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)"

upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
upgrade: $(COMMON_CONSTRAINTS_TXT)
## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -r requirements/pip-tools.txt
# Make sure to compile files after any other files they include!
$(PIP_COMPILE) --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
$(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -r requirements/pip.txt
pip install -r requirements/pip-tools.txt
$(PIP_COMPILE) -o requirements/base.txt requirements/base.in
$(PIP_COMPILE) -o requirements/test.txt requirements/test.in
Expand Down
2 changes: 0 additions & 2 deletions openedx_events/event_bus/avro/custom_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ class BaseCustomTypeAvroSerializer(ABC):
@abstractmethod
def serialize(obj) -> str:
"""Abstract method to serialize obj into string."""
...

@staticmethod
@abstractmethod
def deserialize(data: str) -> object:
"""Abstract method to deserialize string into obj."""
...


class CourseKeyAvroSerializer(BaseCustomTypeAvroSerializer):
Expand Down
106 changes: 2 additions & 104 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
# SERIOUSLY.
#
# ------------------------------
# Generated by edx-lint version: 5.2.1
# Generated by edx-lint version: 5.2.4
# ------------------------------
[MASTER]
ignore = migrations
Expand Down Expand Up @@ -102,54 +102,39 @@ enable =
cell-var-from-loop,
confusing-with-statement,
continue-in-finally,
cyclical-import,
dangerous-default-value,
dict-items-not-iterating,
dict-keys-not-iterating,
dict-values-not-iterating,
duplicate-argument-name,
duplicate-bases,
duplicate-except,
duplicate-key,
eq-without-hash,
exception-escape,
exception-message-attribute,
expression-not-assigned,
filter-builtin-not-iterating,
format-combined-specification,
format-needs-mapping,
function-redefined,
global-variable-undefined,
import-error,
import-self,
inconsistent-mro,
indexing-exception,
inherit-non-class,
init-is-generator,
invalid-all-object,
invalid-encoded-data,
invalid-format-index,
invalid-length-returned,
invalid-sequence-index,
invalid-slice-index,
invalid-slots-object,
invalid-slots,
invalid-str-codec,
invalid-unary-operand-type,
logging-too-few-args,
logging-too-many-args,
logging-unsupported-format,
lost-exception,
map-builtin-not-iterating,
method-hidden,
misplaced-bare-raise,
misplaced-future,
missing-format-argument-key,
missing-format-attribute,
missing-format-string-key,
missing-super-argument,
mixed-fomat-string,
model-unicode-not-callable,
no-member,
no-method-argument,
no-name-in-module,
Expand All @@ -158,44 +143,32 @@ enable =
non-iterator-returned,
non-parent-method-called,
nonexistent-operator,
nonimplemented-raised,
nonstandard-exception,
not-a-mapping,
not-an-iterable,
not-callable,
not-context-manager,
not-in-loop,
pointless-statement,
pointless-string-statement,
property-on-old-class,
raising-bad-type,
raising-non-exception,
raising-string,
range-builtin-not-iterating,
redefined-builtin,
redefined-in-handler,
redefined-outer-name,
redefined-variable-type,
redundant-keyword-arg,
relative-import,
repeated-keyword,
return-arg-in-generator,
return-in-init,
return-outside-function,
signature-differs,
slots-on-old-class,
super-init-not-called,
super-method-not-called,
super-on-old-class,
syntax-error,
sys-max-int,
test-inherits-tests,
too-few-format-args,
too-many-format-args,
too-many-function-args,
translation-of-non-string,
truncated-format-string,
unbalance-tuple-unpacking,
undefined-all-variable,
undefined-loop-variable,
undefined-variable,
Expand All @@ -211,11 +184,8 @@ enable =
used-before-assignment,
using-constant-test,
yield-outside-function,
zip-builtin-not-iterating,

astroid-error,
django-not-available-placeholder,
django-not-available,
fatal,
method-check-failed,
parse-error,
Expand All @@ -237,7 +207,6 @@ enable =
bad-classmethod-argument,
bad-mcs-classmethod-argument,
bad-mcs-method-argument,
bad-whitespace,
bare-except,
broad-except,
consider-iterating-dictionary,
Expand All @@ -247,16 +216,10 @@ enable =
literal-used-as-attribute,
logging-format-interpolation,
logging-not-lazy,
metaclass-assignment,
model-has-unicode,
model-missing-unicode,
model-no-explicit-unicode,
multiple-imports,
multiple-statements,
no-classmethod-decorator,
no-staticmethod-decorator,
old-raise-syntax,
old-style-class,
protected-access,
redundant-unittest-assert,
reimported,
Expand Down Expand Up @@ -284,7 +247,6 @@ enable =
wrong-import-position,

missing-final-newline,
mixed-indentation,
mixed-line-endings,
trailing-newlines,
trailing-whitespace,
Expand All @@ -295,25 +257,7 @@ enable =
deprecated-pragma,
unrecognized-inline-option,
useless-suppression,

cmp-method,
coerce-method,
delslice-method,
dict-iter-method,
dict-view-method,
div-method,
getslice-method,
hex-method,
idiv-method,
next-method-called,
next-method-defined,
nonzero-method,
oct-method,
rdiv-method,
setslice-method,
using-cmp-argument,
disable =
bad-continuation,
bad-indentation,
consider-using-f-string,
duplicate-code,
Expand All @@ -322,12 +266,7 @@ disable =
global-statement,
invalid-name,
locally-disabled,
locally-enabled,
lowercase-l-suffix,
misplaced-comparison-constant,
no-else-return,
no-init,
no-self-use,
suppressed-message,
too-few-public-methods,
too-many-ancestors,
Expand All @@ -346,54 +285,14 @@ disable =
feature-toggle-needs-doc,
illegal-waffle-usage,

apply-builtin,
backtick,
bad-python3-import,
basestring-builtin,
buffer-builtin,
cmp-builtin,
coerce-builtin,
deprecated-itertools-function,
deprecated-operator-function,
deprecated-str-translate-call,
deprecated-string-function,
deprecated-sys-function,
deprecated-types-field,
deprecated-urllib-function,
execfile-builtin,
file-builtin,
import-star-module-level,
input-builtin,
intern-builtin,
long-builtin,
long-suffix,
no-absolute-import,
non-ascii-bytes-literal,
old-division,
old-ne-operator,
old-octal-literal,
parameter-unpacking,
print-statement,
raw_input-builtin,
reduce-builtin,
reload-builtin,
round-builtin,
standarderror-builtin,
unichr-builtin,
unicode-builtin,
unpacking-in-except,
xrange-builtin,

logging-fstring-interpolation,

[REPORTS]
output-format = text
files-output = no
reports = no
score = no

[BASIC]
bad-functions = map,filter,apply,input
module-rgx = (([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
const-rgx = (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns)$
class-rgx = [A-Z_][a-zA-Z0-9]+$
Expand All @@ -413,7 +312,6 @@ docstring-min-length = 5
max-line-length = 120
ignore-long-lines = ^\s*(# )?((<?https?://\S+>?)|(\.\. \w+: .*))$
single-line-if-stmt = no
no-space-check = trailing-comma,dict-separator
max-module-lines = 1000
indent-string = ' '

Expand Down Expand Up @@ -484,4 +382,4 @@ int-import-graph =
[EXCEPTIONS]
overgeneral-exceptions = Exception

# 4aab3dcb4fa137c503562dcd26a3be774bc1055e
# 2c4e77ce27e7bedab7f88fb0e58e08afe979524d
17 changes: 9 additions & 8 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,24 @@
#
# make upgrade
#
attrs==21.2.0
attrs==22.1.0
# via -r requirements/base.in
django==2.2.24
django==2.2.28
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.in
edx-opaque-keys[django]==2.2.2
edx-opaque-keys[django]==2.3.0
# via -r requirements/base.in
fastavro==1.4.7
fastavro==1.5.4
# via -r requirements/base.in
pbr==5.8.0
pbr==5.9.0
# via stevedore
pymongo==3.12.1
pymongo==3.12.3
# via edx-opaque-keys
pytz==2021.3
pytz==2022.1
# via django
sqlparse==0.4.2
# via django
stevedore==3.5.0
stevedore==4.0.0
# via edx-opaque-keys
28 changes: 12 additions & 16 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,45 +4,41 @@
#
# make upgrade
#
backports.entry-points-selectable==1.1.1
# via virtualenv
certifi==2021.10.8
certifi==2022.6.15
# via requests
charset-normalizer==2.0.7
charset-normalizer==2.1.0
# via requests
codecov==2.1.12
# via -r requirements/ci.in
coverage==6.1.2
coverage==6.4.2
# via codecov
distlib==0.3.3
distlib==0.3.5
# via virtualenv
filelock==3.4.0
filelock==3.7.1
# via
# tox
# virtualenv
idna==3.3
# via requests
packaging==21.3
# via tox
platformdirs==2.4.0
platformdirs==2.5.2
# via virtualenv
pluggy==1.0.0
# via tox
py==1.11.0
# via tox
pyparsing==3.0.6
pyparsing==3.0.9
# via packaging
requests==2.26.0
requests==2.28.1
# via codecov
six==1.16.0
# via
# tox
# virtualenv
# via tox
toml==0.10.2
# via tox
tox==3.24.4
tox==3.25.1
# via -r requirements/ci.in
urllib3==1.26.7
urllib3==1.26.11
# via requests
virtualenv==20.10.0
virtualenv==20.16.3
# via tox
Loading